September 2014 - jbossws-commits - Jboss List Archives

JBossWS SVN: r18935 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-09-12 09:25:39 -0400 (Fri, 12 Sep 2014) New Revision: 18935 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3816] enabled test, removed WSTrustActAsTestCase from the exclude list. Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2014-09-11 20:54:17 UTC (rev 18934) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-09-12 13:25:39 UTC (rev 18935) @@ -692,9 +692,6 @@  <exclude>org/jboss/test/ws/jaxws/cxf/jbws3805/*TestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> </excludes> @@ -774,9 +771,6 @@  <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> @@ -860,9 +854,6 @@  <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> </excludes>

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18934 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-09-11 16:54:17 -0400 (Thu, 11 Sep 2014) New Revision: 18934 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java Log: [bz-1012454] changed the order of checking for success. Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2014-09-11 18:38:55 UTC (rev 18933) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsdd/WSDiscoveryTestCase.java 2014-09-11 20:54:17 UTC (rev 18934) @@ -177,28 +177,11 @@ private void checkResolveMatches(List<ResolveMatchType> rmts, String address, QName type) { List<ResolveMatchType> rmtList = getByAddress(rmts, address); - //assertTrue("Number of matches can not be 0.", (rmtList.size() > 0)); - assertEquals(dbgDumpList(rmtList), 1, rmtList.size()); - assertEquals(type, rmtList.get(0).getTypes().iterator().next()); - } - - // tmp method for debugging jenkins runs. - // report uuid of the endpoint - private String dbgDumpList(List<ResolveMatchType> rmtList){ - StringBuilder dbgStr = new StringBuilder().append("\n"); - - if(rmtList.size() > 1){ - for(ResolveMatchType rmt: rmtList){ - String tmpStr = rmt.getEndpointReference().toString(); - int start = tmpStr.indexOf("<Address>"); - int end = tmpStr.indexOf("</Address>"); - if (start > -1 && end > -1){ - String uuidStr = tmpStr.substring(start+9, end); - dbgStr.append(rmt.getXAddrs().get(0) +" " + uuidStr + "\n"); - } - } + if (rmtList.size() > 0) { + assertEquals(type, rmtList.get(0).getTypes().iterator().next()); + } else { + assertTrue("Number of matches can not be 0.", (rmtList.size() > 0)); } - return dbgStr.toString(); } private List<ResolveMatchType> getByAddress(List<ResolveMatchType> rmts, String address)

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18933 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust.

by jbossws-commits＠lists.jboss.org

Author: rsearls Date: 2014-09-11 14:38:55 -0400 (Thu, 11 Sep 2014) New Revision: 18933 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java Log: [JBWS-3816] changed UsernameToken input args Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-09-11 16:01:56 UTC (rev 18932) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2014-09-11 18:38:55 UTC (rev 18933) @@ -147,7 +147,7 @@ UsernameTokenCallbackHandler ch = new UsernameTokenCallbackHandler(); - String str = ch.getUsernameTokenString("myactaskey", null); + String str = ch.getUsernameTokenString("alice","clarinet"); ctx.put(SecurityConstants.STS_TOKEN_ACT_AS, str);

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18932 - in projects/plugins/maven/jaxws-tools/trunk: src/test/resources/test-embedded/testEndorse and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-11 12:01:56 -0400 (Thu, 11 Sep 2014) New Revision: 18932 Removed: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml Log: [JBWS-3829] Moving to jbossws-cxf 5 snapshot Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -96,19 +96,6 @@ </configuration> <executions> <execution> - <id>integration-test-native</id> - <goals> - <goal>install</goal> - <goal>run</goal> - </goals> - <configuration> - <cloneProjectsTo>${project.build.directory}/test-embedded-native</cloneProjectsTo> - <pomIncludes> - <pomInclude>*/pom.xml</pomInclude> - </pomIncludes> - </configuration> - </execution> - <execution> <id>integration-test-cxf</id> <goals> <goal>install</goal> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom-cxf.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -120,12 +120,12 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>4.2.3.Final</version> + <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-factories</artifactId> - <version>4.2.3.Final</version> + <version>5.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.jboss.spec.javax.xml.ws</groupId> Deleted: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testEndorse/pom.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -1,131 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>testWsConsume</name> - <groupId>org.jboss.ws.plugins.maven.tests</groupId> - <artifactId>testEndorse</artifactId> - <packaging>jar</packaging> - <version>@pom.version@</version> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - <maxmem>256M</maxmem> - <fork>${compiler.fork}</fork> - <compilerArguments> - <endorseddirs>${basedir}/target/endorsed</endorseddirs> - </compilerArguments> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.jboss.ws.plugins</groupId> - <artifactId>maven-jaxws-tools-plugin</artifactId> - <version>@pom.version@</version> - <configuration> - <target>2.2</target> - <verbose>true</verbose> - <fork>true</fork> - <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine> - </configuration> - <executions> - <execution> - <id>First execution</id> - <goals> - <goal>wsconsume</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - </wsdls> - <targetPackage>foo.bar</targetPackage> - </configuration> - </execution> - <execution> - <id>Second execution</id> - <goals> - <goal>wsconsume-test</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - </wsdls> - <targetPackage>foo.test.bar</targetPackage> - </configuration> - </execution> - <execution> - <id>Third execution</id> - <goals> - <goal>wsprovide</goal> - </goals> - <configuration> - <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint</endpointClass> - <generateWsdl>true</generateWsdl> - </configuration> - </execution> - <execution> - <id>Fourth execution</id> - <goals> - <goal>wsprovide-test</goal> - </goals> - <configuration> - <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint2</endpointClass> - <generateWsdl>true</generateWsdl> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>create-endorsed-dir</id> - <phase>validate</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.spec.javax.xml.ws</groupId> - <artifactId>jboss-jaxws-api_2.2_spec</artifactId> - <outputDirectory>${basedir}/target/endorsed</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-client</artifactId> - <version>4.0.0.GA</version> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.xml.ws</groupId> - <artifactId>jboss-jaxws-api_2.2_spec</artifactId> - <version>2.0.0.Final</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>2.0.1.GA</version> - </dependency> - </dependencies> -</project> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom-cxf.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -88,7 +88,7 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>4.2.3.Final</version> + <version>5.0.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> Deleted: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testProvidedScope/pom.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -1,108 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>testProvidedScope</name> - <groupId>org.jboss.ws.plugins.maven.tests</groupId> - <artifactId>testProvidedScope</artifactId> - <packaging>jar</packaging> - <version>@pom.version@</version> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - <maxmem>256M</maxmem> - <fork>${compiler.fork}</fork> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.jboss.ws.plugins</groupId> - <artifactId>maven-jaxws-tools-plugin</artifactId> - <version>@pom.version@</version> - <configuration> - <target>2.1</target> - <verbose>true</verbose> - <fork>true</fork> - </configuration> - <executions> - <execution> - <id>First execution</id> - <goals> - <goal>wsconsume</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - </wsdls> - <targetPackage>foo.bar</targetPackage> - </configuration> - </execution> - <execution> - <id>Second execution</id> - <goals> - <goal>wsconsume-test</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - </wsdls> - <targetPackage>foo.test.bar</targetPackage> - </configuration> - </execution> - <execution> - <id>Third execution</id> - <goals> - <goal>wsprovide</goal> - </goals> - <configuration> - <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint</endpointClass> - <generateWsdl>true</generateWsdl> - </configuration> - </execution> - <execution> - <id>Fourth execution</id> - <goals> - <goal>wsprovide-test</goal> - </goals> - <configuration> - <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint2</endpointClass> - <generateWsdl>true</generateWsdl> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-client</artifactId> - <version>4.0.0.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.xml.ws</groupId> - <artifactId>jboss-jaxws-api_2.2_spec</artifactId> - <version>2.0.0.Final</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>2.0.1.GA</version> - <scope>provided</scope> - </dependency> - </dependencies> -</project> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom-cxf.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -95,7 +95,7 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>4.2.3.Final</version> + <version>5.0.0-SNAPSHOT</version> </dependency> </dependencies> </project> Deleted: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsConsume/pom.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -1,107 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>testWsConsume</name> - <groupId>org.jboss.ws.plugins.maven.tests</groupId> - <artifactId>testWsConsume</artifactId> - <packaging>jar</packaging> - <version>@pom.version@</version> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - <maxmem>256M</maxmem> - <fork>${compiler.fork}</fork> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.jboss.ws.plugins</groupId> - <artifactId>maven-jaxws-tools-plugin</artifactId> - <version>@pom.version@</version> - <configuration> - <target>2.1</target> - <verbose>true</verbose> - </configuration> - <executions> - <execution> - <id>First execution</id> - <goals> - <goal>wsconsume</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - </wsdls> - <targetPackage>foo.bar</targetPackage> - </configuration> - </execution> - <execution> - <id>Second execution</id> - <goals> - <goal>wsconsume</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test2.wsdl</wsdl> - </wsdls> - <targetPackage>foo.bar2</targetPackage> - <sourceDirectory>${project.build.directory}/generated/java-sources</sourceDirectory> - <extension>true</extension> - <fork>true</fork> - </configuration> - </execution> - <execution> - <id>Third execution</id> - <goals> - <goal>wsconsume</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - <wsdl>${basedir}/test2.wsdl</wsdl> - </wsdls> - </configuration> - </execution> - <execution> - <id>Forth execution</id> - <goals> - <goal>wsconsume-test</goal> - </goals> - <configuration> - <wsdls> - <wsdl>${basedir}/test.wsdl</wsdl> - <wsdl>${basedir}/test2.wsdl</wsdl> - </wsdls> - <fork>true</fork> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-client</artifactId> - <version>4.0.0.GA</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>2.0.1.GA</version> - </dependency> - </dependencies> -</project> Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom-cxf.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -94,7 +94,7 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-client</artifactId> - <version>4.2.3.Final</version> + <version>5.0.0-SNAPSHOT</version> </dependency> </dependencies> </project> Deleted: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2014-09-11 15:36:08 UTC (rev 18931) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-embedded/testWsProvide/pom.xml 2014-09-11 16:01:56 UTC (rev 18932) @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>testWsProvide</name> - <groupId>org.jboss.ws.plugins.maven.tests</groupId> - <artifactId>testWsProvide</artifactId> - <packaging>jar</packaging> - <version>@pom.version@</version> - - <repositories> - <repository> - <id>JBoss Nexus Repository</id> - <name>JBoss Nexus Repository</name> - <url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url> - </repository> - </repositories> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - <maxmem>256M</maxmem> - <fork>${compiler.fork}</fork> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.jboss.ws.plugins</groupId> - <artifactId>maven-jaxws-tools-plugin</artifactId> - <version>@pom.version@</version> - <configuration> - <verbose>true</verbose> - </configuration> - <executions> - <execution> - <id>First execution</id> - <goals> - <goal>wsprovide</goal> - </goals> - <configuration> - <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint</endpointClass> - <generateWsdl>true</generateWsdl> - </configuration> - </execution> - <execution> - <id>Second execution</id> - <goals> - <goal>wsprovide-test</goal> - </goals> - <configuration> - <endpointClass>org.jboss.test.ws.plugins.tools.wsprovide.TestEndpoint2</endpointClass> - <generateWsdl>true</generateWsdl> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>2.0.1.GA</version> - </dependency> - <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-client</artifactId> - <version>4.0.0.GA</version> - </dependency> - </dependencies> -</project>

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18931 - in projects/plugins/maven/jaxws-tools/trunk/src: test/java/org/jboss/test/ws/plugins/tools and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-11 11:36:08 -0400 (Thu, 11 Sep 2014) New Revision: 18931 Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/ArgumentTest.java projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsconsume-plugin-config.xml Log: [JBWS-3828] More on encoding option... Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2014-09-11 15:28:10 UTC (rev 18930) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2014-09-11 15:36:08 UTC (rev 18931) @@ -203,6 +203,11 @@ return wsdlLocation; } + public String getEncoding() + { + return encoding; + } + public String getTarget() { return target; Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/ArgumentTest.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/ArgumentTest.java 2014-09-11 15:28:10 UTC (rev 18930) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/java/org/jboss/test/ws/plugins/tools/ArgumentTest.java 2014-09-11 15:36:08 UTC (rev 18931) @@ -60,6 +60,7 @@ assertEquals("catalog", mojo.getCatalog().getName()); assertTrue(mojo.getExtension()); assertEquals("wl", mojo.getWsdlLocation()); + assertEquals("UTF-8", mojo.getEncoding()); assertEquals("source", mojo.getSourceDirectory().getName()); assertTrue(mojo.isVerbose()); assertTrue(mojo.isAdditionalHeaders()); Modified: projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsconsume-plugin-config.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsconsume-plugin-config.xml 2014-09-11 15:28:10 UTC (rev 18930) +++ projects/plugins/maven/jaxws-tools/trunk/src/test/resources/test-argument/wsconsume-plugin-config.xml 2014-09-11 15:36:08 UTC (rev 18931) @@ -22,6 +22,7 @@ <sourceDirectory>source</sourceDirectory> <targetPackage>tp</targetPackage> <wsdlLocation>wl</wsdlLocation> + <encoding>UTF-8</encoding> <target>t</target> <extension>true</extension> <verbose>true</verbose>

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18930 - in projects/plugins/maven/archetypes/jaxws-codefirst/trunk/src/main/resources: archetype-resources and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-11 11:28:10 -0400 (Thu, 11 Sep 2014) New Revision: 18930 Modified: projects/plugins/maven/archetypes/jaxws-codefirst/trunk/src/main/resources/META-INF/maven/archetype-metadata.xml projects/plugins/maven/archetypes/jaxws-codefirst/trunk/src/main/resources/archetype-resources/pom.xml Log: [JBWS-3617] Always set project.build.sourceEncoding property in generated project; build Java 1.7 level sources; use latest jbossws-cxf and jbossws-common-tools snapshots Modified: projects/plugins/maven/archetypes/jaxws-codefirst/trunk/src/main/resources/META-INF/maven/archetype-metadata.xml =================================================================== --- projects/plugins/maven/archetypes/jaxws-codefirst/trunk/src/main/resources/META-INF/maven/archetype-metadata.xml 2014-09-11 15:11:10 UTC (rev 18929) +++ projects/plugins/maven/archetypes/jaxws-codefirst/trunk/src/main/resources/META-INF/maven/archetype-metadata.xml 2014-09-11 15:28:10 UTC (rev 18930) @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <requiredProperties> <requiredProperty key="jbosswscxf" > - <defaultValue>4.2.3.Final</defaultValue> + <defaultValue>5.0.0-SNAPSHOT</defaultValue> </requiredProperty> </requiredProperties> <fileSets> Modified: projects/plugins/maven/archetypes/jaxws-codefirst/trunk/src/main/resources/archetype-resources/pom.xml =================================================================== --- projects/plugins/maven/archetypes/jaxws-codefirst/trunk/src/main/resources/archetype-resources/pom.xml 2014-09-11 15:11:10 UTC (rev 18929) +++ projects/plugins/maven/archetypes/jaxws-codefirst/trunk/src/main/resources/archetype-resources/pom.xml 2014-09-11 15:28:10 UTC (rev 18930) @@ -6,6 +6,9 @@ <artifactId>$artifactId</artifactId> <version>$version</version> <packaging>war</packaging> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> <dependencies> <dependency> <groupId>org.jboss.spec</groupId> @@ -69,8 +72,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.4</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> <encoding>UTF-8</encoding> </configuration> </plugin> @@ -98,7 +101,7 @@ <plugin> <groupId>org.jboss.ws.plugins</groupId> <artifactId>maven-jaxws-tools-plugin</artifactId> - <version>1.1.2.Final</version> + <version>1.2.0-SNAPSHOT</version> <configuration> <verbose>true</verbose> </configuration>

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18929 - projects/plugins/maven/archetypes/jaxws-codefirst/trunk.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-11 11:11:10 -0400 (Thu, 11 Sep 2014) New Revision: 18929 Modified: projects/plugins/maven/archetypes/jaxws-codefirst/trunk/pom.xml Log: Move to 1.0.1-SNAPSHOT version as we're going to use a newer tooling stack (jbossws-cxf 5 instead of 4.2 and corresponding api/spi/common-tools) Modified: projects/plugins/maven/archetypes/jaxws-codefirst/trunk/pom.xml =================================================================== --- projects/plugins/maven/archetypes/jaxws-codefirst/trunk/pom.xml 2014-09-11 14:56:52 UTC (rev 18928) +++ projects/plugins/maven/archetypes/jaxws-codefirst/trunk/pom.xml 2014-09-11 15:11:10 UTC (rev 18929) @@ -9,7 +9,7 @@ </parent> <groupId>org.jboss.ws.plugins.archetypes</groupId> <artifactId>jaxws-codefirst</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.1-SNAPSHOT</version> <packaging>maven-archetype</packaging> <name>JBossWS-CXF Archetype - Simple JAX-WS Code First</name>

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18928 - projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-11 10:56:52 -0400 (Thu, 11 Sep 2014) New Revision: 18928 Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java Log: [JBWS-3828] Adding encoding support to the plugin Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2014-09-11 14:56:13 UTC (rev 18927) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/AbstractWsConsumeMojo.java 2014-09-11 14:56:52 UTC (rev 18928) @@ -94,6 +94,13 @@ private String wsdlLocation; /** + * Sets the charset encoding to be used for generated files. + * + * @parameter default-value="${project.build.sourceEncoding}" + */ + protected String encoding; + + /** * Set the target JAX-WS specification target. Defaults to <code>2.0</code>. Allowed values are <code>2.0</code>, <code>2.1</code> * * @parameter @@ -138,6 +145,7 @@ params.setTarget(target); params.setTargetPackage(targetPackage); params.setWsdlLocation(wsdlLocation); + params.setEncoding(encoding); params.setArgLine(argLine); params.setFork(fork); WSContractDelegate delegate = new WSContractDelegate(getLog()); Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java 2014-09-11 14:56:13 UTC (rev 18927) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractConsumerParams.java 2014-09-11 14:56:52 UTC (rev 18928) @@ -41,6 +41,7 @@ private String target; private String targetPackage; private String wsdlLocation; + private String encoding; private String argLine; public boolean isAdditionalHeaders() @@ -131,6 +132,14 @@ { this.wsdlLocation = wsdlLocation; } + public String getEncoding() + { + return encoding; + } + public void setEncoding(String encoding) + { + this.encoding = encoding; + } public boolean isExtension() { return extension; Modified: projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java 2014-09-11 14:56:13 UTC (rev 18927) +++ projects/plugins/maven/jaxws-tools/trunk/src/main/java/org/jboss/ws/plugins/tools/WSContractDelegate.java 2014-09-11 14:56:52 UTC (rev 18928) @@ -192,6 +192,11 @@ commandList.add("-w"); commandList.add(params.getWsdlLocation()); } + if (params.getEncoding() != null) + { + commandList.add("-d"); + commandList.add(params.getEncoding()); + } if (params.getOutputDirectory() != null) { commandList.add("-o"); @@ -315,6 +320,10 @@ { callMethod(consumerClass, consumer, "setWsdlLocation", params.getWsdlLocation()); } + if (params.getEncoding() != null) + { + callMethod(consumerClass, consumer, "setEncoding", params.getEncoding()); + } } private static Object callMethod(Class<?> clazz, Object obj, String name, boolean param) throws Exception

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18927 - projects/plugins/maven/jaxws-tools/trunk.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-11 10:56:13 -0400 (Thu, 11 Sep 2014) New Revision: 18927 Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml Log: [JBWS-3829] start building to 1.2.0-SNAPSHOT Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2014-09-11 14:38:46 UTC (rev 18926) +++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2014-09-11 14:56:13 UTC (rev 18927) @@ -8,7 +8,7 @@ <artifactId>maven-jaxws-tools-plugin</artifactId> <packaging>maven-plugin</packaging> - <version>1.1.3-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version>  <parent>

9 years, 7 months

1
0
0 / 0

JBossWS SVN: r18926 - projects/plugins/maven/jaxws-tools/trunk.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-09-11 10:38:46 -0400 (Thu, 11 Sep 2014) New Revision: 18926 Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml Log: Use latest jbossws-common-tools snapshot Modified: projects/plugins/maven/jaxws-tools/trunk/pom.xml =================================================================== --- projects/plugins/maven/jaxws-tools/trunk/pom.xml 2014-09-11 14:31:15 UTC (rev 18925) +++ projects/plugins/maven/jaxws-tools/trunk/pom.xml 2014-09-11 14:38:46 UTC (rev 18926) @@ -26,7 +26,7 @@  <properties> - <jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version> + <jbossws.common.tools.version>1.2.1-SNAPSHOT</jbossws.common.tools.version> <getopt.version>1.0.13</getopt.version> <log4j.version>1.2.14</log4j.version> <maven.project.version>2.2.1</maven.project.version>

9 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits September 2014