svn commit: r960198 - in /axis/axis2/java/transports/trunk/modules: base/pom.xml http/pom.xml jms/pom.xml mail/pom.xml sms/pom.xml tcp/pom.xml testkit/pom.xml udp/pom.xml xmpp/pom.xml
Author: veithen Date: Sat Jul 3 11:13:40 2010 New Revision: 960198 URL: http://svn.apache.org/viewvc?rev=960198&view=rev Log: Fixed broken relativePaths. Modified: axis/axis2/java/transports/trunk/modules/base/pom.xml axis/axis2/java/transports/trunk/modules/http/pom.xml axis/axis2/java/transports/trunk/modules/jms/pom.xml axis/axis2/java/transports/trunk/modules/mail/pom.xml axis/axis2/java/transports/trunk/modules/sms/pom.xml axis/axis2/java/transports/trunk/modules/tcp/pom.xml axis/axis2/java/transports/trunk/modules/testkit/pom.xml axis/axis2/java/transports/trunk/modules/udp/pom.xml axis/axis2/java/transports/trunk/modules/xmpp/pom.xml Modified: axis/axis2/java/transports/trunk/modules/base/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/pom.xml?rev=960198&r1=960197&r2=960198&view=diff == --- axis/axis2/java/transports/trunk/modules/base/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/base/pom.xml Sat Jul 3 11:13:40 2010 @@ -27,7 +27,7 @@ org.apache.axis2 axis2-transports 1.1.0-SNAPSHOT -../parent/pom.xml +../../pom.xml org.apache.axis2 Modified: axis/axis2/java/transports/trunk/modules/http/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/http/pom.xml?rev=960198&r1=960197&r2=960198&view=diff == --- axis/axis2/java/transports/trunk/modules/http/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/http/pom.xml Sat Jul 3 11:13:40 2010 @@ -26,7 +26,7 @@ org.apache.axis2 axis2-transports 1.1.0-SNAPSHOT -../parent/pom.xml +../../pom.xml axis2-transport-http-tests Apache Axis2 - Transport - HTTP Tests Modified: axis/axis2/java/transports/trunk/modules/jms/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/pom.xml?rev=960198&r1=960197&r2=960198&view=diff == --- axis/axis2/java/transports/trunk/modules/jms/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/jms/pom.xml Sat Jul 3 11:13:40 2010 @@ -27,7 +27,7 @@ org.apache.axis2 axis2-transports 1.1.0-SNAPSHOT -../parent/pom.xml +../../pom.xml org.apache.axis2 Modified: axis/axis2/java/transports/trunk/modules/mail/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/pom.xml?rev=960198&r1=960197&r2=960198&view=diff == --- axis/axis2/java/transports/trunk/modules/mail/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/mail/pom.xml Sat Jul 3 11:13:40 2010 @@ -27,7 +27,7 @@ org.apache.axis2 axis2-transports 1.1.0-SNAPSHOT -../parent/pom.xml +../../pom.xml org.apache.axis2 Modified: axis/axis2/java/transports/trunk/modules/sms/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/sms/pom.xml?rev=960198&r1=960197&r2=960198&view=diff == --- axis/axis2/java/transports/trunk/modules/sms/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/sms/pom.xml Sat Jul 3 11:13:40 2010 @@ -27,7 +27,7 @@ org.apache.axis2 axis2-transports 1.1.0-SNAPSHOT -../parent/pom.xml +../../pom.xml org.apache.axis2 Modified: axis/axis2/java/transports/trunk/modules/tcp/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/tcp/pom.xml?rev=960198&r1=960197&r2=960198&view=diff == --- axis/axis2/java/transports/trunk/modules/tcp/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/tcp/pom.xml Sat Jul 3 11:13:40 2010 @@ -26,7 +26,7 @@ org.apache.axis2 axis2-transports 1.1.0-SNAPSHOT -../parent/pom.xml +../../pom.xml axis2-transport-tcp Apache Axis2 - Transport - TCP Modified: axis/axis2/java/transports/trunk/modules/testkit/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/pom.xml?rev=960198&r1=960197&r2=960198&view=diff == --- axis/axis2/java/transports/trunk/modules/testkit/pom.xml (original) +++ axis/axis2/java/transports/trunk/modules/testkit/pom.xml Sat Jul 3 11:13:40 2010 @@ -26,7 +26,7 @@ org.apache.axis2 axis2-transports 1.1.0-SNAPSHOT -../parent/pom.xml +../../pom.xml axis2-transport-testkit Apache Axis2 - Transport - tes
svn commit: r960200 - /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
Author: veithen
Date: Sat Jul 3 11:16:06 2010
New Revision: 960200
URL: http://svn.apache.org/viewvc?rev=960200&view=rev
Log:
AXIS2-4759: Applied patch submitted by Grant Patterson. Fixed
ServiceTaskManager to properly closes the connection. Also fixed some
concurrency issues.
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java?rev=960200&r1=960199&r2=960200&view=diff
==
---
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
(original)
+++
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
Sat Jul 3 11:16:06 2010
@@ -229,9 +229,9 @@ public class ServiceTaskManager {
if (sharedConnection != null) {
try {
-sharedConnection.stop();
+sharedConnection.close();
} catch (JMSException e) {
-logError("Error stopping shared Connection", e);
+logError("Error closing shared Connection", e);
} finally {
sharedConnection = null;
}
@@ -337,7 +337,7 @@ public class ServiceTaskManager {
/** Is this task idle right now? */
private volatile boolean idle = false;
/** Is this task connected to the JMS provider successfully? */
-private boolean connected = false;
+private volatile boolean connected = false;
/** As soon as we create a new polling task, add it to the STM for
control later */
MessageListenerTask() {
@@ -439,31 +439,36 @@ public class ServiceTaskManager {
}
} finally {
+
+if (log.isTraceEnabled()) {
+log.trace("Listener task with Thread ID : " +
Thread.currentThread().getId() +
+" is stopping after processing : " + messageCount + "
messages :: " +
+" isActive : " + isActive() + " maxMessagesPerTask : "
+
+getMaxMessagesPerTask() + " concurrentConsumers : " +
getConcurrentConsumers() +
+" idleExecutionCount : " + idleExecutionCount + "
idleTaskExecutionLimit : " +
+getIdleTaskExecutionLimit());
+} else if (log.isDebugEnabled()) {
+log.debug("Listener task with Thread ID : " +
Thread.currentThread().getId() +
+" is stopping after processing : " + messageCount + "
messages");
+}
+
+// Close the consumer and session before decrementing
activeTaskCount.
+// (If we have a shared connection, Qpid deadlocks if the
shared connection
+// is closed on another thread while closing the session)
+closeConsumer(true);
+closeSession(true);
+closeConnection();
+
workerState = STATE_STOPPED;
activeTaskCount--;
synchronized(pollingTasks) {
pollingTasks.remove(this);
}
+
+// My time is up, so if I am going away, create another
+scheduleNewTaskIfAppropriate();
}
-if (log.isTraceEnabled()) {
-log.trace("Listener task with Thread ID : " +
Thread.currentThread().getId() +
-" is stopping after processing : " + messageCount + "
messages :: " +
-" isActive : " + isActive() + " maxMessagesPerTask : " +
-getMaxMessagesPerTask() + " concurrentConsumers : " +
getConcurrentConsumers() +
-" idleExecutionCount : " + idleExecutionCount + "
idleTaskExecutionLimit : " +
-getIdleTaskExecutionLimit());
-} else if (log.isDebugEnabled()) {
-log.debug("Listener task with Thread ID : " +
Thread.currentThread().getId() +
-" is stopping after processing : " + messageCount + "
messages");
-}
-
-closeConsumer(true);
-closeSession(true);
-closeConnection();
-
-// My time is up, so if I am going away, create another
-scheduleNewTaskIfAppropriate();
}
/**
@@ -670,20 +675,23 @@ public class ServiceTaskManager {
// Connection is not shared
if (connection == null) {
connection = createConnection();
+setConnec
svn commit: r960201 - in /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws: message/databinding/JAXBUtils.java runtime/description/marshal/impl/MarshalServiceRuntimeDescriptionImpl.
Author: scheu
Date: Sat Jul 3 11:16:36 2010
New Revision: 960201
URL: http://svn.apache.org/viewvc?rev=960201&view=rev
Log:
AXIS2-4708
Contributor:Rich Scheuerle
Small change to enhance lookup of JAXBContext objects
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/MarshalServiceRuntimeDescriptionImpl.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java?rev=960201&r1=960200&r2=960201&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBUtils.java
Sat Jul 3 11:16:36 2010
@@ -22,6 +22,7 @@ package org.apache.axis2.jaxws.message.d
import org.apache.axis2.java.security.AccessController;
import org.apache.axis2.jaxws.ExceptionFactory;
import org.apache.axis2.jaxws.i18n.Messages;
+import org.apache.axis2.jaxws.message.databinding.JAXBUtilsMonitor;
import org.apache.axis2.jaxws.message.factory.ClassFinderFactory;
import org.apache.axis2.jaxws.registry.FactoryRegistry;
import org.apache.axis2.jaxws.utility.ClassUtils;
@@ -208,7 +209,7 @@ public class JAXBUtils {
log.debug(pkg);
}
}
-JAXBUtilsMonitor.addPackageKey(key);
+JAXBUtilsMonitor.addPackageKey(contextPackages.toString());
// Get or Create The InnerMap using the package key
ConcurrentHashMap innerMap = null;
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/MarshalServiceRuntimeDescriptionImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/MarshalServiceRuntimeDescriptionImpl.java?rev=960201&r1=960200&r2=960201&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/MarshalServiceRuntimeDescriptionImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/MarshalServiceRuntimeDescriptionImpl.java
Sat Jul 3 11:16:36 2010
@@ -90,7 +90,7 @@ public class MarshalServiceRuntimeDescri
void setPackages(TreeSet packages) {
this.packages = packages;
-this.packagesKey = packages.toString(); // Unique key for searches
+this.packagesKey = getObjectIdentity(packages); // Unique key for
searches
}
public AnnotationDesc getAnnotationDesc(Class cls) {
@@ -266,5 +266,39 @@ public class MarshalServiceRuntimeDescri
public MessageFactory getMessageFactory() {
return messageFactory;
}
+
+/**
+ * Java does not provide a way to uniquely identify an object. This makes
+ * it difficult to distinguish one object from another in a trace. The
+ * default Object.toString() produces a string of the form:
+ *
+ * obj.getClass().getName() + "@" +
Integer.toHexString(obj.hashCode())
+ *
+ * This is "as-good-as-it-gets". If 'hashCode' has been overridden, it
gets
+ * worse. Specifically, if hashCode has been overriden such that:
+ *
+ * obj1.equals(obj2) ==> obj1.hashCode() == obj2.hashCode()
+ *
+ * then it becomes impossible to distinguish between obj1 and obj2 in a
trace:
+ * - dumping values is (almost) guaranteed to reveal that both have same
content.
+ * - dumping hashCode (see Object.toString() comment above) gives same
hashCode.
+ *
+ * [For example, JNDI Reference objects exhibit this behavior]
+ *
+ * The purpose of getObjectIdentity is to attempt to duplicate the
"original"
+ * behavior of Object.toString(). On some JVMs, the 'original' hashCode
+ * corresponds to a memory reference to the object - which is unique.
+ *
+ * This is NOT guaranteed to work on all JVMs. But again, this seems to be
+ * "as-good-as-it-gets".
+ *
+ * @return obj.getClass().getName() + "@" +
Integer.toHexString(System.identityHashCode(obj));
+ */
+private static String getObjectIdentity(Object obj) {
+if (obj == null) {
+return "null";
+}
+return obj.getClass().getName() + "@" +
Integer.toHexString(System.identityHashCode(obj));
+}
}
svn commit: r960202 - /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
Author: veithen
Date: Sat Jul 3 11:18:39 2010
New Revision: 960202
URL: http://svn.apache.org/viewvc?rev=960202&view=rev
Log:
Replaced tabs by spaces.
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java?rev=960202&r1=960201&r2=960202&view=diff
==
---
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
(original)
+++
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
Sat Jul 3 11:18:39 2010
@@ -163,7 +163,7 @@ public class ServiceTaskManager {
}
if (cacheLevel == JMSConstants.CACHE_AUTO) {
- cacheLevel =
+cacheLevel =
transactionality == BaseConstants.TRANSACTION_NONE ?
JMSConstants.CACHE_CONSUMER : JMSConstants.CACHE_NONE;
}
@@ -397,10 +397,10 @@ public class ServiceTaskManager {
try {
if (transactionality == BaseConstants.TRANSACTION_JTA)
{
ut = getUserTransaction();
- // We will only create a new tx if there is no tx
alive
- if (ut.getStatus() == Status.STATUS_NO_TRANSACTION)
{
- ut.begin();
- }
+// We will only create a new tx if there is no tx
alive
+if (ut.getStatus() ==
Status.STATUS_NO_TRANSACTION) {
+ut.begin();
+}
}
} catch (NotSupportedException e) {
handleException("Listener Task is already associated
with a transaction", e);
@@ -439,7 +439,7 @@ public class ServiceTaskManager {
}
} finally {
-
+
if (log.isTraceEnabled()) {
log.trace("Listener task with Thread ID : " +
Thread.currentThread().getId() +
" is stopping after processing : " + messageCount + "
messages :: " +
@@ -451,7 +451,7 @@ public class ServiceTaskManager {
log.debug("Listener task with Thread ID : " +
Thread.currentThread().getId() +
" is stopping after processing : " + messageCount + "
messages");
}
-
+
// Close the consumer and session before decrementing
activeTaskCount.
// (If we have a shared connection, Qpid deadlocks if the
shared connection
// is closed on another thread while closing the session)
svn commit: r960203 - in /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms: JMSConnectionFactory.java JMSConnectionFactoryManager.java JMSSender.java
Author: veithen
Date: Sat Jul 3 11:28:44 2010
New Revision: 960203
URL: http://svn.apache.org/viewvc?rev=960203&view=rev
Log:
AXIS2-4759: Applied patch submitted by Grant Patterson. Fixed
JMSSender/JMSConnectionFactory so that JMS connections are properly closed when
the JMS transport sender is stopped.
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactoryManager.java
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java?rev=960203&r1=960202&r2=960203&view=diff
==
---
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
(original)
+++
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java
Sat Jul 3 11:28:44 2010
@@ -125,6 +125,19 @@ public class JMSConnectionFactory {
throw new AxisJMSException("Invalid cache level : " + val + " for
JMS CF : " + name);
}
}
+
+/**
+ * Close all connections, sessions etc.. and stop this connection factory
+ */
+public synchronized void stop() {
+if (sharedConnection != null) {
+try {
+ sharedConnection.close();
+} catch (JMSException e) {
+log.warn("Error shutting down connection factory : " + name,
e);
+}
+}
+}
/**
* Return the name assigned to this JMS CF definition
@@ -366,7 +379,7 @@ public class JMSConnectionFactory {
* Get a new Connection or shared Connection from this JMS CF
* @return new or shared Connection from this JMS CF
*/
-private Connection getSharedConnection() {
+private synchronized Connection getSharedConnection() {
if (sharedConnection == null) {
sharedConnection = createConnection();
if (log.isDebugEnabled()) {
@@ -380,7 +393,7 @@ public class JMSConnectionFactory {
* Get a shared Session from this JMS CF
* @return shared Session from this JMS CF
*/
-private Session getSharedSession() {
+private synchronized Session getSharedSession() {
if (sharedSession == null) {
sharedSession = createSession(getSharedConnection());
if (log.isDebugEnabled()) {
@@ -394,7 +407,7 @@ public class JMSConnectionFactory {
* Get a shared MessageProducer from this JMS CF
* @return shared MessageProducer from this JMS CF
*/
-private MessageProducer getSharedProducer() {
+private synchronized MessageProducer getSharedProducer() {
if (sharedProducer == null) {
sharedProducer = createProducer(getSharedSession(),
sharedDestination);
if (log.isDebugEnabled()) {
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactoryManager.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactoryManager.java?rev=960203&r1=960202&r2=960203&view=diff
==
---
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactoryManager.java
(original)
+++
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactoryManager.java
Sat Jul 3 11:28:44 2010
@@ -113,6 +113,15 @@ public class JMSConnectionFactoryManager
private static boolean equals(Object s1, Object s2) {
return s1 == s2 || s1 != null && s1.equals(s2);
}
+
+/**
+ * Stop all connection factories.
+ */
+public void stop() {
+for (JMSConnectionFactory conFac : connectionFactories.values()) {
+conFac.stop();
+}
+}
protected void handleException(String msg, Exception e) throws AxisFault {
log.error(msg, e);
Modified:
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java?rev=960203&r1=960202&r2=960203&view=diff
==
---
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
(or
svn commit: r960205 - in /axis/axis2/java/core/trunk/modules/metadata: src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java test/org/apache/axis2/jaxws/description/MustUnderstandT
Author: scheu
Date: Sat Jul 3 11:45:45 2010
New Revision: 960205
URL: http://svn.apache.org/viewvc?rev=960205&view=rev
Log:
AXIS2-4761
Contributor:Lori VanGulick
Ensure that output header parameters are "understood" by the header "must
understand" checking.
A validation test is also added.
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
axis/axis2/java/core/trunk/modules/metadata/test/org/apache/axis2/jaxws/description/MustUnderstandTests.java
Modified:
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java?rev=960205&r1=960204&r2=960205&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
Sat Jul 3 11:45:45 2010
@@ -2265,11 +2265,27 @@ class OperationDescriptionImpl
paramDesc.getParameterName());
understoodQNames.add(headerQN);
if (log.isDebugEnabled()) {
-log.debug("OpDesc: understoodQName added to
AxisOperation (if not null) " + headerQN);
+log.debug("OpDesc: understoodQName added to
AxisOperation (if not null) as IN or INOUT param " + headerQN);
+}
+} else if (paramDesc.isHeader()
+&& (paramDesc.getMode() == WebParam.Mode.OUT)) {
+QName headerQN = new QName(paramDesc.getTargetNamespace(),
+paramDesc.getParameterName());
+understoodQNames.add(headerQN);
+if (log.isDebugEnabled()) {
+log.debug("OpDesc: understoodQName added to
AxisOperation (if not null) as OUT param " + headerQN);
}
}
}
}
+// Also check for result in header
+if (isResultHeader() && (getResultName() != null)) {
+QName headerQN = new QName(getResultTargetNamespace(),
getResultName());
+understoodQNames.add(headerQN);
+if (log.isDebugEnabled()) {
+log.debug("OpDesc: understoodQName added to AxisOperation (if
not null) as result param " + headerQN);
+}
+}
if (!understoodQNames.isEmpty()) {
Parameter headerQNParameter = new
Parameter(OperationDescription.HEADER_PARAMETER_QNAMES,
Modified:
axis/axis2/java/core/trunk/modules/metadata/test/org/apache/axis2/jaxws/description/MustUnderstandTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/test/org/apache/axis2/jaxws/description/MustUnderstandTests.java?rev=960205&r1=960204&r2=960205&view=diff
==
---
axis/axis2/java/core/trunk/modules/metadata/test/org/apache/axis2/jaxws/description/MustUnderstandTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/metadata/test/org/apache/axis2/jaxws/description/MustUnderstandTests.java
Sat Jul 3 11:45:45 2010
@@ -23,7 +23,9 @@ import junit.framework.TestCase;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.Parameter;
+import javax.jws.WebMethod;
import javax.jws.WebParam;
+import javax.jws.WebResult;
import javax.jws.WebService;
import javax.xml.namespace.QName;
import javax.xml.ws.Holder;
@@ -55,23 +57,26 @@ public class MustUnderstandTests extends
Parameter understoodQNamesParameter =
axisOperation.getParameter(OperationDescription.HEADER_PARAMETER_QNAMES);
assertNotNull(understoodQNamesParameter);
ArrayList understoodQNames = (ArrayList)
understoodQNamesParameter.getValue();
-assertEquals(4, understoodQNames.size());
+assertEquals(6, understoodQNames.size());
assertTrue(understoodQNames.contains(new QName("webservice.namespace",
"renamedParam1")));
assertTrue(understoodQNames.contains(new QName("webservice.namespace",
"arg1")));
assertTrue(understoodQNames.contains(new QName("webparam.namespace",
"arg2")));
assertFalse(understoodQNames.contains(new
QName("webservice.namespace", "outOnly")));
-assertFalse(understoodQNames.contains(new
QName("webservice.namespace", "arg3")));
+assertTrue(understoodQNames.contains(new QName("webservice.namespace",
"arg3")));
assertTrue(understoodQNames.contains(new QName("webservice.namespace",
"inOut")));
assertFalse(understoodQNames.c
svn commit: r960265 - /axis/axis2/java/rampart/trunk/pom.xml
Author: veithen Date: Sat Jul 3 20:18:36 2010 New Revision: 960265 URL: http://svn.apache.org/viewvc?rev=960265&view=rev Log: Use an addressing module version consistent with the Axis2 version. Modified: axis/axis2/java/rampart/trunk/pom.xml Modified: axis/axis2/java/rampart/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=960265&r1=960264&r2=960265&view=diff == --- axis/axis2/java/rampart/trunk/pom.xml (original) +++ axis/axis2/java/rampart/trunk/pom.xml Sat Jul 3 20:18:36 2010 @@ -381,7 +381,7 @@ SNAPSHOT 1.1.0-SNAPSHOT -1.5 +SNAPSHOT 1.5.8 1.4.2
svn commit: r960266 - /axis/axis2/java/rampart/trunk/pom.xml
Author: veithen Date: Sat Jul 3 20:25:15 2010 New Revision: 960266 URL: http://svn.apache.org/viewvc?rev=960266&view=rev Log: Use org.apache:apache:7 as parent POM, so that the build has access to the new Apache snapshot repository. This also makes sure that all artifacts include the appropriate LICENSE and NOTICE files. Modified: axis/axis2/java/rampart/trunk/pom.xml Modified: axis/axis2/java/rampart/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=960266&r1=960265&r2=960266&view=diff == --- axis/axis2/java/rampart/trunk/pom.xml (original) +++ axis/axis2/java/rampart/trunk/pom.xml Sat Jul 3 20:25:15 2010 @@ -3,6 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 + +org.apache +apache +7 + org.apache.rampart rampart-project pom
svn commit: r960267 - in /axis/axis2/java/rampart/trunk: ./ modules/rampart-integration/ modules/rampart-integration/src/main/java/org/apache/axis2/integration/ modules/rampart-integration/src/test/re
Author: veithen
Date: Sat Jul 3 20:56:40 2010
New Revision: 960267
URL: http://svn.apache.org/viewvc?rev=960267&view=rev
Log:
Removed the dependency on the transports project. The TCP transport is actually
never used in the integration tests. It is only loaded in axis2.xml for
historical reasons.
Removed:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilsTCPServer.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/complete.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s2.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s2a.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s3.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s4.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s5.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s6.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s7.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/sST1.service.axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/secMtom.service.axis2.xml
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=960267&r1=960266&r2=960267&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Sat Jul
3 20:56:40 2010
@@ -765,11 +765,6 @@
org.apache.axis2
-axis2-transport-tcp
-${axis2.transport.version}
-
-
-org.apache.axis2
axis2-transport-local
${axis2.version}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml
Sat Jul 3 20:56:40 2010
@@ -138,20 +138,10 @@
-
-6060
-
-
-
-
-
-
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/complete.service.axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/complete.service.axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/complete.service.axis2.xml
Sat Jul 3 20:56:40 2010
@@ -32,15 +32,10 @@
ax...@127.0.0.1
-->
-
-6060
-
-
-
HTTP/1.0
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml?rev=960267&r1=960266&r2=960267&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml
Sat Jul 3 20:56:40 2010
@@ -23,15 +23,10 @@
ax...@127.0.0.1
-->
-
-6060
-
-
-
HTTP/1.0
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/security/s2.service.axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java
