svn commit: r948557 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java
Author: scheu
Date: Wed May 26 19:48:01 2010
New Revision: 948557
URL: http://svn.apache.org/viewvc?rev=948557&view=rev
Log:
AXIS2-4700
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java?rev=948557&r1=948556&r2=948557&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/impl/ArtifactProcessor.java
Wed May 26 19:48:01 2010
@@ -28,6 +28,7 @@ import org.apache.axis2.jaxws.descriptio
import org.apache.axis2.jaxws.runtime.description.marshal.AnnotationDesc;
import org.apache.axis2.jaxws.runtime.description.marshal.FaultBeanDesc;
import org.apache.axis2.jaxws.utility.ClassUtils;
+import org.apache.axis2.jaxws.utility.XMLRootElementUtil;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -37,6 +38,8 @@ import java.security.PrivilegedException
import java.util.HashMap;
import java.util.Map;
+import javax.xml.namespace.QName;
+
/**
* Examines a ServiceDesc and locates and/or builds the JAX-WS artifacts. The
JAX-WS artifacts are:
* - request wrapper classes - response wrapper classes - fault beans for
non-JAX-WS compliant
@@ -228,7 +231,7 @@ class ArtifactProcessor {
}
}
} else {
-// If no valud is provided by the annotation, then the we try
default values.
+// If no value is provided by the annotation, then the we try
default values.
// The wsgen tool generates classes in the jaxws subpackage.
// The wsimport tool generates classes in the same package as
the SEI.
// Note that from reading the JAX-WS spec, it seems that WSGen
is doing that
@@ -236,48 +239,49 @@ class ArtifactProcessor {
// Wrapped on page 36: Conformance (Default wrapper bean
package): In the absence of
// customizations, the wrapper beans package MUST be a
generated jaxws subpackage of the SEI
// package.
+// However, if the class is in both places the runtime should
prefer the one
+// in the non-jaxws package. Why ?
+// The other classes in the non-jaxws package will cause the
non-jaxws
+// wrapper to get pulled in firstthus the jaxws wrapper
will cause a collision.
//
-// Thus the following algorithm with check the jaxws
subpackage first.
+// Thus the following algorithm with check the non-jaxws
package first
String defaultValue = null;
if (defaultPkg.length() > 0) {
-defaultValue = defaultPkg + "." + JAXWS_SUBPACKAGE + "." +
defaultClassName;
-if (log.isDebugEnabled()) {
-log.debug("No provided value. Try the default class
name = " + defaultValue);
-}
-cls = loadClassOrNull(defaultValue, cl);
-if (cls != null) {
-wrapperClass = defaultValue;
-} else {
-cls = loadClassOrNull(defaultValue, altClassLoader);
-if (cls != null) {
-wrapperClass = defaultValue;
-}
-}
-}
+defaultValue = defaultPkg + "." + defaultClassName;
+} else {
+defaultValue = defaultClassName;
+}
+if (log.isDebugEnabled()) {
+log.debug("No provided value. Try the default class name
= " + defaultValue);
+}
+cls = loadClassOrNull(defaultValue, cl);
if (cls == null) {
-// Try pkg without jaxws
+cls = loadClassOrNull(defaultValue, altClassLoader);
+}
+if (cls != null) {
+wrapperClass = defaultValue;
+}
+
+// Now try the one in the jaxws subpackage
+if (cls == null) {
if (defaultPkg.length() > 0) {
-defaultValue = defaultPkg + "." + defaultClassName;
-} else {
-defaultValue = defaultClassName;
-}
-
svn commit: r948589 - in /axis/axis2/java/core/trunk/modules: addressing/src/org/apache/axis2/handlers/addressing/ kernel/src/org/apache/axis2/addressing/ kernel/src/org/apache/axis2/client/ kernel/sr
Author: veithen
Date: Wed May 26 20:57:16 2010
New Revision: 948589
URL: http://svn.apache.org/viewvc?rev=948589&view=rev
Log:
AXIS2-4527: Replaced invocations of UUIDGenerator.getUUID() by calls to more
specialized methods (for content IDs, uuid URNs, general purpose IDs, etc.). In
particular, for message IDs, use uuid URNs with a correct UUID conforming to
ISO/IEC 11578:1996.
Modified:
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/OperationClient.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/Options.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/MessageContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/OperationContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ServiceGroupContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/InOutAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/TwoChannelAxisOperation.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/context/OperationContextTest.java
Modified:
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=948589&r1=948588&r2=948589&view=diff
==
---
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
(original)
+++
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
Wed May 26 20:57:16 2010
@@ -24,12 +24,12 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.AttributeHelper;
import org.apache.axiom.om.util.ElementHelper;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPFault;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.AddressingFaultsHelper;
@@ -229,7 +229,7 @@ public class AddressingOutHandler extend
//Check whether we want to force a message id to be sent.
if (messageID == null && includeOptionalHeaders) {
-messageID = UUIDGenerator.getUUID();
+messageID = UIDGenerator.generateURNString();
messageContextOptions.setMessageId(messageID);
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java?rev=948589&r1=948588&r2=948589&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
Wed May 26 20:57:16 2010
@@ -28,7 +28,7 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.externalize.ExternalizeConstants;
import org.apache.axis2.context.externalize.SafeObjectInputStream;
@@ -823,7 +823,7 @@ public class EndpointReference implement
