Author: veithen
Date: Thu Mar 17 23:19:29 2011
New Revision: 1082747
URL: http://svn.apache.org/viewvc?rev=1082747&view=rev
Log:
Merged the fixes for the databinding sample to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/codegen/src/org/apache/axis2/wsdl/template/java/NoneDatabindingTemplate.xsl
axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml
axis/axis2/java/core/branches/1_6/modules/samples/databinding/README.txt
axis/axis2/java/core/branches/1_6/modules/samples/databinding/build.xml
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 17 23:19:29 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082726,1082738
Modified:
axis/axis2/java/core/branches/1_6/modules/codegen/src/org/apache/axis2/wsdl/template/java/NoneDatabindingTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/codegen/src/org/apache/axis2/wsdl/template/java/NoneDatabindingTemplate.xsl?rev=1082747&r1=1082746&r2=1082747&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/codegen/src/org/apache/axis2/wsdl/template/java/NoneDatabindingTemplate.xsl
(original)
+++
axis/axis2/java/core/branches/1_6/modules/codegen/src/org/apache/axis2/wsdl/template/java/NoneDatabindingTemplate.xsl
Thu Mar 17 23:19:29 2011
@@ -35,7 +35,7 @@
return param;
}
- private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory,
org.apache.axiom.om.OMElement param, boolean optimizeContent)
+ private org.apache.axiom.soap.SOAPEnvelope
toEnvelope(org.apache.axiom.soap.SOAPFactory factory,
org.apache.axiom.om.OMElement param, boolean optimizeContent,
javax.xml.namespace.QName methodQName)
throws org.apache.axis2.AxisFault {
org.apache.axiom.soap.SOAPEnvelope envelope =
factory.getDefaultEnvelope();
envelope.getBody().addChild(param);
Modified: axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml?rev=1082747&r1=1082746&r2=1082747&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/branches/1_6/modules/distribution/pom.xml Thu Mar 17
23:19:29 2011
@@ -292,6 +292,67 @@
</execution>
</executions>
</plugin>
+
+ <!-- Prepare some additional dependencies required by specific
samples. We could
+ also do this by invoking the relevant download.jars targets
in the provided
+ ant scripts, but this may cause issues with HTTP proxies and
has the disadvantage
+ that the JARs are downloaded every time instead of being
copied from the local
+ Maven repository. -->
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-dependencies</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.codehaus.castor</groupId>
+ <artifactId>castor</artifactId>
+ <version>1.0.4</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>net.java.dev.stax-utils</groupId>
+ <artifactId>stax-utils</artifactId>
+ <version>20060502</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </artifactItem>
+ </artifactItems>
+
<outputDirectory>${project.build.directory}/axis2-${project.version}/samples/databinding/lib</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Now unpack the distribution and run some automated tests on
the samples -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-samples</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <unzip
src="${project.build.directory}/axis2-${project.version}-bin.zip"
dest="${project.build.directory}" />
+
+ <!-- Test of the databinding sample -->
+ <ant
dir="${project.build.directory}/axis2-${project.version}/samples/databinding"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<!-- We don't want to deploy the distributions to the Maven
repository.
Reasons:
Modified:
axis/axis2/java/core/branches/1_6/modules/samples/databinding/README.txt
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/databinding/README.txt?rev=1082747&r1=1082746&r2=1082747&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/samples/databinding/README.txt
(original)
+++ axis/axis2/java/core/branches/1_6/modules/samples/databinding/README.txt
Thu Mar 17 23:19:29 2011
@@ -13,12 +13,12 @@ Pre-Requisites
==============
* Install Apache Ant 1.6.2 or later.
* Please create a directory named lib under the directory that contains this
file.
- * Download latest stax-utils jar from
- https://stax-utils.dev.java.net/servlets/ProjectDocumentList?folderID=1106
and drop that into the
- new lib directory.
- * Download version 1.0.4 of Castor jar from
http://dist.codehaus.org/castor/1.0.4/castor-1.0.4.jar and drop that into the
new
- lib directory.(The latest releases of castor are available at
http://www.castor.org/download.html, but this example may not run
- with versions later than 1.0.4)
+ * Download the following libraries and drop them into the new lib directory:
+ * Latest stax-utils jar from
https://stax-utils.dev.java.net/servlets/ProjectDocumentList?folderID=1106
+ * Version 1.0.4 of Castor jar from
http://dist.codehaus.org/castor/1.0.4/castor-1.0.4.jar.
+ (The latest releases of castor are available at
http://www.castor.org/download.html, but this example may not run
+ with versions later than 1.0.4)
+ * A recent Xerces version from http://xerces.apache.org/.
You can achieve all three of the above steps by running "ant download.jars",
but it will take some
time to download those two jars, using ant.
Modified:
axis/axis2/java/core/branches/1_6/modules/samples/databinding/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/samples/databinding/build.xml?rev=1082747&r1=1082746&r2=1082747&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/samples/databinding/build.xml
(original)
+++ axis/axis2/java/core/branches/1_6/modules/samples/databinding/build.xml Thu
Mar 17 23:19:29 2011
@@ -182,6 +182,8 @@
dest="lib/stax-utils-20060915.jar" verbose="true"/>
<get src="http://dist.codehaus.org/castor/1.0.4/castor-1.0.4.jar";
dest="lib/castor-1.0.4.jar"
verbose="true"/>
+ <get
src="http://repo2.maven.org/maven2/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar";
+ dest="lib/xercesImpl-2.9.1.jar" verbose="true"/>
</target>
<target name="clean">
