svn commit: r1042551 - /axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
Author: amilas Date: Mon Dec 6 09:05:13 2010 New Revision: 1042551 URL: http://svn.apache.org/viewvc?rev=1042551&view=rev Log: remane the temp variable content to listContent inorder to avoid some compilation issues. Modified: axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl Modified: axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=1042551&r1=1042550&r2=1042551&view=diff == --- axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl (original) +++ axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl Mon Dec 6 09:05:13 2010 @@ -2247,8 +2247,8 @@ -java.lang.String content = reader.getElementText(); -object = .Factory.fromString(reader,content); +java.lang.String listContent = reader.getElementText(); +object = .Factory.fromString(reader,listContent);
svn commit: r1042807 - /axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml
Author: veithen
Date: Mon Dec 6 21:49:24 2010
New Revision: 1042807
URL: http://svn.apache.org/viewvc?rev=1042807&view=rev
Log:
Replaced tabs by spaces.
Modified:
axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml
Modified:
axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml?rev=1042807&r1=1042806&r2=1042807&view=diff
==
---
axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml
(original)
+++
axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml
Mon Dec 6 21:49:24 2010
@@ -95,9 +95,9 @@
../../modules/samples/src/main/resources/userguide
sandesha2-${version}-bin/samples/clients
-
- services.xml
-
+
+services.xml
+
../../modules/tests/test-resources
@@ -120,23 +120,23 @@
UserguideSampleClients.jar
-
+
- ../../modules/distribution/src/main/assembly
+../../modules/distribution/src/main/assembly
sandesha2-${version}-bin/samples/clients/lib
lib.txt
- ../../modules/distribution/src/main/assembly
+../../modules/distribution/src/main/assembly
sandesha2-${version}-bin/samples/clients/modules
modules.txt
- ../../modules/distribution/src/main/assembly
+../../modules/distribution/src/main/assembly
sandesha2-${version}-bin/samples/clients/services
services.txt
svn commit: r1042826 - in /axis/axis2/java/sandesha/trunk/modules/distribution: pom.xml src/main/assembly/bin.xml
Author: veithen
Date: Mon Dec 6 22:32:56 2010
New Revision: 1042826
URL: http://svn.apache.org/viewvc?rev=1042826&view=rev
Log:
Use a dependencySet instead of a fileSet to include the JARs and the MAR into
the binary distribution. Copying stuff from the target folder of sibling
projects is a bad practice. Adding the other Maven modules as dependencies also
eliminates the Javadoc warnings about missing packages.
Modified:
axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml
axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml
Modified: axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml?rev=1042826&r1=1042825&r2=1042826&view=diff
==
--- axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml Mon Dec 6
22:32:56 2010
@@ -43,6 +43,40 @@
http://axis.apache.org/axis2/java/sandesha/
+
+
+org.apache.sandesha2
+sandesha2-core
+${project.version}
+
+
+org.apache.sandesha2
+sandesha2-client-constants
+${project.version}
+
+
+org.apache.sandesha2
+sandesha2-policy
+${project.version}
+
+
+org.apache.sandesha2
+sandesha2-rampart-integration
+${project.version}
+
+
+org.apache.sandesha2
+sandesha2-persistence
+${project.version}
+
+
+org.apache.sandesha2
+sandesha2
+${project.version}
+mar
+
+
+
Modified:
axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml?rev=1042826&r1=1042825&r2=1042826&view=diff
==
---
axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml
(original)
+++
axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/bin.xml
Mon Dec 6 22:32:56 2010
@@ -36,49 +36,6 @@
-../../modules/core/target
-sandesha2-${version}-bin
-
-sandesha2-core-${version}.jar
-
-
-
-../../modules/client/target
-sandesha2-${version}-bin
-
-sandesha2-client-constants-${version}.jar
-
-
-
-../../modules/policy/target
-sandesha2-${version}-bin
-
-sandesha2-policy-${version}.jar
-
-
-
-../../modules/rampart-integration/target
-sandesha2-${version}-bin
-
-sandesha2-rampart-integration-${version}.jar
-
-
-
-../../modules/persistence/target
-sandesha2-${version}-bin
-
-sandesha2-persistence-${version}.jar
-
-
-
-
-../../modules/mar/target
-sandesha2-${version}-bin
-
-sandesha2-${version}.mar
-
-
-
../../xdocs
sandesha2-${version}-bin/docs
@@ -143,4 +100,17 @@
+
+
+sandesha2-${version}-bin
+
+org.apache.sandesha2:sandesha2-core
+
org.apache.sandesha2:sandesha2-client-constants
+org.apache.sandesha2:sandesha2-policy
+
org.apache.sandesha2:sandesha2-rampart-integration
+org.apache.sandesha2:sandesha2-persistence
+org.apache.sandesha2:sandesha2
+
+
+
svn commit: r1042828 - /axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml
Author: veithen Date: Mon Dec 6 22:39:00 2010 New Revision: 1042828 URL: http://svn.apache.org/viewvc?rev=1042828&view=rev Log: Replaced tabs with spaces. Modified: axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml Modified: axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml?rev=1042828&r1=1042827&r2=1042828&view=diff == --- axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml Mon Dec 6 22:39:00 2010 @@ -20,21 +20,21 @@ docs true - + zip - ../../xdocs +../../xdocs xdocs .svn/** - target/docs/apidocs - apidocs +target/docs/apidocs +apidocs .svn/**
svn commit: r1042835 - in /axis/axis2/java/sandesha/trunk/modules/distribution: pom.xml src/main/assembly/doc.xml
Author: veithen Date: Mon Dec 6 22:56:15 2010 New Revision: 1042835 URL: http://svn.apache.org/viewvc?rev=1042835&view=rev Log: Again include the architecture and user guides (which were moved to make it possible to generate the Maven site) into the docs distribution. Also upgraded the maven-assembly-plugin because 2.1 has an issue with file permissions in ZIP files. Modified: axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml Modified: axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml?rev=1042835&r1=1042834&r2=1042835&view=diff == --- axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/distribution/pom.xml Mon Dec 6 22:56:15 2010 @@ -156,7 +156,7 @@ org.apache.maven.plugins maven-assembly-plugin -2.1 +2.2-beta-5 distribution-package Modified: axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml?rev=1042835&r1=1042834&r2=1042835&view=diff == --- axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/distribution/src/main/assembly/doc.xml Mon Dec 6 22:56:15 2010 @@ -26,8 +26,8 @@ -../../xdocs -xdocs +../../src/site/resources/images +guides/images .svn/** @@ -49,5 +49,20 @@ + + + +../../src/site/xdoc/architectureGuide.xml +guides +architectureGuide.html + + +../../src/site/xdoc/userGuide.xml +guides +userGuide.html + +
svn commit: r1042852 - /axis/axis2/java/sandesha/trunk/pom.xml
Author: veithen
Date: Mon Dec 6 23:24:53 2010
New Revision: 1042852
URL: http://svn.apache.org/viewvc?rev=1042852&view=rev
Log:
Removed the axis2-codegen dependency from the root POM. It is only used by the
interop module, which already has a dependency declaration for axis2-codegen.
Modified:
axis/axis2/java/sandesha/trunk/pom.xml
Modified: axis/axis2/java/sandesha/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/pom.xml?rev=1042852&r1=1042851&r2=1042852&view=diff
==
--- axis/axis2/java/sandesha/trunk/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/pom.xml Mon Dec 6 23:24:53 2010
@@ -262,12 +262,6 @@
org.apache.axis2
-axis2-codegen
-${axis2.version}
-
-
-
-org.apache.axis2
addressing
${axis2.version}
mar
svn commit: r1042866 - in /axis/axis2/java/sandesha/trunk: modules/interop/pom.xml modules/samples/pom.xml pom.xml
Author: veithen
Date: Mon Dec 6 23:50:13 2010
New Revision: 1042866
URL: http://svn.apache.org/viewvc?rev=1042866&view=rev
Log:
Removed the direct StAX, activation and javamail dependencies and use whatever
Axis2 and Axiom recommends. In particular this removes the duplicate dependency
on the StAX API.
Modified:
axis/axis2/java/sandesha/trunk/modules/interop/pom.xml
axis/axis2/java/sandesha/trunk/modules/samples/pom.xml
axis/axis2/java/sandesha/trunk/pom.xml
Modified: axis/axis2/java/sandesha/trunk/modules/interop/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/interop/pom.xml?rev=1042866&r1=1042865&r2=1042866&view=diff
==
--- axis/axis2/java/sandesha/trunk/modules/interop/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/interop/pom.xml Mon Dec 6 23:50:13
2010
@@ -148,17 +148,6 @@
${wsdl4j.version}
-
-org.apache.geronimo.specs
-geronimo-activation_1.1_spec
-${geronimo.spec.activation.version}
-
-
-org.apache.geronimo.specs
-geronimo-javamail_1.4_spec
-${geronimo.spec.javamail.version}
-
-
org.apache.rampart
Modified: axis/axis2/java/sandesha/trunk/modules/samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/samples/pom.xml?rev=1042866&r1=1042865&r2=1042866&view=diff
==
--- axis/axis2/java/sandesha/trunk/modules/samples/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/samples/pom.xml Mon Dec 6 23:50:13
2010
@@ -103,17 +103,6 @@
axis2-transport-http
${axis2.version}
-
-org.apache.geronimo.specs
-geronimo-activation_1.1_spec
-${geronimo.spec.activation.version}
-
-
-org.apache.geronimo.specs
-geronimo-javamail_1.4_spec
-${geronimo.spec.javamail.version}
-
-
Modified: axis/axis2/java/sandesha/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/pom.xml?rev=1042866&r1=1042865&r2=1042866&view=diff
==
--- axis/axis2/java/sandesha/trunk/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/pom.xml Mon Dec 6 23:50:13 2010
@@ -228,18 +228,6 @@
-${stax.impl.groupid}
-${stax.impl.artifactid}
-${stax.impl.version}
-
-
-
-stax
-stax-api
-${stax.api.version}
-
-
-
junit
junit
3.8.2
@@ -320,12 +308,6 @@
1.2.11-SNAPSHOT
3.0.0-SNAPSHOT
1.1.1
-1.0.1
-wstx-asl
-org.codehaus.woodstox
-3.2.4
-
1.0.1
-1.2
3.8.2
1.2.15
svn commit: r1042889 - in /axis/axis2/java/core/trunk/modules: jaxws/src/org/apache/axis2/jaxws/core/ jaxws/src/org/apache/axis2/jaxws/handler/ kernel/src/org/apache/axis2/transport/
Author: scheu
Date: Tue Dec 7 02:09:47 2010
New Revision: 1042889
URL: http://svn.apache.org/viewvc?rev=1042889&view=rev
Log:
AXIS2-4906
Contributor:Doug Larson & Rich Scheuerle
Summary: Small, localized refactoring to remove unnecessary getProperty calls.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/AttachmentsAdapter.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/SOAPHeadersAdapter.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java?rev=1042889&r1=1042888&r2=1042889&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/MessageContext.java
Tue Dec 7 02:09:47 2010
@@ -179,6 +179,17 @@ public class MessageContext {
axisMsgCtx.setProperty(key, value);
return retval;
}
+
+/**
+ * Like getProperty, but does not return prior value.
+ * This method should be used in scenarios where
+ * the prior value is not needed.
+ * @param key String
+ * @param value Object
+ */
+public void setPropertyNoReturn(String key, Object value) {
+axisMsgCtx.setProperty(key, value);
+}
public EndpointDescription getEndpointDescription() {
return endpointDesc;
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/AttachmentsAdapter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/AttachmentsAdapter.java?rev=1042889&r1=1042888&r2=1042889&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/AttachmentsAdapter.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/AttachmentsAdapter.java
Tue Dec 7 02:09:47 2010
@@ -108,7 +108,7 @@ public class AttachmentsAdapter implemen
// Copy the existing Map contents to this new adapter
aa.putAll((Map) map);
}
-mc.setProperty(propertyName, aa);
+mc.setPropertyNoReturn(propertyName, aa);
}
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/SOAPHeadersAdapter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/SOAPHeadersAdapter.java?rev=1042889&r1=1042888&r2=1042889&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/SOAPHeadersAdapter.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/SOAPHeadersAdapter.java
Tue Dec 7 02:09:47 2010
@@ -107,7 +107,7 @@ public class SOAPHeadersAdapter implemen
// Copy the existing Map contents to this new adapter
sha.putAll((Map>) map);
}
-mc.setProperty(property, sha);
+mc.setPropertyNoReturn(property, sha);
}
/**
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java?rev=1042889&r1=1042888&r2=1042889&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/handler/TransportHeadersAdapter.java
Tue Dec 7 02:09:47 2010
@@ -106,7 +106,7 @@ public class TransportHeadersAdapter imp
// Copy the existing Map contents to this new adapter
tha.putAll((Map) map);
}
-mc.setProperty(propertyName, tha);
+mc.setPropertyNoReturn(propertyName, tha);
// If this is a response, then also set the property for the response
code
if (!isRequest) {
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtil
