Modified: axis/axis2/java/core/branches/schema-validation/modules/jaxws-integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/jaxws-integration/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/jaxws-integration/pom.xml (original) +++ axis/axis2/java/core/branches/schema-validation/modules/jaxws-integration/pom.xml Fri Jan 5 19:50:25 2018 @@ -104,32 +104,9 @@ <url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration</url> </scm> <build> - <sourceDirectory>src</sourceDirectory> - <testSourceDirectory>test</testSourceDirectory> - <resources> - <resource> - <directory>conf</directory> - <includes> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - </includes> - </resource> - <resource> - <directory>resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> <testResources> <testResource> - <directory>test</directory> + <directory>src/test/java</directory> <includes> <include>**/*.xml</include> <include>**/*.wsdl</include> @@ -245,6 +222,33 @@ </configuration> </execution> <execution> + <id>build-addressing-repo</id> + <goals> + <goal>create-test-repository</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/addressing-repo</outputDirectory> + <modules>addressing</modules> + <axis2xml>test-resources/axis2_addressing.xml</axis2xml> + <jaxwsServices> + <jaxwsService> + <name>AddressingProvider</name> + <packages> + <package>org.apache.axis2.jaxws.provider.addressing</package> + </packages> + <resourcesDirectory>src/test/servicejars/AddressingProvider</resourcesDirectory> + </jaxwsService> + <jaxwsService> + <name>AsyncService2</name> + <packages> + <package>org.apache.axis2.jaxws.sample.asyncdoclit</package> + </packages> + <resourcesDirectory>src/test/servicejars/AsyncService2</resourcesDirectory> + </jaxwsService> + </jaxwsServices> + </configuration> + </execution> + <execution> <id>build-client-repo</id> <phase>generate-test-resources</phase> <goals> @@ -252,6 +256,7 @@ </goals> <configuration> <outputDirectory>${project.build.directory}/client-repo</outputDirectory> + <axis2xml>test-resources/axis2.xml</axis2xml> <modules>addressing</modules> </configuration> </execution> @@ -416,7 +421,7 @@ <configuration> <sourceType>WSDL</sourceType> <testSources> - <testSource>test/org/apache/axis2/jaxws/proxy/gorilla_dlw/META-INF/gorilla_dlw.wsdl</testSource> + <testSource>src/test/java/org/apache/axis2/jaxws/proxy/gorilla_dlw/META-INF/gorilla_dlw.wsdl</testSource> </testSources> <outputDirectory>${project.build.directory}/generated-test-sources/jaxb/gorilla_dlw</outputDirectory> </configuration> @@ -681,7 +686,7 @@ </goals> <configuration> <wsdlFiles> - <wsdlFile>${basedir}/test/org/apache/axis2/jaxws/anytype/META-INF/AnyType.wsdl</wsdlFile> + <wsdlFile>${basedir}/src/test/java/org/apache/axis2/jaxws/anytype/META-INF/AnyType.wsdl</wsdlFile> </wsdlFiles> <packageName>org.apache.axis2.jaxws.anytype</packageName> </configuration> @@ -693,7 +698,7 @@ </goals> <configuration> <wsdlFiles> - <wsdlFile>${basedir}/test/org/apache/axis2/jaxws/polymorphic/shape/META-INF/shapes.wsdl</wsdlFile> + <wsdlFile>${basedir}/src/test/java/org/apache/axis2/jaxws/polymorphic/shape/META-INF/shapes.wsdl</wsdlFile> </wsdlFiles> </configuration> </execution> @@ -704,7 +709,7 @@ </goals> <configuration> <wsdlFiles> - <wsdlFile>${basedir}/test/org/apache/axis2/jaxws/nonanonymous/complextype/META-INF/EchoMessage.wsdl</wsdlFile> + <wsdlFile>${basedir}/src/test/java/org/apache/axis2/jaxws/nonanonymous/complextype/META-INF/EchoMessage.wsdl</wsdlFile> </wsdlFiles> <packageName>org.apache.axis2.jaxws.nonanonymous.complextype</packageName> </configuration> @@ -716,7 +721,7 @@ </goals> <configuration> <wsdlFiles> - <wsdlFile>${basedir}/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl</wsdlFile> + <wsdlFile>${basedir}/src/test/java/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl</wsdlFile> </wsdlFiles> <packageName>org.apache.axis2.jaxws.proxy.doclitnonwrapped</packageName> </configuration> @@ -728,7 +733,7 @@ </goals> <configuration> <wsdlFiles> - <wsdlFile>${basedir}/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl</wsdlFile> + <wsdlFile>${basedir}/src/test/java/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl</wsdlFile> </wsdlFiles> <packageName>org.apache.axis2.jaxws.proxy.doclitwrapped</packageName> </configuration> @@ -761,7 +766,7 @@ <include name="org/apache/axis2/jaxws/sample/wsgen/WSGenImpl.class" /> <include name="org/apache/axis2/jaxws/sample/wsgen/jaxws/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/wsgen"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/wsgen"> <include name="META-INF/**" /> </fileset> </copy> @@ -773,7 +778,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/security/server/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/security/server"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/security/server"> <include name="META-INF/**" /> </fileset> </copy> @@ -785,7 +790,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/provider/string/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/provider/string"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/provider/string"> <include name="META-INF/**" /> </fileset> </copy> @@ -797,7 +802,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/provider/stringmsg/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/provider/stringmsg"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/provider/stringmsg"> <include name="META-INF/**" /> </fileset> </copy> @@ -809,7 +814,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/provider/source/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/provider/source"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/provider/source"> <include name="META-INF/**" /> </fileset> </copy> @@ -821,7 +826,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/provider/sourcemsg/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/provider/sourcemsg"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/provider/sourcemsg"> <include name="META-INF/**" /> </fileset> </copy> @@ -833,7 +838,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/provider/soapmsg/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/provider/soapmsg"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/provider/soapmsg"> <include name="META-INF/**" /> </fileset> </copy> @@ -845,7 +850,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/provider/soapmsgcheckmtom/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/provider/soapmsgcheckmtom"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/provider/soapmsgcheckmtom"> <include name="META-INF/**" /> </fileset> </copy> @@ -857,7 +862,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/provider/soapmsgmu/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/provider/soapmsgmu"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/provider/soapmsgmu"> <include name="META-INF/**" /> </fileset> </copy> @@ -869,7 +874,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/provider/soapmsgreturnnull/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/provider/soapmsgreturnnull"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/provider/soapmsgreturnnull"> <include name="META-INF/**" /> </fileset> </copy> @@ -881,7 +886,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/provider/jaxb/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/provider/jaxb"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/provider/jaxb"> <include name="META-INF/**" /> </fileset> <fileset dir="target/test-classes"> @@ -896,7 +901,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/mtom1/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/mtom1"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/mtom1"> <include name="META-INF/**" /> </fileset> <fileset dir="target/test-classes"> @@ -911,7 +916,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/dispatch/server/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/dispatch/server"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/dispatch/server"> <include name="META-INF/**" /> </fileset> </copy> @@ -924,7 +929,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/swamtom/server/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/swamtom/server"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/swamtom/server"> <include name="META-INF/**" /> </fileset> </copy> @@ -938,7 +943,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/proxy/doclitwrapped/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/proxy/doclitwrapped"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/proxy/doclitwrapped"> <include name="META-INF/**" /> </fileset> </copy> @@ -950,7 +955,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/proxy/doclitnonwrapped/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/proxy/doclitnonwrapped"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/proxy/doclitnonwrapped"> <include name="META-INF/**" /> </fileset> </copy> @@ -962,7 +967,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/proxy/rpclit/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/proxy/rpclit"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/proxy/rpclit"> <include name="META-INF/**" /> </fileset> </copy> @@ -974,7 +979,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/proxy/rpclitswa/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/proxy/rpclitswa"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/proxy/rpclitswa"> <include name="META-INF/**" /> </fileset> </copy> @@ -982,23 +987,11 @@ <jar destfile="${servicejars.dir}/RPCLitSWA.jar" basedir="${servicejars.dir}/RPCLitSWA" /> <delete dir="${servicejars.dir}/RPCLitSWA" /> - <copy toDir="${servicejars.dir}/AddressingProvider/"> - <fileset dir="target/test-classes"> - <include name="org/apache/axis2/jaxws/provider/addressing/**" /> - </fileset> - <fileset dir="test/org/apache/axis2/jaxws/provider/addressing/"> - <include name="META-INF/**" /> - </fileset> - </copy> - - <jar destfile="${servicejars.dir}/AddressingProvider.jar" basedir="${servicejars.dir}/AddressingProvider" /> - <delete dir="${servicejars.dir}/AddressingProvider" /> - <copy toDir="${servicejars.dir}/SOAP12EchoService/"> <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/proxy/soap12/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/proxy/soap12/server"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/proxy/soap12/server"> <include name="META-INF/**" /> </fileset> </copy> @@ -1010,7 +1003,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/proxy/gorilla_dlw/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/proxy/gorilla_dlw"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/proxy/gorilla_dlw"> <include name="META-INF/**" /> </fileset> </copy> @@ -1025,7 +1018,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/addressbook/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/addressbook"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/addressbook"> <include name="META-INF/**" /> </fileset> </copy> @@ -1053,7 +1046,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/nonwrap/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/nonwrap"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/nonwrap"> <include name="META-INF/**" /> </fileset> </copy> @@ -1063,7 +1056,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/wrap/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/wrap"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/wrap"> <include name="META-INF/**" /> </fileset> </copy> @@ -1073,7 +1066,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/addnumbers/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/addnumbers"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/addnumbers"> <include name="META-INF/**" /> </fileset> </copy> @@ -1083,7 +1076,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/addnumbershandler/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/addnumbershandler"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/addnumbershandler"> <include name="META-INF/**" /> </fileset> </copy> @@ -1093,7 +1086,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/headershandler/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/headershandler"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/headershandler"> <include name="META-INF/**" /> </fileset> </copy> @@ -1103,7 +1096,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/dlwmin/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/dlwmin"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/dlwmin"> <include name="META-INF/**" /> </fileset> </copy> @@ -1124,7 +1117,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/parallelasync/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/parallelasync/server"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/parallelasync/server"> <include name="META-INF/**" /> </fileset> </copy> @@ -1132,23 +1125,11 @@ <jar destfile="${servicejars.dir}/AsyncService.jar" basedir="${servicejars.dir}/AsyncService" /> <delete dir="${servicejars.dir}/AsyncService" /> - <copy toDir="${servicejars.dir}/AsyncService2/"> - <fileset dir="target/test-classes"> - <include name="org/apache/axis2/jaxws/sample/asyncdoclit/**" /> - </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/asyncdoclit/server"> - <include name="META-INF/**" /> - </fileset> - </copy> - - <jar destfile="${servicejars.dir}/AsyncService2.jar" basedir="${servicejars.dir}/AsyncService2" /> - <delete dir="${servicejars.dir}/AsyncService2" /> - <copy toDir="${servicejars.dir}/FaultyWebServiceService/"> <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/faults/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/faults"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/faults"> <include name="META-INF/**" /> </fileset> </copy> @@ -1160,7 +1141,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/faultsservice/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/faultsservice"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/faultsservice"> <include name="META-INF/**" /> </fileset> </copy> @@ -1172,7 +1153,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/doclitbare/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/doclitbare"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/doclitbare"> <include name="META-INF/**" /> </fileset> </copy> @@ -1184,7 +1165,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/doclitbarenoarg/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/doclitbarenoarg"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/doclitbarenoarg"> <include name="META-INF/**" /> </fileset> </copy> @@ -1196,7 +1177,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/nonanonymous/complextype/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/nonanonymous/complextype"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/nonanonymous/complextype"> <include name="META-INF/**" /> </fileset> </copy> @@ -1208,7 +1189,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/resourceinjection/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/resourceinjection"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/resourceinjection"> <include name="META-INF/**" /> </fileset> </copy> @@ -1220,7 +1201,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/anytype/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/anytype"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/anytype"> <include name="META-INF/**" /> </fileset> </copy> @@ -1232,7 +1213,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/context/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/context"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/context"> <include name="META-INF/**" /> </fileset> </copy> @@ -1244,7 +1225,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/polymorphic/shape/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/polymorphic/shape"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/polymorphic/shape"> <include name="META-INF/**" /> </fileset> </copy> @@ -1256,7 +1237,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/rpclit/enumtype/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/rpclit/enumtype"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/rpclit/enumtype"> <include name="META-INF/**" /> </fileset> </copy> @@ -1269,7 +1250,7 @@ <include name="org/apache/axis2/jaxws/rpclit/stringarray/**" /> <include name="org/test/rpclit/stringarray/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/rpclit/stringarray/"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/rpclit/stringarray/"> <include name="META-INF/**" /> </fileset> </copy> @@ -1282,7 +1263,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/doclitbaremin/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/doclitbaremin/"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/doclitbaremin/"> <include name="META-INF/**" /> </fileset> </copy> @@ -1294,7 +1275,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/stringlist/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/stringlist/"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/stringlist/"> <include name="META-INF/**" /> </fileset> </copy> @@ -1331,7 +1312,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/handler/header/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/handler/header"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/handler/header"> <include name="META-INF/**" /> <include name="handler.xml" /> </fileset> @@ -1339,7 +1320,7 @@ </copy> <!-- We have to explicitly copy the xml file refered to by the client interface HandlerChain annotation --> <copy toDir="target/test-classes/"> - <fileset dir="test"> + <fileset dir="src/test/java"> <include name="org/apache/axis2/jaxws/handler/header/handler.xml" /> </fileset> </copy> @@ -1352,7 +1333,7 @@ <fileset dir="target/test-classes"> <include name="org/apache/axis2/jaxws/sample/mtomfeature/**" /> </fileset> - <fileset dir="test/org/apache/axis2/jaxws/sample/mtomfeature/"> + <fileset dir="src/test/java/org/apache/axis2/jaxws/sample/mtomfeature/"> <include name="META-INF/**" /> </fileset> </copy> @@ -1395,7 +1376,6 @@ <artifactId>maven-surefire-plugin</artifactId> <inherited>true</inherited> <configuration> - <forkMode>pertest</forkMode> <argLine>-Xms256m -Xmx512m -Xbootclasspath/p:${jaxws.bootclasspath}</argLine> <!-- Enable the next 2 lines if you want to attach a debugger <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>--> @@ -1428,16 +1408,6 @@ <name>javax.xml.soap.MetaFactory</name> <value>org.apache.axis2.saaj.SAAJMetaFactoryImpl</value> </property> - <!-- Need this for the client side to pickup an axis2.xml to configure SoapMessageMUProviderChecker --> - <property> - <name>org.apache.axis2.jaxws.config.path</name> - <value>./target/test-classes/axis2.xml</value> - </property> - <!-- Need this for the client side to pickup the addressing mar --> - <property> - <name>org.apache.axis2.jaxws.repo.path</name> - <value>./target/client-repo</value> - </property> <!-- Prevent Mac OS X from showing an icon in the dock during the test run --> <property> <name>java.awt.headless</name>
Modified: axis/axis2/java/core/branches/schema-validation/modules/jibx/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/jibx/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/jibx/pom.xml (original) +++ axis/axis2/java/core/branches/schema-validation/modules/jibx/pom.xml Fri Jan 5 19:50:25 2018 @@ -207,6 +207,7 @@ <serviceDescriptions> <serviceDescription> <directory>${project.build.directory}/gen/library-unwrapped/resources</directory> + <scope>application</scope> <parameters> <parameter> <name>ServiceClass</name> @@ -228,6 +229,7 @@ <serviceDescriptions> <serviceDescription> <directory>${project.build.directory}/gen/library-wrapped/resources</directory> + <scope>application</scope> <parameters> <parameter> <name>ServiceClass</name> @@ -240,7 +242,6 @@ </execution> </executions> <configuration> - <configurationDirectory>conf</configurationDirectory> <generatedAxis2xml> <modules> <module>checker</module> Modified: axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java Fri Jan 5 19:50:25 2018 @@ -19,41 +19,29 @@ package org.apache.axis2.jibx; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; + import org.apache.axis2.jibx.customer.EchoCustomerServiceStub; -import org.apache.axis2.testutils.UtilServer; +import org.apache.axis2.testutils.Axis2Server; +import org.junit.ClassRule; /** * Full code generation and runtime test for JiBX data binding extension. This is based on the * XMLBeans test code. */ -public class Test extends TestCase { - private static final String REPOSITORY_DIR = - System.getProperty("basedir", ".") + "/target/repo/echo"; - - private void startServer() throws Exception { - UtilServer.start(REPOSITORY_DIR); - } - - private void stopServer() throws Exception { - UtilServer.stop(); -/* File outputFile = new File(OUTPUT_LOCATION_BASE); - if (outputFile.exists() && outputFile.isDirectory()){ - deleteDir(outputFile); - } */ - } +public class Test { + @ClassRule + public static Axis2Server server = new Axis2Server("target/repo/echo"); + @org.junit.Test public void testBuildAndRun() throws Exception { - startServer(); - // finish by testing a roundtrip call to the echo server Person person = new Person(42, "John", "Smith"); Customer customer = new Customer("Redmond", person, "+14258858080", "WA", "14619 NE 80th Pl.", new Integer(98052)); - EchoCustomerServiceStub stub = new EchoCustomerServiceStub(UtilServer.getConfigurationContext(), - "http://127.0.0.1:"; + UtilServer.TESTING_PORT + "/axis2/services/Echo/echo"); + EchoCustomerServiceStub stub = new EchoCustomerServiceStub(server.getConfigurationContext(), + server.getEndpoint("Echo") + "/echo"); Customer result = stub.echo(customer); - stopServer(); assertEquals("Result object does not match request object", customer, result); } Modified: axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/library/unwrapped/LibraryTest.java Fri Jan 5 19:50:25 2018 @@ -21,33 +21,19 @@ package org.apache.axis2.jibx.library.un import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.apache.axis2.Constants; -import org.apache.axis2.description.AxisService; -import org.apache.axis2.engine.AxisConfiguration; import org.apache.axis2.jibx.beans.Book; import org.apache.axis2.jibx.library.unwrapped.client.LibraryStub; -import org.apache.axis2.testutils.UtilServer; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.apache.axis2.testutils.Axis2Server; +import org.junit.ClassRule; import org.junit.Test; public class LibraryTest { - @BeforeClass - public static void startServer() throws Exception { - UtilServer.start(System.getProperty("basedir", ".") + "/target/repo/library-unwrapped"); - AxisConfiguration axisConfiguration = UtilServer.getConfigurationContext().getAxisConfiguration(); - AxisService service = axisConfiguration.getService("library"); - service.setScope(Constants.SCOPE_APPLICATION); - } - - @AfterClass - public static void stopServer() throws Exception { - UtilServer.stop(); - } + @ClassRule + public static Axis2Server server = new Axis2Server("target/repo/library-unwrapped"); @Test public void test1() throws Exception { - LibraryStub stub = new LibraryStub(UtilServer.getConfigurationContext(), "http://127.0.0.1:"; + UtilServer.TESTING_PORT + "/axis2/services/library"); + LibraryStub stub = new LibraryStub(server.getConfigurationContext(), server.getEndpoint("library")); stub.addBook("Paperback", "0618918248", new String[] { "Richard Dawkins" }, "The God Delusion"); @@ -67,7 +53,7 @@ public class LibraryTest { @Test public void test2() throws Exception { - LibraryStub stub = new LibraryStub(UtilServer.getConfigurationContext(), "http://127.0.0.1:"; + UtilServer.TESTING_PORT + "/axis2/services/library"); + LibraryStub stub = new LibraryStub(server.getConfigurationContext(), server.getEndpoint("library")); stub.addBookInstance(new Book("Hardcover", "8854401765", "The Voyage of the Beagle", new String[] { "Charles Darwin" })); Book book = stub.getBook("8854401765"); Modified: axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/jibx/src/test/java/org/apache/axis2/jibx/library/wrapped/LibraryTest.java Fri Jan 5 19:50:25 2018 @@ -18,34 +18,20 @@ */ package org.apache.axis2.jibx.library.wrapped; -import org.apache.axis2.Constants; -import org.apache.axis2.description.AxisService; -import org.apache.axis2.engine.AxisConfiguration; import org.apache.axis2.jibx.beans.Book; import org.apache.axis2.jibx.library.wrapped.client.LibraryStub; import org.apache.axis2.jibx.wrappers.AddBookRequest; -import org.apache.axis2.testutils.UtilServer; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.apache.axis2.testutils.Axis2Server; +import org.junit.ClassRule; import org.junit.Test; public class LibraryTest { - @BeforeClass - public static void startServer() throws Exception { - UtilServer.start(System.getProperty("basedir", ".") + "/target/repo/library-wrapped"); - AxisConfiguration axisConfiguration = UtilServer.getConfigurationContext().getAxisConfiguration(); - AxisService service = axisConfiguration.getService("library"); - service.setScope(Constants.SCOPE_APPLICATION); - } - - @AfterClass - public static void stopServer() throws Exception { - UtilServer.stop(); - } + @ClassRule + public static Axis2Server server = new Axis2Server("target/repo/library-wrapped"); @Test public void test() throws Exception { - LibraryStub stub = new LibraryStub(UtilServer.getConfigurationContext(), "http://127.0.0.1:"; + UtilServer.TESTING_PORT + "/axis2/services/library"); + LibraryStub stub = new LibraryStub(server.getConfigurationContext(), server.getEndpoint("library")); stub.addBook(new AddBookRequest(new Book("Paperback", "0618918248", "The God Delusion", new String[] { "Richard Dawkins" }))); } Modified: axis/axis2/java/core/branches/schema-validation/modules/json/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/json/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/json/pom.xml (original) +++ axis/axis2/java/core/branches/schema-validation/modules/json/pom.xml Fri Jan 5 19:50:25 2018 @@ -44,11 +44,7 @@ <groupId>org.apache.axis2</groupId> <artifactId>axis2-transport-http</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.axis2</groupId> - <artifactId>axis2-transport-local</artifactId> - <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>xmlunit</groupId> Modified: axis/axis2/java/core/branches/schema-validation/modules/kernel/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/kernel/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/kernel/pom.xml (original) +++ axis/axis2/java/core/branches/schema-validation/modules/kernel/pom.xml Fri Jan 5 19:50:25 2018 @@ -101,6 +101,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.ws.commons.axiom</groupId> + <artifactId>axiom-truth</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> <scope>test</scope> Modified: axis/axis2/java/core/branches/schema-validation/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java Fri Jan 5 19:50:25 2018 @@ -25,8 +25,6 @@ import org.apache.axiom.om.OMFactory; import org.apache.axiom.om.OMNamespace; import org.apache.axiom.om.OMNode; import org.apache.axiom.om.util.AXIOMUtil; -import org.apache.axiom.om.util.AttributeHelper; -import org.apache.axiom.om.util.ElementHelper; import org.apache.axiom.soap.SOAPFactory; import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.metadata.InterfaceName; @@ -215,7 +213,7 @@ public class EndpointReferenceHelper { Iterator attrIter = addressAttributes.iterator(); while (attrIter.hasNext()) { OMAttribute omAttribute = (OMAttribute) attrIter.next(); - AttributeHelper.importOMAttribute(omAttribute, addressE); + addressE.addAttribute((OMAttribute)factory.importInformationItem(omAttribute)); } } @@ -226,7 +224,7 @@ public class EndpointReferenceHelper { AddressingConstants.Final.WSA_METADATA, wsaNS, eprElement); for (int i = 0, size = metaData.size(); i < size; i++) { OMElement omElement = (OMElement) metaData.get(i); - metadataE.addChild(ElementHelper.importOMElement(omElement, factory)); + metadataE.addChild((OMElement)factory.importInformationItem(omElement)); } ArrayList metadataAttributes = epr.getMetadataAttributes(); @@ -234,7 +232,7 @@ public class EndpointReferenceHelper { Iterator attrIter = metadataAttributes.iterator(); while (attrIter.hasNext()) { OMAttribute omAttribute = (OMAttribute) attrIter.next(); - AttributeHelper.importOMAttribute(omAttribute, metadataE); + metadataE.addAttribute((OMAttribute)factory.importInformationItem(omAttribute)); } } } @@ -247,7 +245,7 @@ public class EndpointReferenceHelper { Iterator iterator = referenceParameters.values().iterator(); while (iterator.hasNext()) { OMElement omElement = (OMElement) iterator.next(); - refParameterElement.addChild(ElementHelper.importOMElement(omElement, factory)); + refParameterElement.addChild((OMElement)factory.importInformationItem(omElement)); } } @@ -255,7 +253,7 @@ public class EndpointReferenceHelper { if (attributes != null) { for (int i = 0, size = attributes.size(); i < size; i++) { OMAttribute omAttribute = (OMAttribute) attributes.get(i); - AttributeHelper.importOMAttribute(omAttribute, eprElement); + eprElement.addAttribute((OMAttribute)factory.importInformationItem(omAttribute)); } } @@ -264,7 +262,7 @@ public class EndpointReferenceHelper { if (extensibleElements != null) { for (int i = 0, size = extensibleElements.size(); i < size; i++) { OMElement omElement = (OMElement) extensibleElements.get(i); - eprElement.addChild(ElementHelper.importOMElement(omElement, factory)); + eprElement.addChild((OMElement)factory.importInformationItem(omElement)); } } } else { Modified: axis/axis2/java/core/branches/schema-validation/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/kernel/test/org/apache/axis2/addressing/EndpointReferenceHelperTest.java Fri Jan 5 19:50:25 2018 @@ -29,6 +29,9 @@ import org.apache.axis2.addressing.metad import javax.xml.namespace.QName; +import static com.google.common.truth.Truth.assertAbout; +import static org.apache.axiom.truth.xml.XMLTruth.xml; + import java.util.ArrayList; import java.util.Map; @@ -81,7 +84,7 @@ public class EndpointReferenceHelperTest EndpointReference deser = EndpointReferenceHelper.fromOM(om); assertEquals(epr.getAddress(), deser.getAddress()); - ArrayList addrAttrs = deser.getAddressAttributes(); + ArrayList<OMAttribute> addrAttrs = deser.getAddressAttributes(); compareAttributes(attr1, (OMAttribute)addrAttrs.get(0)); compareAttributes(attr2, (OMAttribute)addrAttrs.get(1)); @@ -90,15 +93,15 @@ public class EndpointReferenceHelperTest compareAttributes(attr2, (OMAttribute)attrs.get(1)); ArrayList metadata = deser.getMetaData(); - assertEquals(md1, metadata.get(0)); - assertEquals(md2, metadata.get(1)); + assertAbout(xml()).that(metadata.get(0)).hasSameContentAs(md1); + assertAbout(xml()).that(metadata.get(1)).hasSameContentAs(md2); ArrayList mdAttrs = deser.getMetadataAttributes(); compareAttributes(attr1, (OMAttribute)mdAttrs.get(0)); compareAttributes(attr2, (OMAttribute)mdAttrs.get(1)); ArrayList extelts = deser.getExtensibleElements(); - assertEquals(ext1, extelts.get(0)); - assertEquals(ext2, extelts.get(1)); + assertAbout(xml()).that(extelts.get(0)).hasSameContentAs(ext1); + assertAbout(xml()).that(extelts.get(1)).hasSameContentAs(ext2); Map m = deser.getAllReferenceParameters(); assertEquals("rp1", ((OMElement) m.get(rp1Qname)).getText()); @@ -110,23 +113,23 @@ public class EndpointReferenceHelperTest assertEquals(epr.getAddress(), deser.getAddress()); addrAttrs = deser.getAddressAttributes(); - assertEquals(attr1, addrAttrs.get(0)); - assertEquals(attr2, addrAttrs.get(1)); + compareAttributes(attr1, addrAttrs.get(0)); + compareAttributes(attr2, addrAttrs.get(1)); attrs = deser.getAttributes(); compareAttributes(attr1, (OMAttribute)attrs.get(0)); compareAttributes(attr2, (OMAttribute)attrs.get(1)); metadata = deser.getMetaData(); - assertEquals(md1, metadata.get(0)); - assertEquals(md2, metadata.get(1)); + assertAbout(xml()).that(metadata.get(0)).hasSameContentAs(md1); + assertAbout(xml()).that(metadata.get(1)).hasSameContentAs(md2); mdAttrs = deser.getMetadataAttributes(); compareAttributes(attr1, (OMAttribute)mdAttrs.get(0)); compareAttributes(attr2, (OMAttribute)mdAttrs.get(1)); extelts = deser.getExtensibleElements(); - assertEquals(ext1, extelts.get(0)); - assertEquals(ext2, extelts.get(1)); + assertAbout(xml()).that(extelts.get(0)).hasSameContentAs(ext1); + assertAbout(xml()).that(extelts.get(1)).hasSameContentAs(ext2); m = deser.getAllReferenceParameters(); assertEquals("rp1", ((OMElement) m.get(rp1Qname)).getText()); @@ -204,8 +207,8 @@ public class EndpointReferenceHelperTest assertNull(metadata); ArrayList extelts = deser.getExtensibleElements(); - assertEquals(ext1, extelts.get(0)); - assertEquals(ext2, extelts.get(1)); + assertAbout(xml()).that(extelts.get(0)).hasSameContentAs(ext1); + assertAbout(xml()).that(extelts.get(1)).hasSameContentAs(ext2); //All reference properties are returned as reference parameters. Map m = deser.getAllReferenceParameters(); @@ -233,8 +236,8 @@ public class EndpointReferenceHelperTest assertNull(metadata); extelts = deser.getExtensibleElements(); - assertEquals(ext1, extelts.get(0)); - assertEquals(ext2, extelts.get(1)); + assertAbout(xml()).that(extelts.get(0)).hasSameContentAs(ext1); + assertAbout(xml()).that(extelts.get(1)).hasSameContentAs(ext2); //All reference properties are returned as reference parameters. m = deser.getAllReferenceParameters(); Modified: axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java Fri Jan 5 19:50:25 2018 @@ -23,42 +23,31 @@ import javax.net.ssl.SSLContext; import org.apache.axis2.AxisFault; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.context.ConfigurationContext; -import org.apache.axis2.context.ConfigurationContextFactory; -import org.junit.rules.ExternalResource; +import org.apache.axis2.engine.AxisConfiguration; -public abstract class AbstractAxis2Server extends ExternalResource { - private final String repositoryPath; - private ConfigurationContext configurationContext; +public abstract class AbstractAxis2Server extends AbstractConfigurationContextRule { + private final AxisServiceFactory[] serviceFactories; - public AbstractAxis2Server(String repositoryPath) { - if (repositoryPath == null || repositoryPath.trim().length() == 0) { - throw new IllegalArgumentException("Axis2 repository must not be null or empty"); - } - this.repositoryPath = repositoryPath; - } - - final String getRepositoryPath() { - return repositoryPath; - } - - public final ConfigurationContext getConfigurationContext() { - if (configurationContext == null) { - throw new IllegalStateException(); - } - return configurationContext; + public AbstractAxis2Server(String repositoryPath, AxisServiceFactory... serviceFactories) { + super(repositoryPath); + this.serviceFactories = serviceFactories; } @Override protected void before() throws Throwable { - configurationContext = - ConfigurationContextFactory.createConfigurationContextFromFileSystem(repositoryPath); + super.before(); + ConfigurationContext configurationContext = getConfigurationContext(); + AxisConfiguration axisConfiguration = configurationContext.getAxisConfiguration(); + for (AxisServiceFactory serviceFactory : serviceFactories) { + axisConfiguration.addService(serviceFactory.createService(axisConfiguration)); + } startServer(configurationContext); } @Override protected void after() { stopServer(); - configurationContext = null; + super.after(); } protected abstract void startServer(ConfigurationContext configurationContext) throws Throwable; Modified: axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java Fri Jan 5 19:50:25 2018 @@ -29,8 +29,8 @@ public class Axis2Server extends Abstrac private int port = -1; private SimpleHTTPServer server; - public Axis2Server(String repositoryPath) { - super(repositoryPath); + public Axis2Server(String repositoryPath, AxisServiceFactory... axisServiceFactories) { + super(repositoryPath, axisServiceFactories); } @Override Modified: axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java Fri Jan 5 19:50:25 2018 @@ -30,40 +30,44 @@ import javax.xml.namespace.QName; import org.apache.axis2.client.ServiceClient; import org.apache.axis2.client.Stub; import org.apache.axis2.context.ConfigurationContext; -import org.apache.axis2.context.ConfigurationContextFactory; -import org.junit.rules.ExternalResource; -public class ClientHelper extends ExternalResource { +public class ClientHelper extends AbstractConfigurationContextRule { private final AbstractAxis2Server server; - private final String repositoryPath; - private ConfigurationContext configurationContext; public ClientHelper(AbstractAxis2Server server, String repositoryPath) { + super(repositoryPath); this.server = server; - this.repositoryPath = repositoryPath; } public ClientHelper(AbstractAxis2Server server) { this(server, server.getRepositoryPath()); } + public ClientHelper(String repositoryPath) { + this(null, repositoryPath); + } + @Override protected final void before() throws Throwable { - configurationContext = - ConfigurationContextFactory.createConfigurationContextFromFileSystem(repositoryPath); - SSLContext sslContext = server.getClientSSLContext(); - if (sslContext != null) { - configurationContext.setProperty(SSLContext.class.getName(), sslContext); + super.before(); + if (server != null) { + SSLContext sslContext = server.getClientSSLContext(); + if (sslContext != null) { + getConfigurationContext().setProperty(SSLContext.class.getName(), sslContext); + } } } - @Override - protected final void after() { - configurationContext = null; + private String getEndpoint(String endpoint) throws Exception { + if (server != null && !endpoint.startsWith("http://";)) { + return server.getEndpoint(endpoint); + } else { + return endpoint; + } } public final ServiceClient createServiceClient(String serviceName) throws Exception { - ServiceClient serviceClient = new ServiceClient(configurationContext, null); + ServiceClient serviceClient = new ServiceClient(getConfigurationContext(), null); serviceClient.getOptions().setTo(server.getEndpointReference(serviceName)); configureServiceClient(serviceClient); return serviceClient; @@ -84,16 +88,16 @@ public class ClientHelper extends Extern } else { handler = null; } - ServiceClient serviceClient = new ServiceClient(configurationContext, + ServiceClient serviceClient = new ServiceClient(getConfigurationContext(), new URL(null, server.getEndpoint(serviceName) + "?wsdl", handler), wsdlServiceName, portName); configureServiceClient(serviceClient); return serviceClient; } - public final <T extends Stub> T createStub(Class<T> type, String serviceName) throws Exception { + public final <T extends Stub> T createStub(Class<T> type, String endpoint) throws Exception { T stub = type .getConstructor(ConfigurationContext.class, String.class) - .newInstance(configurationContext, server.getEndpoint(serviceName)); + .newInstance(getConfigurationContext(), getEndpoint(endpoint)); configureServiceClient(stub._getServiceClient()); return stub; } Modified: axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java Fri Jan 5 19:50:25 2018 @@ -85,8 +85,8 @@ public class JettyServer extends Abstrac * @param secure * Whether to enable HTTPS. */ - public JettyServer(String repositoryPath, boolean secure) { - super(repositoryPath); + public JettyServer(String repositoryPath, boolean secure, AxisServiceFactory... axisServiceFactories) { + super(repositoryPath, axisServiceFactories); this.secure = secure; } Modified: axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreException.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreException.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreException.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreException.java Fri Jan 5 19:50:25 2018 @@ -35,6 +35,7 @@ package org.apache.axis2.testutils; * * @see AllTestsWithRuntimeIgnore * @see JUnit38ClassRunnerWithRuntimeIgnore + * @see Junit4ClassRunnerWithRuntimeIgnore */ public class RuntimeIgnoreException extends Error { private static final long serialVersionUID = -2378820905593825587L; Modified: axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-aar-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-aar-maven-plugin/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-aar-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-aar-maven-plugin/pom.xml Fri Jan 5 19:50:25 2018 @@ -107,11 +107,22 @@ </configuration> </plugin> <plugin> - <artifactId>maven-invoker-plugin</artifactId> + <!-- Work around MINVOKER-191 --> + <artifactId>maven-install-plugin</artifactId> <executions> <execution> + <phase>pre-integration-test</phase> <goals> <goal>install</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <executions> + <execution> + <goals> <goal>integration-test</goal> <goal>verify</goal> </goals> Modified: axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-eclipse-codegen-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original) +++ axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Fri Jan 5 19:50:25 2018 @@ -86,7 +86,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>axis2-xmlbeans</artifactId> + <artifactId>axis2-xmlbeans-codegen</artifactId> <version>${project.version}</version> </dependency> <dependency> Modified: axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml Fri Jan 5 19:50:25 2018 @@ -81,11 +81,22 @@ </configuration> </plugin> <plugin> - <artifactId>maven-invoker-plugin</artifactId> + <!-- Work around MINVOKER-191 --> + <artifactId>maven-install-plugin</artifactId> <executions> <execution> + <phase>pre-integration-test</phase> <goals> <goal>install</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <executions> + <execution> + <goals> <goal>integration-test</goal> <goal>verify</goal> </goals> Modified: axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/pom.xml Fri Jan 5 19:50:25 2018 @@ -117,11 +117,22 @@ </configuration> </plugin> <plugin> - <artifactId>maven-invoker-plugin</artifactId> + <!-- Work around MINVOKER-191 --> + <artifactId>maven-install-plugin</artifactId> <executions> <execution> + <phase>pre-integration-test</phase> <goals> <goal>install</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <executions> + <execution> + <goals> <goal>integration-test</goal> <goal>verify</goal> </goals> Modified: axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java Fri Jan 5 19:50:25 2018 @@ -208,7 +208,28 @@ public abstract class AbstractCreateRepo protected abstract File[] getClassDirectories(); - private void addMessageHandlers(OMElement root, MessageHandler[] handlers, String localName) { + private static void applyParameters(OMElement parentElement, Parameter[] parameters) { + if (parameters == null) { + return; + } + for (Parameter parameter : parameters) { + OMElement parameterElement = null; + for (Iterator<OMElement> it = parentElement.getChildrenWithLocalName("parameter"); it.hasNext(); ) { + OMElement candidate = it.next(); + if (candidate.getAttributeValue(new QName("name")).equals(parameter.getName())) { + parameterElement = candidate; + break; + } + } + if (parameterElement == null) { + parameterElement = parentElement.getOMFactory().createOMElement("parameter", null, parentElement); + parameterElement.addAttribute("name", parameter.getName(), null); + } + parameterElement.setText(parameter.getValue()); + } + } + + private static void addMessageHandlers(OMElement root, MessageHandler[] handlers, String localName) { if (handlers == null) { return; } @@ -219,6 +240,20 @@ public abstract class AbstractCreateRepo element.addAttribute("class", handler.getClassName(), null); } } + + private static void processTransports(OMElement root, Transport[] transports, String localName) { + if (transports == null) { + return; + } + for (Transport transport : transports) { + for (Iterator<OMElement> it = root.getChildrenWithLocalName(localName); it.hasNext(); ) { + OMElement transportElement = it.next(); + if (transportElement.getAttributeValue(new QName("name")).equals(transport.getName())) { + applyParameters(transportElement, transport.getParameters()); + } + } + } + } public void execute() throws MojoExecutionException, MojoFailureException { Log log = getLog(); @@ -300,6 +335,9 @@ public abstract class AbstractCreateRepo for (File classDirectory : getClassDirectories()) { archiver.addDirectory(classDirectory, includes, new String[0]); } + if (service.getResourcesDirectory() != null) { + archiver.addDirectory(service.getResourcesDirectory()); + } archiver.createArchive(); } catch (ArchiverException ex) { throw new MojoExecutionException("Failed to build " + jarName, ex); @@ -332,23 +370,10 @@ public abstract class AbstractCreateRepo log.info("Building service " + serviceName); metaInfDirectory = new File(new File(parentDirectory, serviceName), "META-INF"); metaInfDirectory.mkdirs(); - if (serviceDescription.getParameters() != null) { - for (Parameter parameter : serviceDescription.getParameters()) { - OMElement parameterElement = null; - for (Iterator<OMElement> it = serviceElement.getChildrenWithLocalName("parameter"); it.hasNext(); ) { - OMElement candidate = it.next(); - if (candidate.getAttributeValue(new QName("name")).equals(parameter.getName())) { - parameterElement = candidate; - break; - } - } - if (parameterElement == null) { - parameterElement = doc.getOMFactory().createOMElement("parameter", null, serviceElement); - parameterElement.addAttribute("name", parameter.getName(), null); - } - parameterElement.setText(parameter.getValue()); - } + if (serviceDescription.getScope() != null) { + serviceElement.addAttribute("scope", serviceDescription.getScope(), null); } + applyParameters(serviceElement, serviceDescription.getParameters()); FileOutputStream out = new FileOutputStream(new File(metaInfDirectory, "services.xml")); try { doc.serialize(out); @@ -422,6 +447,9 @@ public abstract class AbstractCreateRepo } } } + applyParameters(root, generatedAxis2xml.getParameters()); + processTransports(root, generatedAxis2xml.getTransportReceivers(), "transportReceiver"); + processTransports(root, generatedAxis2xml.getTransportSenders(), "transportSender"); addMessageHandlers(root, generatedAxis2xml.getMessageBuilders(), "messageBuilder"); addMessageHandlers(root, generatedAxis2xml.getMessageFormatters(), "messageFormatter"); if (generatedAxis2xml.getHandlers() != null) { Modified: axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/GeneratedAxis2Xml.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/GeneratedAxis2Xml.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/GeneratedAxis2Xml.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/GeneratedAxis2Xml.java Fri Jan 5 19:50:25 2018 @@ -19,11 +19,38 @@ package org.apache.axis2.maven2.repo; public class GeneratedAxis2Xml { + private Parameter[] parameters; + private Transport[] transportReceivers; + private Transport[] transportSenders; private MessageHandler[] messageBuilders; private MessageHandler[] messageFormatters; private Handler[] handlers; private String[] modules; + public Parameter[] getParameters() { + return parameters; + } + + public void setParameters(Parameter[] parameters) { + this.parameters = parameters; + } + + public Transport[] getTransportReceivers() { + return transportReceivers; + } + + public void setTransportReceivers(Transport[] transportReceivers) { + this.transportReceivers = transportReceivers; + } + + public Transport[] getTransportSenders() { + return transportSenders; + } + + public void setTransportSenders(Transport[] transportSenders) { + this.transportSenders = transportSenders; + } + public MessageHandler[] getMessageBuilders() { return messageBuilders; } Modified: axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/JAXWSService.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/JAXWSService.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/JAXWSService.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/JAXWSService.java Fri Jan 5 19:50:25 2018 @@ -18,9 +18,12 @@ */ package org.apache.axis2.maven2.repo; +import java.io.File; + public final class JAXWSService { private String name; private String[] packages; + private File resourcesDirectory; public String getName() { return name; @@ -37,4 +40,12 @@ public final class JAXWSService { public void setPackages(String[] packages) { this.packages = packages; } + + public File getResourcesDirectory() { + return resourcesDirectory; + } + + public void setResourcesDirectory(File resourcesDirectory) { + this.resourcesDirectory = resourcesDirectory; + } } Modified: axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ServiceDescription.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ServiceDescription.java?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ServiceDescription.java (original) +++ axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/ServiceDescription.java Fri Jan 5 19:50:25 2018 @@ -22,6 +22,7 @@ import java.io.File; public class ServiceDescription { private File directory; + private String scope; private Parameter[] parameters; public File getDirectory() { @@ -32,6 +33,14 @@ public class ServiceDescription { this.directory = directory; } + public String getScope() { + return scope; + } + + public void setScope(String scope) { + this.scope = scope; + } + public Parameter[] getParameters() { return parameters; } Modified: axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=1820348&r1=1820347&r2=1820348&view=diff ============================================================================== --- axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/branches/schema-validation/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Fri Jan 5 19:50:25 2018 @@ -118,7 +118,7 @@ </dependency> <dependency> <groupId>org.apache.axis2</groupId> - <artifactId>axis2-xmlbeans</artifactId> + <artifactId>axis2-xmlbeans-codegen</artifactId> <version>${project.version}</version> <exclusions> <exclusion> @@ -129,7 +129,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>axis2-jaxbri</artifactId> + <artifactId>axis2-jaxbri-codegen</artifactId> <version>${project.version}</version> <scope>runtime</scope> <exclusions> @@ -190,11 +190,22 @@ </configuration> </plugin> <plugin> - <artifactId>maven-invoker-plugin</artifactId> + <!-- Work around MINVOKER-191 --> + <artifactId>maven-install-plugin</artifactId> <executions> <execution> + <phase>pre-integration-test</phase> <goals> <goal>install</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <executions> + <execution> + <goals> <goal>integration-test</goal> <goal>verify</goal> </goals>
