You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2006/01/08 19:57:03 UTC
svn commit: r367070 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/template/general/ integration/
integration/test/samples/wsdl/perf/
Author: dims
Date: Sun Jan 8 10:56:59 2006
New Revision: 367070
URL: http://svn.apache.org/viewcvs?rev=367070&view=rev
Log:
- add junit jars to generated build.xml
- re-enable the commented test
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/project.xml
webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeSkeleton.java
webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeTest.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl?rev=367070&r1=367069&r2=367070&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl Sun Jan 8 10:56:59 2006
@@ -45,6 +45,9 @@
<fileset>
<xsl:attribute name="dir">${user.home}</xsl:attribute>
<include>
+ <xsl:attribute name="name">.maven/repository/junit/jars/*.jar</xsl:attribute>
+ </include>
+ <include>
<xsl:attribute name="name">.maven/repository/axis2/jars/*.jar</xsl:attribute>
</include>
</fileset>
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl?rev=367070&r1=367069&r2=367070&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl Sun Jan 8 10:56:59 2006
@@ -51,6 +51,9 @@
<xsl:attribute name="name">.maven/repository/stax/jars/*.jar</xsl:attribute>
</include>
<include>
+ <xsl:attribute name="name">.maven/repository/junit/jars/*.jar</xsl:attribute>
+ </include>
+ <include>
<xsl:attribute name="name">.maven/repository/axis2/jars/*.jar</xsl:attribute>
</include>
</fileset>
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=367070&r1=367069&r2=367070&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Sun Jan 8 10:56:59 2006
@@ -16,21 +16,28 @@
tofile="target/itest-classes/modules/addressing.mar"/>
</postGoal>
- <!--<preGoal name="test:compile">-->
- <!--<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">-->
- <!--<classpath refid="maven.dependency.classpath"/>-->
- <!--<arg line="-d xmlbeans -p samples.wsdl.perf -o target/perf -s -t -ss -sd -uri test/samples/wsdl/perf/perf.wsdl"/>-->
- <!--</java>-->
- <!--<ant:copy overwrite="yes" todir="target/perf/test/samples/perf">-->
- <!--<ant:fileset dir="test/samples/wsdl/perf">-->
- <!--<ant:include name="*Skeleton.java"/>-->
- <!--</ant:fileset>-->
- <!--</ant:copy>-->
- <!--<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf" target="make.repo"/>-->
- <!--<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf" target="jar.client"/>-->
- <!--<ant:path id="samples.wsdl.perf.client.jar" location="target/perf/build/lib/PerfSoapService-test-client.jar"/>-->
- <!--<maven:addPath id="maven.dependency.classpath" refid="samples.wsdl.perf.client.jar"/>-->
- <!--</preGoal>-->
+ <preGoal name="test:compile">
+ <!-- copy the mars so that they are available on the test classpath -->
+ <copy file="../addressing/target/addressing.mar"
+ tofile="target/test-classes/modules/addressing.mar"/>
+ <copy file="../security/target/security.mar"
+ tofile="target/test-classes/modules/security.mar"/>
+
+ <j:set var="axis2.home" value="${basedir}/target"/>
+ <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg line="-d xmlbeans -p samples.wsdl.perf -o target/perf -s -t -ss -sd -uri test/samples/wsdl/perf/perf.wsdl"/>
+ </java>
+ <ant:copy overwrite="yes" todir="target/perf/test/samples/perf">
+ <ant:fileset dir="test/samples/wsdl/perf">
+ <ant:include name="*Skeleton.java"/>
+ </ant:fileset>
+ </ant:copy>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf" target="make.repo"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="target/perf" target="jar.client"/>
+ <ant:path id="samples.wsdl.perf.client.jar" location="target/perf/build/lib/PerfSoapService-test-client.jar"/>
+ <maven:addPath id="maven.dependency.classpath" refid="samples.wsdl.perf.client.jar"/>
+ </preGoal>
<postGoal name="test:compile">
<j:if test="${context.getVariable('maven.test.skip') != 'true'}">
Modified: webservices/axis2/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/project.xml?rev=367070&r1=367069&r2=367070&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Sun Jan 8 10:56:59 2006
@@ -323,7 +323,6 @@
<exclude>**org/apache/axis2/jms/*.class</exclude>
<exclude>**org/apache/axis2/soap12testing/soap12testsuite/*.class</exclude>
<exclude>**/ScenarioST1Test.class</exclude>
- <exclude>**/samples/wsdl/perf/*.class</exclude>
</excludes>
@@ -368,9 +367,6 @@
<includes>
<include>**/*.jpg</include>
</includes>
- <excludes>
- <exclude>**/samples/wsdl/perf/*.java</exclude>
- </excludes>
</resource>
<resource>
<directory>test</directory>
Modified: webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeSkeleton.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeSkeleton.java?rev=367070&r1=367069&r2=367070&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeSkeleton.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeSkeleton.java Sun Jan 8 10:56:59 2006
@@ -13,11 +13,11 @@
*
* @param param0
*/
- /*public OutputElementDocument handleStringArray(
+ public OutputElementDocument handleStringArray(
InputElementDocument param0) {
OutputElementDocument output = OutputElementDocument.Factory.newInstance();
output.setOutputElement("The Array length is - " + param0.getInputElement().getItemArray().length);
return output;
- } */
+ }
}
Modified: webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeTest.java?rev=367070&r1=367069&r2=367070&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeTest.java Sun Jan 8 10:56:59 2006
@@ -61,7 +61,7 @@
/**
* Auto generated test method
*/
- /* public void testhandleStringArray() throws java.lang.Exception {
+ public void testhandleStringArray() throws java.lang.Exception {
PerfPortTypeStub stub = new PerfPortTypeStub(null, targetEpr);
//create a new databinder
stub._getOptions().setSoapAction("handleStringArray");
@@ -93,5 +93,5 @@
public static void main(String[] args) throws Exception {
PerfPortTypeTest test = new PerfPortTypeTest();
test.testhandleStringArray();
- } */
+ }
}