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 aj...@apache.org on 2006/01/08 12:58:53 UTC
svn commit: r367021 - in /webservices/axis2/trunk/java/modules/integration:
maven.xml project.xml test/samples/wsdl/perf/PerfPortTypeSkeleton.java
test/samples/wsdl/perf/PerfPortTypeTest.java
Author: ajith
Date: Sun Jan 8 03:58:41 2006
New Revision: 367021
URL: http://svn.apache.org/viewcvs?rev=367021&view=rev
Log:
Fixing the build break
The addition of the perf test case causes an error in the build (if the users have no AXIS2_HOME variable set)
The tests are commented and excluded.
Modified:
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/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=367021&r1=367020&r2=367021&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Sun Jan 8 03:58:41 2006
@@ -16,21 +16,21 @@
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">-->
+ <!--<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=367021&r1=367020&r2=367021&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Sun Jan 8 03:58:41 2006
@@ -323,6 +323,9 @@
<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>
<resources>
@@ -357,6 +360,7 @@
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
+
</includes>
</resource>
<resource>
@@ -364,6 +368,9 @@
<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=367021&r1=367020&r2=367021&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 03:58:41 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=367021&r1=367020&r2=367021&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 03:58:41 2006
@@ -39,7 +39,7 @@
public PerfPortTypeTest(String arg0) {
super(arg0);
- }
+ }
/**
* Each time an interop test is run the relevant service
@@ -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();
- }
+ } */
}
Re: svn commit: r367021 - in /webservices/axis2/trunk/java/modules/integration: maven.xml project.xml test/samples/wsdl/perf/PerfPortTypeSkeleton.java test/samples/wsdl/perf/PerfPortTypeTest.java
Posted by Davanum Srinivas <da...@gmail.com>.
I apologize for the build break. one line patch coming up. all we had
to do is to set axis2.home variable in maven.xml...
thanks,
dims
On 1/8/06, ajith@apache.org <aj...@apache.org> wrote:
> Author: ajith
> Date: Sun Jan 8 03:58:41 2006
> New Revision: 367021
>
> URL: http://svn.apache.org/viewcvs?rev=367021&view=rev
> Log:
> Fixing the build break
> The addition of the perf test case causes an error in the build (if the users have no AXIS2_HOME variable set)
> The tests are commented and excluded.
>
> Modified:
> 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/integration/maven.xml
> URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=367021&r1=367020&r2=367021&view=diff
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/maven.xml Sun Jan 8 03:58:41 2006
> @@ -16,21 +16,21 @@
> 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">-->
> + <!--<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=367021&r1=367020&r2=367021&view=diff
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/project.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/project.xml Sun Jan 8 03:58:41 2006
> @@ -323,6 +323,9 @@
> <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>
>
> <resources>
> @@ -357,6 +360,7 @@
> <includes>
> <include>**/*.properties</include>
> <include>**/*.xml</include>
> +
> </includes>
> </resource>
> <resource>
> @@ -364,6 +368,9 @@
> <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=367021&r1=367020&r2=367021&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 03:58:41 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=367021&r1=367020&r2=367021&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 03:58:41 2006
> @@ -39,7 +39,7 @@
>
> public PerfPortTypeTest(String arg0) {
> super(arg0);
> - }
> + }
>
> /**
> * Each time an interop test is run the relevant service
> @@ -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();
> - }
> + } */
> }
>
>
>
--
Davanum Srinivas : http://wso2.com/blogs/
Re: svn commit: r367021 - in /webservices/axis2/trunk/java/modules/integration: maven.xml project.xml test/samples/wsdl/perf/PerfPortTypeSkeleton.java test/samples/wsdl/perf/PerfPortTypeTest.java
Posted by Davanum Srinivas <da...@gmail.com>.
I apologize for the build break. one line patch coming up. all we had
to do is to set axis2.home variable in maven.xml...
thanks,
dims
On 1/8/06, ajith@apache.org <aj...@apache.org> wrote:
> Author: ajith
> Date: Sun Jan 8 03:58:41 2006
> New Revision: 367021
>
> URL: http://svn.apache.org/viewcvs?rev=367021&view=rev
> Log:
> Fixing the build break
> The addition of the perf test case causes an error in the build (if the users have no AXIS2_HOME variable set)
> The tests are commented and excluded.
>
> Modified:
> 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/integration/maven.xml
> URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=367021&r1=367020&r2=367021&view=diff
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/maven.xml Sun Jan 8 03:58:41 2006
> @@ -16,21 +16,21 @@
> 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">-->
> + <!--<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=367021&r1=367020&r2=367021&view=diff
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/integration/project.xml (original)
> +++ webservices/axis2/trunk/java/modules/integration/project.xml Sun Jan 8 03:58:41 2006
> @@ -323,6 +323,9 @@
> <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>
>
> <resources>
> @@ -357,6 +360,7 @@
> <includes>
> <include>**/*.properties</include>
> <include>**/*.xml</include>
> +
> </includes>
> </resource>
> <resource>
> @@ -364,6 +368,9 @@
> <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=367021&r1=367020&r2=367021&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 03:58:41 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=367021&r1=367020&r2=367021&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 03:58:41 2006
> @@ -39,7 +39,7 @@
>
> public PerfPortTypeTest(String arg0) {
> super(arg0);
> - }
> + }
>
> /**
> * Each time an interop test is run the relevant service
> @@ -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();
> - }
> + } */
> }
>
>
>
--
Davanum Srinivas : http://wso2.com/blogs/