svn commit: r821890 - in /webservices/sandesha/branches/sandesha2/java/1_5: ./ modules/client/ modules/core/ modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/ modules/core/src/main/java/org/apache/sandesha2/workers/ modules/distribution...
[email protected] Mon, 05 Oct 2009 16:01:58 -0000
| Newsgroups | gmane.comp.apache.webservices.fx.devel |
|---|---|
| Message-ID | <[email protected]> |
Author: parsonsd
Date: Mon Oct 5 16:01:57 2009
New Revision: 821890
URL: http://svn.apache.org/viewvc?rev=821890&view=rev
Log:
POM updates and recent updates of main Sandesha2 branch pulled in
Modified:
webservices/sandesha/branches/sandesha2/java/1_5/modules/client/pom.xml
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/pom.xml
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java
webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
webservices/sandesha/branches/sandesha2/java/1_5/modules/distribution/pom.xml
webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/pom.xml
webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoString.java
webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringRequestBodyType.java
webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringResponse.java
webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringResponseBodyType.java
webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/Ping.java
webservices/sandesha/branches/sandesha2/java/1_5/modules/mar/pom.xml
webservices/sandesha/branches/sandesha2/java/1_5/modules/persistence/pom.xml
webservices/sandesha/branches/sandesha2/java/1_5/modules/policy/pom.xml
webservices/sandesha/branches/sandesha2/java/1_5/modules/rampart-integration/pom.xml
webservices/sandesha/branches/sandesha2/java/1_5/modules/samples/pom.xml
webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/pom.xml
webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/tests.build.xml
webservices/sandesha/branches/sandesha2/java/1_5/pom.xml
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/client/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/client/pom.xml?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/client/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/client/pom.xml Mon Oct 5 16:01:57 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</dependency>
</dependencies>
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/core/pom.xml?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/core/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/core/pom.xml Mon Oct 5 16:01:57 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java Mon Oct 5 16:01:57 2009
@@ -19,15 +19,11 @@
package org.apache.sandesha2.storage.inmemory;
-import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.axis2.java.security.AccessController;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
@@ -46,25 +42,6 @@
private static final Log log = LogFactory.getLog(InMemoryTransaction.class);
- private static int deadlockTimeoutSeconds = 25;
-
- // Allow the deadlock timeout to be configured to help debug
- static{
- String deadlockProperty = AccessController.doPrivileged(new PrivilegedAction<String>(){
- public String run() {
- return System.getProperty("deadlockTimeout");
- }});
- if(deadlockProperty != null){
- try{
- deadlockTimeoutSeconds = Integer.parseInt(deadlockProperty);
- }catch(Exception e){
- if(log.isDebugEnabled()){
- log.debug("Exception encountered processing the deadlockTimeout property: "+deadlockProperty,e);
- }
- }
- }
- }
-
private InMemoryStorageManager manager;
private String threadName;
private ArrayList<RMBean> enlistedBeans = new ArrayList<RMBean>();
@@ -81,12 +58,11 @@
this.useSerialization = useSerialization;
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Exit: InMemoryTransaction::<init>, " + this);
}
-
- public void commit() {
- releaseLocks();
- if (sentMessages && useSerialization) manager.getSender().wakeThread();
- active = false;
- }
+
+ public void commit() {
+ releaseLocks();
+ active = false;
+ }
public void rollback() {
releaseLocks();
@@ -117,7 +93,9 @@
public void enlist(RMBean bean) {
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Entry: InMemoryTransaction::enlist, " + bean);
+
if(isActive()){
+
if (bean != null) {
DummyTransaction tran = null;
synchronized (bean) {
@@ -128,67 +106,44 @@
}
}
- boolean locked = false;
- int count = 0;
- while (!locked) {
- locked = tran.tryLock();
- if (!locked) {
-
- try {
- locked = tran.tryLock(5, TimeUnit.SECONDS);
- if (!locked) {
- count++;
- if (log.isDebugEnabled())
- log.debug("Waiting for bean lock 5 seconds");
- if(count>=deadlockTimeoutSeconds){ // If we've been failed for xx seconds, lets log and give up.
- deadlockTrace();
- String message = "Possible deadlock enlisting bean.";
- IllegalStateException e = new IllegalStateException(message);
- if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Possible deadlock enlisting bean.", e);
- throw e;
- }
- }
- } catch (InterruptedException e) {
- log.warn("InterruptedException encountered enlisting bean", e);
+ try {
+ boolean locked = false;
+ while (!locked) {
+ if (tran.tryLock() || tran.tryLock(5, TimeUnit.SECONDS)) {
+ enlistedBeans.add(bean);
+ locked=true;
+ } else {
+ if (log.isDebugEnabled())
+ log.debug("Waiting for bean lock 5 seconds");
+
}
}
-
- if (locked)
- enlistedBeans.add(bean);
-
}
- }
- } else {
- String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noTransaction);
- IllegalStateException e = new IllegalStateException(message);
- if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("An attempt to enlist new work to an InMemoryTransaction that has previously been committed or rolled back.", e);
- throw e;
- }
- if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Exit: InMemoryTransaction::enlist");
- }
-
- private static synchronized void deadlockTrace(){
- Map<Thread, StackTraceElement[]> map = Thread.getAllStackTraces();
- log.warn("Possible deadlock enlisting bean. Threads: ");
- for(Entry<Thread, StackTraceElement[]> entry: map.entrySet()){
- log.warn(entry.getKey().toString());
- for(StackTraceElement ste: entry.getValue()){
- log.warn("\tat "+ste.toString());
+ catch (InterruptedException e) {
+ log.warn("InterruptedException encountered enlisting bean",e);
}
+ }
+ } else {
+ String message = SandeshaMessageHelper.getMessage(SandeshaMessageKeys.noTransaction);
+ IllegalStateException e = new IllegalStateException(message);
+ if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("An attempt to enlist new work to an InMemoryTransaction that has previously been committed or rolled back.", e);
+ throw e;
}
+
+ if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Exit: InMemoryTransaction::enlist");
}
-
+
private void releaseLocks() {
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Entry: InMemoryTransaction::releaseLocks, " + this);
manager.removeTransaction(this);
- Iterator<RMBean> beans = enlistedBeans.iterator();
+ Iterator beans = enlistedBeans.iterator();
while(beans.hasNext()) {
- RMBean bean = beans.next();
+ RMBean bean = (RMBean) beans.next();
DummyTransaction tran = (DummyTransaction) bean.getTransaction();
tran.unlock();
}
- enlistedBeans.clear();
+ enlistedBeans=new ArrayList<RMBean>();
if(LoggingControl.isAnyTracingEnabled() && log.isDebugEnabled()) log.debug("Exit: InMemoryTransaction::releaseLocks");
}
@@ -222,4 +177,3 @@
-
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java Mon Oct 5 16:01:57 2009
@@ -645,24 +645,9 @@
int responseMessageType = responseRMMessage.getMessageType();
if(log.isDebugEnabled()) log.debug("inboundMsgType" + responseMessageType + "outgoing message type " + messageType);
- //if this is a response msg in response to a make connection then we have to take care with the service context
- if((messageType == Sandesha2Constants.MessageTypes.MAKE_CONNECTION_MSG || messageType == Sandesha2Constants.MessageTypes.UNKNOWN)
- && (responseMessageType == Sandesha2Constants.MessageTypes.APPLICATION
- || responseMessageType == Sandesha2Constants.MessageTypes.CREATE_SEQ_RESPONSE
- || responseMessageType == Sandesha2Constants.MessageTypes.TERMINATE_SEQ_RESPONSE
- || responseMessageType == Sandesha2Constants.MessageTypes.CLOSE_SEQUENCE_RESPONSE)){
-
- //Setting the AxisService object
- responseMessageContext.setAxisService(msgCtx.getAxisService());
+ //Setting the AxisService object
+ responseMessageContext.setAxisService(msgCtx.getAxisService());
- //we cannot set service ctx for application response msgs or createSeqResponse msgs since the srvc ctx will not match the op ctx, causing
- //problems with addressing
- if(log.isDebugEnabled()) log.debug("NOT setting service ctx for response type " + messageType + ", current srvc ctx =" + responseMessageContext.getServiceContext());
- }else {
- if(log.isDebugEnabled()) log.debug("setting service ctx on msg as this is NOT a makeConnection>appResponse or makeConnection>createSeqResponse exchange pattern");
- responseMessageContext.setServiceContext(msgCtx.getServiceContext());
- }
-
//If addressing is disabled we will be adding this message simply as the application response of the request message.
Boolean addressingDisabled = (Boolean) msgCtx.getProperty(AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES);
if (addressingDisabled!=null && Boolean.TRUE.equals(addressingDisabled)) {
@@ -673,7 +658,7 @@
if (requestMsgOpCtx.getAxisOperation().getMessageReceiver() == null) {
// Generate a new RM In Only operation
- ServiceContext serviceCtx = responseMessageContext.getServiceContext();
+ ServiceContext serviceCtx = msgCtx.getServiceContext();
AxisOperation op = msgCtx.getAxisService().getOperation(Sandesha2Constants.RM_IN_ONLY_OPERATION);
responseMsgOpCtx = OperationContextFactory.createOperationContext (op.getAxisSpecificMEPConstant(), op, serviceCtx);
}
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/distribution/pom.xml?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/distribution/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/distribution/pom.xml Mon Oct 5 16:01:57 2009
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</parent>
<groupId>org.apache.sandesha2</groupId>
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/pom.xml?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/pom.xml Mon Oct 5 16:01:57 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</dependency>
<dependency>
@@ -123,8 +123,8 @@
</dependencies>
<properties>
- <rampart.version>SNAPSHOT</rampart.version>
- <wss4j.version>SNAPSHOT</wss4j.version>
+ <rampart.version>1.5-RC1</rampart.version>
+ <wss4j.version>1.5.8</wss4j.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
</properties>
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoString.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoString.java?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoString.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoString.java Mon Oct 5 16:01:57 2009
@@ -22,6 +22,7 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axis2.databinding.ADBException;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
/**
* EchoString bean class
@@ -72,7 +73,7 @@
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(
this, parentQName) {
- public void serialize(javax.xml.stream.XMLStreamWriter xmlWriter)
+ public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException {
// We can safely assume an element has only one type associated
@@ -204,13 +205,12 @@
}
}
-
+
public void serialize(final QName parentQName,
- XMLStreamWriter xmlWriter)throws XMLStreamException, ADBException{}
+ OMFactory _OMFactory, MTOMAwareXMLStreamWriter xmlWriter) throws XMLStreamException, ADBException {}
public void serialize(final QName parentQName,
- XMLStreamWriter xmlWriter,
- boolean serializeType)throws XMLStreamException, ADBException{}
+ OMFactory _OMFactory, MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws XMLStreamException, ADBException {}
/**
* Factory class that keeps the parse method
@@ -295,4 +295,5 @@
}// end of factory class
+
}
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringRequestBodyType.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringRequestBodyType.java?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringRequestBodyType.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringRequestBodyType.java Mon Oct 5 16:01:57 2009
@@ -22,6 +22,7 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axis2.databinding.ADBException;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
/**
* EchoStringRequestBodyType bean class
@@ -122,7 +123,7 @@
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(
this, parentQName) {
- public void serialize(javax.xml.stream.XMLStreamWriter xmlWriter)
+ public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException {
java.lang.String prefix = parentQName.getPrefix();
@@ -334,11 +335,10 @@
}
public void serialize(final QName parentQName,
- XMLStreamWriter xmlWriter)throws XMLStreamException, ADBException{}
+ OMFactory _OMFactory, MTOMAwareXMLStreamWriter xmlWriter) throws XMLStreamException, ADBException {}
public void serialize(final QName parentQName,
- XMLStreamWriter xmlWriter,
- boolean serializeType)throws XMLStreamException, ADBException{}
+ OMFactory _OMFactory, MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws XMLStreamException, ADBException {}
/**
* Factory class that keeps the parse method
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringResponse.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringResponse.java?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringResponse.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringResponse.java Mon Oct 5 16:01:57 2009
@@ -22,6 +22,7 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axis2.databinding.ADBException;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
/**
* EchoStringResponse bean class
@@ -73,7 +74,7 @@
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(
this, parentQName) {
- public void serialize(javax.xml.stream.XMLStreamWriter xmlWriter)
+ public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException {
// We can safely assume an element has only one type associated
@@ -207,11 +208,10 @@
}
public void serialize(final QName parentQName,
- XMLStreamWriter xmlWriter)throws XMLStreamException, ADBException{}
+ OMFactory _OMFactory, MTOMAwareXMLStreamWriter xmlWriter) throws XMLStreamException, ADBException {}
public void serialize(final QName parentQName,
- XMLStreamWriter xmlWriter,
- boolean serializeType)throws XMLStreamException, ADBException{}
+ OMFactory _OMFactory, MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws XMLStreamException, ADBException {}
/**
* Factory class that keeps the parse method
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringResponseBodyType.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringResponseBodyType.java?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringResponseBodyType.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/EchoStringResponseBodyType.java Mon Oct 5 16:01:57 2009
@@ -22,6 +22,7 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axis2.databinding.ADBException;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
/**
* EchoStringResponseBodyType bean class
@@ -85,7 +86,7 @@
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(
this, parentQName) {
- public void serialize(javax.xml.stream.XMLStreamWriter xmlWriter)
+ public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
throws javax.xml.stream.XMLStreamException {
java.lang.String prefix = parentQName.getPrefix();
@@ -252,11 +253,10 @@
}
public void serialize(final QName parentQName,
- XMLStreamWriter xmlWriter)throws XMLStreamException, ADBException{}
+ OMFactory _OMFactory, MTOMAwareXMLStreamWriter xmlWriter) throws XMLStreamException, ADBException {}
public void serialize(final QName parentQName,
- XMLStreamWriter xmlWriter,
- boolean serializeType)throws XMLStreamException, ADBException{}
+ OMFactory _OMFactory, MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws XMLStreamException, ADBException {}
/**
* Factory class that keeps the parse method
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/Ping.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/Ping.java?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/Ping.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/interop/src/main/java/org/tempuri/Ping.java Mon Oct 5 16:01:57 2009
@@ -22,6 +22,7 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axis2.databinding.ADBException;
+import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
/**
* Ping bean class
@@ -82,8 +83,8 @@
org.apache.axiom.om.OMDataSource dataSource = new org.apache.axis2.databinding.ADBDataSource(
this, parentQName) {
- public void serialize(javax.xml.stream.XMLStreamWriter xmlWriter)
- throws javax.xml.stream.XMLStreamException {
+ public void serialize(org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter xmlWriter)
+ throws javax.xml.stream.XMLStreamException {
java.lang.String prefix = parentQName.getPrefix();
java.lang.String namespace = parentQName.getNamespaceURI();
@@ -249,11 +250,10 @@
}
public void serialize(final QName parentQName,
- XMLStreamWriter xmlWriter)throws XMLStreamException, ADBException{}
+ OMFactory _OMFactory, MTOMAwareXMLStreamWriter xmlWriter) throws XMLStreamException, ADBException {}
public void serialize(final QName parentQName,
- XMLStreamWriter xmlWriter,
- boolean serializeType)throws XMLStreamException, ADBException{}
+ OMFactory _OMFactory, MTOMAwareXMLStreamWriter xmlWriter, boolean serializeType) throws XMLStreamException, ADBException {}
/**
* Factory class that keeps the parse method
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/mar/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/mar/pom.xml?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/mar/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/mar/pom.xml Mon Oct 5 16:01:57 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -107,7 +107,7 @@
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</dependency>
</dependencies>
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/persistence/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/persistence/pom.xml?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/persistence/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/persistence/pom.xml Mon Oct 5 16:01:57 2009
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/policy/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/policy/pom.xml?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/policy/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/policy/pom.xml Mon Oct 5 16:01:57 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</dependency>
</dependencies>
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/rampart-integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/rampart-integration/pom.xml?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/rampart-integration/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/rampart-integration/pom.xml Mon Oct 5 16:01:57 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-core</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</dependency>
<!-- Rampart -->
@@ -101,8 +101,8 @@
</dependencies>
<properties>
- <rampart.version>SNAPSHOT</rampart.version>
- <wss4j.version>SNAPSHOT</wss4j.version>
+ <rampart.version>1.5-RC1</rampart.version>
+ <wss4j.version>1.5.8</wss4j.version>
</properties>
</project>
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/samples/pom.xml?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/samples/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/samples/pom.xml Mon Oct 5 16:01:57 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -94,7 +94,17 @@
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transports</artifactId>
+ <artifactId>axis2-transport-http</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-tcp</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-local</artifactId>
<version>SNAPSHOT</version>
</dependency>
<dependency>
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/pom.xml?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/pom.xml Mon Oct 5 16:01:57 2009
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sandesha2</groupId>
<artifactId>sandesha2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -86,7 +86,7 @@
<artifactItem>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
- <version>${rampart.version}</version>
+ <version>1.5</version>
<type>mar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/copiedmars</outputDirectory>
@@ -174,7 +174,7 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
- <version>${rampart.version}</version>
+ <version>1.5</version>
<type>mar</type>
</dependency>
<dependency>
@@ -237,8 +237,8 @@
<properties>
<test.property>2.8.1</test.property>
- <rampart.version>SNAPSHOT</rampart.version>
- <wss4j.version>SNAPSHOT</wss4j.version>
+ <rampart.version>1.5-RC1</rampart.version>
+ <wss4j.version>1.5.8</wss4j.version>
</properties>
</project>
Modified: webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/tests.build.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/tests.build.xml?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/tests.build.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/modules/tests/tests.build.xml Mon Oct 5 16:01:57 2009
@@ -102,7 +102,7 @@
<property name="secure.server.path" value="${build.dir}/repos/secure-server"/>
<property name="repo.addressing.mar" value="${build.dir}/copiedmars/addressing-${addressing.version}.mar" />
- <property name="repo.rampart.mar" value="${build.dir}/copiedmars/rampart-${rampart.version}.mar" />
+ <property name="repo.rampart.mar" value="${build.dir}/copiedmars/rampart-1.5.mar" />
<property name="repo.rampart.core.jar" value="${build.dir}/copiedjars/rampart-core-${rampart.version}.jar" />
<property name="repo.rampart.policy.jar" value="${build.dir}/copiedjars/rampart-policy-${rampart.version}.jar" />
Modified: webservices/sandesha/branches/sandesha2/java/1_5/pom.xml
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_5/pom.xml?rev=821890&r1=821889&r2=821890&view=diff
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_5/pom.xml (original)
+++ webservices/sandesha/branches/sandesha2/java/1_5/pom.xml Mon Oct 5 16:01:57 2009
@@ -13,9 +13,9 @@
guide for more information on using Sandesha2. Read Sandesha2 Architecture guide to see how Sandesha2 works
internally.
</description>
- <version>SNAPSHOT</version>
+ <version>1.5</version>
<name>Apache Sandesha</name>
- <url>http://ws.apache.org/ws-fx/sandesha/sandesha2</url>
+ <url>http://ws.apache.org/sandesha/sandesha2</url>
<licenses>
<license>
@@ -54,8 +54,8 @@
<developer>
<name>Davanum Srinivas</name>
<id>dims</id>
- <email>dims AT wso2.com</email>
- <organization>WSO2</organization>
+ <email>dims AT yahoo.com</email>
+ <organization>IBM</organization>
</developer>
<developer>
<name>Jaliya Ekanayake</name>
@@ -94,6 +94,17 @@
<email>MLOVETT AT uk.ibm.com</email>
<organization>IBM</organization>
</developer>
+ <developer>
+ <name>David Illsley</name>
+ <email>[email protected]</email>
+ </developer>
+ <developer>
+ <name>Dave Parsons</name>
+ <id>parsonsd</id>
+ <email>PARSONSD AT uk.ibm.com</email>
+ <organization>IBM</organization>
+ </developer>
+
</developers>
<build>
@@ -134,7 +145,7 @@
</scm>
<repositories>
- <repository>
+ <repository>
<releases>
<enabled>false</enabled>
<updatePolicy>always</updatePolicy>
@@ -164,8 +175,24 @@
<name>Apache ws.zones - 2</name>
<url>http://ws.zones.apache.org/repository2</url>
</repository>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </snapshots>
+ <id>rampart</id>
+ <name>rampart bit</name>
+ <url>http://people.apache.org/~nandana/rampart-1.5/RC1/m2_repo/</url>
+ </repository>
</repositories>
+
<pluginRepositories>
<pluginRepository>
<id>snapshot-apache</id>
@@ -286,15 +313,15 @@
<module>modules/tests</module>
<module>modules/samples</module>
<module>modules/interop</module>
- <module>modules/persistence</module>
+ <module>modules/persistence</module>
<module>modules/distribution</module>
</modules>
<properties>
- <sandesha2.version>SNAPSHOT</sandesha2.version>
- <axis2.version>SNAPSHOT</axis2.version>
- <axiom.version>1.2.9-SNAPSHOT</axiom.version>
- <neethi.version>3.0.0-SNAPSHOT</neethi.version>
+ <sandesha2.version>1.5</sandesha2.version>
+ <axis2.version>1.5</axis2.version>
+ <axiom.version>1.2.8</axiom.version>
+ <neethi.version>2.0.4</neethi.version>
<commons.logging.version>1.1.1</commons.logging.version>
<stax.api.version>1.0.1</stax.api.version>
<stax.impl.artifactid>wstx-asl</stax.impl.artifactid>