May 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r16327 - stack/cxf/branches/jbossws-cxf-4.0.x.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-05-29 10:14:26 -0400 (Tue, 29 May 2012) New Revision: 16327 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ Log: Blocked revisions 16297-16298,16311,16313 via svnmerge ....... r16297 | ropalka | 2012-05-17 15:24:48 +0200 (Thu, 17 May 2012) | 1 line use up2date JBossWS parent version ....... r16298 | ropalka | 2012-05-18 10:48:54 +0200 (Fri, 18 May 2012) | 1 line use Apache CXF 2.5.x SNAPSHOT ....... r16311 | ropalka | 2012-05-24 14:15:01 +0200 (Thu, 24 May 2012) | 1 line [JBWS-3495] upgrade from Apache CXF 2.5.4-SNAPSHOT > 2.6.1-SNAPSHOT ....... r16313 | ropalka | 2012-05-24 15:36:23 +0200 (Thu, 24 May 2012) | 1 line [JBWS-3495] fix org.apache.cxf module definition for Apache CXF 2.6.x series ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-blocked - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:15645-15648,15650,156...

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r16326 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/dist and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-05-29 10:12:03 -0400 (Tue, 29 May 2012) New Revision: 16326 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: Merged revisions 16323 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r16323 | ropalka | 2012-05-29 15:56:15 +0200 (Tue, 29 May 2012) | 1 line [JBWS-3499] removing JAXR, Apache Scout & Apache JUDDi dependency ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16323 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-05-29 14:03:00 UTC (rev 16325) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-05-29 14:12:03 UTC (rev 16326) @@ -93,27 +93,6 @@ <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> </dependency> - -  - <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <type>sar</type> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>apache-scout</groupId> - <artifactId>scout</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>juddi</groupId> - <artifactId>juddi</artifactId> - <scope>provided</scope> - </dependency> -  <dependency> <groupId>junit</groupId> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-05-29 14:03:00 UTC (rev 16325) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-05-29 14:12:03 UTC (rev 16326) @@ -75,9 +75,6 @@ <include>org.springframework:spring-expression:jar</include> <include>org.springframework:spring-jms:jar</include> <include>org.springframework:spring-tx:jar</include> - <include>org.jboss.jaxr:juddi-service:sar</include> - <include>apache-scout:scout:jar</include> - <include>juddi:juddi:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> <include>org.jboss.ws:jbossws-jboss*:jar</include> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-05-29 14:03:00 UTC (rev 16325) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-05-29 14:12:03 UTC (rev 16326) @@ -25,32 +25,9 @@ <project>  -  -  - - <macrodef name="macro-deploy-juddi-sar"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}"> - <fileset dir="@{thirdpartydir}"> - <include name="**/juddi-service.sar"/> - </fileset> - </unzip> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/juddi.jar"/> - <include name="**/scout.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - -    - + <macrodef name="macro-deploy-jbossws-modules"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml 2012-05-29 14:03:00 UTC (rev 16325) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/pom.xml 2012-05-29 14:12:03 UTC (rev 16326) @@ -244,11 +244,6 @@ <groupId>org.jboss.spec.javax.jms</groupId> <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> - <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <type>sar</type> - </dependency> </dependencies>  Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-05-29 14:03:00 UTC (rev 16325) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-05-29 14:12:03 UTC (rev 16326) @@ -81,26 +81,7 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> -  <dependency> - <groupId>apache-scout</groupId> - <artifactId>scout</artifactId> - <version>${apache.scout.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>juddi</groupId> - <artifactId>juddi</artifactId> - <version>${juddi.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-saaj</artifactId> - <version>${jboss.jaxr.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>${log4j.version}</version> @@ -730,20 +711,6 @@ <endorseddirs>${project.build.directory}/endorsed</endorseddirs> </compilerArguments> </configuration> - <executions> - <execution> - <id>default-testCompile</id> - <phase>test-compile</phase> - <configuration> - <testExcludes> - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - </testExcludes> - </configuration> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> @@ -789,9 +756,6 @@ <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude> <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws3124/**</exclude> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-05-29 14:03:00 UTC (rev 16325) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-05-29 14:12:03 UTC (rev 16326) @@ -82,10 +82,7 @@ <jaxb.impl.version>2.2.5</jaxb.impl.version> <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version> <jaxws.api.version>2.0.0.Final</jaxws.api.version> - <jboss.jaxr.version>2.0.3</jboss.jaxr.version> <jsr181.api.version>1.0-MR1</jsr181.api.version> - <apache.scout.version>1.1.1</apache.scout.version> - <juddi.version>0.9RC4</juddi.version> <commons-collections.version>3.2.1</commons-collections.version> <commons-lang.version>2.4</commons-lang.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -1086,22 +1083,6 @@ <version>${jaxb.impl.version}</version> </dependency> <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <version>${jboss.jaxr.version}</version> - <type>sar</type> - </dependency> - <dependency> - <groupId>apache-scout</groupId> - <artifactId>scout</artifactId> - <version>${apache.scout.version}</version> - </dependency> - <dependency> - <groupId>juddi</groupId> - <artifactId>juddi</artifactId> - <version>${juddi.version}</version> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${commons.logging.version}</version>

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r16325 - in shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test: java/org/jboss/test/ws/jaxws/samples and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-05-29 10:03:00 -0400 (Tue, 29 May 2012) New Revision: 16325 Removed: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/ Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-testsuite.xml Log: [JBWS-3499] removing JAXR, Apache Scout & Apache JUDDi dependency Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-testsuite.xml 2012-05-29 13:56:57 UTC (rev 16324) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-testsuite.xml 2012-05-29 14:03:00 UTC (rev 16325) @@ -515,7 +515,6 @@ <target name="tests-smoke" depends="tests-init" description="Run smoke unit tests"> <antcall target="tests-run-internal"> <param name="include.wildcard" value="org/jboss/test/ws/jaxws/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCaseForked.class"/> - <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/> <!-- According to our commit policy, haltonfailure MUST be be true for tests-smoke It is a prerequisite for any commit that this target passes without failure. @@ -529,7 +528,6 @@ <target name="tests-samples" depends="tests-init" description="Run samples unit tests"> <antcall target="tests-run-internal"> <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/> - <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/> <param name="haltonfailure" value="false"/> </antcall> </target> @@ -538,7 +536,6 @@ <target name="tests-integration" depends="tests-jars" description="Run integration unit tests"> <antcall target="tests-run-internal"> <param name="include.wildcard" value="org/jboss/test/ws/jaxws/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class"/> - <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/> <param name="haltonfailure" value="false"/> </antcall> <antcall target="tests-report"/>

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r16324 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/samples and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-05-29 09:56:57 -0400 (Tue, 29 May 2012) New Revision: 16324 Removed: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/ Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml Log: [JBWS-3499] removing JAXR, Apache Scout & Apache JUDDi dependency Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-05-29 13:56:15 UTC (rev 16323) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-05-29 13:56:57 UTC (rev 16324) @@ -527,7 +527,6 @@ <target name="tests-smoke" depends="tests-init" description="Run smoke unit tests"> <antcall target="tests-run-internal"> <param name="include.wildcard" value="org/jboss/test/ws/jaxws/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCaseForked.class"/> - <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/> <!-- According to our commit policy, haltonfailure MUST be be true for tests-smoke It is a prerequisite for any commit that this target passes without failure. @@ -541,7 +540,6 @@ <target name="tests-samples" depends="tests-init" description="Run samples unit tests"> <antcall target="tests-run-internal"> <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/> - <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/> <param name="haltonfailure" value="false"/> </antcall> </target> @@ -550,7 +548,6 @@ <target name="tests-integration" depends="tests-jars" description="Run integration unit tests"> <antcall target="tests-run-internal"> <param name="include.wildcard" value="org/jboss/test/ws/jaxws/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class"/> - <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/> <param name="haltonfailure" value="false"/> </antcall> <antcall target="tests-report"/>

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r16323 - in stack/cxf/trunk: modules/dist and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-05-29 09:56:15 -0400 (Tue, 29 May 2012) New Revision: 16323 Modified: stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3499] removing JAXR, Apache Scout & Apache JUDDi dependency Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2012-05-25 17:16:59 UTC (rev 16322) +++ stack/cxf/trunk/modules/dist/pom.xml 2012-05-29 13:56:15 UTC (rev 16323) @@ -125,27 +125,6 @@ <groupId>org.springframework</groupId> <artifactId>spring-jms</artifactId> </dependency> - -  - <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <type>sar</type> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>apache-scout</groupId> - <artifactId>scout</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>juddi</groupId> - <artifactId>juddi</artifactId> - <scope>provided</scope> - </dependency> -  <dependency> <groupId>org.opensaml</groupId> Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-05-25 17:16:59 UTC (rev 16322) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-05-29 13:56:15 UTC (rev 16323) @@ -76,9 +76,6 @@ <include>org.springframework:spring-expression:jar</include> <include>org.springframework:spring-jms:jar</include> <include>org.springframework:spring-tx:jar</include> - <include>org.jboss.jaxr:juddi-service:sar</include> - <include>apache-scout:scout:jar</include> - <include>juddi:juddi:jar</include> <include>org.opensaml:open*:jar</include> <include>org.opensaml:xmltooling:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-05-25 17:16:59 UTC (rev 16322) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2012-05-29 13:56:15 UTC (rev 16323) @@ -25,32 +25,9 @@ <project>  -  -  - - <macrodef name="macro-deploy-juddi-sar"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}"> - <fileset dir="@{thirdpartydir}"> - <include name="**/juddi-service.sar"/> - </fileset> - </unzip> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/juddi.jar"/> - <include name="**/scout.jar"/> - </fileset> - </copy> - </sequential> - </macrodef> - -    - + <macrodef name="macro-deploy-jbossws-modules"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2012-05-25 17:16:59 UTC (rev 16322) +++ stack/cxf/trunk/modules/server/pom.xml 2012-05-29 13:56:15 UTC (rev 16323) @@ -249,12 +249,6 @@ <artifactId>jboss-jms-api_1.1_spec</artifactId> </dependency> <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <type>sar</type> - </dependency> - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-05-25 17:16:59 UTC (rev 16322) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-05-29 13:56:15 UTC (rev 16323) @@ -86,26 +86,7 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> -  <dependency> - <groupId>apache-scout</groupId> - <artifactId>scout</artifactId> - <version>${apache.scout.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>juddi</groupId> - <artifactId>juddi</artifactId> - <version>${juddi.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-saaj</artifactId> - <version>${jboss.jaxr.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>${log4j.version}</version> @@ -737,7 +718,6 @@ <phase>test-compile</phase> <configuration> <testExcludes> - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>  <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> </testExcludes> @@ -785,9 +765,6 @@ <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude> @@ -964,20 +941,6 @@ <endorseddirs>${project.build.directory}/endorsed</endorseddirs> </compilerArguments> </configuration> - <executions> - <execution> - <id>default-testCompile</id> - <phase>test-compile</phase> - <configuration> - <testExcludes> - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - </testExcludes> - </configuration> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> @@ -1010,9 +973,6 @@ <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws3124/**</exclude> @@ -1182,20 +1142,6 @@ <endorseddirs>${project.build.directory}/endorsed</endorseddirs> </compilerArguments> </configuration> - <executions> - <execution> - <id>default-testCompile</id> - <phase>test-compile</phase> - <configuration> - <testExcludes> - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - </testExcludes> - </configuration> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> @@ -1231,9 +1177,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws3124/**</exclude> @@ -1403,20 +1346,6 @@ <endorseddirs>${project.build.directory}/endorsed</endorseddirs> </compilerArguments> </configuration> - <executions> - <execution> - <id>default-testCompile</id> - <phase>test-compile</phase> - <configuration> - <testExcludes> - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - </testExcludes> - </configuration> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> @@ -1452,9 +1381,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws3124/**</exclude> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-05-25 17:16:59 UTC (rev 16322) +++ stack/cxf/trunk/pom.xml 2012-05-29 13:56:15 UTC (rev 16323) @@ -89,10 +89,7 @@ <jaxb.impl.version>2.2.5</jaxb.impl.version> <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version> <jaxws.api.version>2.0.0.Final</jaxws.api.version> - <jboss.jaxr.version>2.0.3</jboss.jaxr.version> <jsr181.api.version>1.0-MR1</jsr181.api.version> - <apache.scout.version>1.1.1</apache.scout.version> - <juddi.version>0.9RC4</juddi.version> <commons-collections.version>3.2.1</commons-collections.version> <commons-lang.version>2.4</commons-lang.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -1221,22 +1218,6 @@ <version>${jaxb.impl.version}</version> </dependency> <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <version>${jboss.jaxr.version}</version> - <type>sar</type> - </dependency> - <dependency> - <groupId>apache-scout</groupId> - <artifactId>scout</artifactId> - <version>${apache.scout.version}</version> - </dependency> - <dependency> - <groupId>juddi</groupId> - <artifactId>juddi</artifactId> - <version>${juddi.version}</version> - </dependency> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${commons.logging.version}</version>

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r16322 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-05-25 13:16:59 -0400 (Fri, 25 May 2012) New Revision: 16322 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java Log: Replace use of deprecated CXF MethodDispatcher class Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2012-05-25 17:09:44 UTC (rev 16321) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2012-05-25 17:16:59 UTC (rev 16322) @@ -59,7 +59,7 @@ import org.apache.cxf.attachment.AttachmentImpl; import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.binding.soap.SoapMessage; -import org.apache.cxf.frontend.MethodDispatcher; +import org.apache.cxf.service.invoker.MethodDispatcher; import org.apache.cxf.headers.Header; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.interceptor.Fault;

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r16321 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-05-25 13:09:44 -0400 (Fri, 25 May 2012) New Revision: 16321 Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/AuthorizationHandler.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EJB3EndpointImpl.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/Endpoint.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EndpointHandler.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EndpointImpl.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/LogHandler.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/RoutingHandler.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/META-INF/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/META-INF/jaxws-endpoint-config.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/META-INF/jboss-webservices.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/jaxws-endpoint-config.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/jboss-webservices.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/web-A.xml shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/web-B.xml Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml Log: [JBWS-3287] Adding testcase Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-05-25 17:09:13 UTC (rev 16320) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-05-25 17:09:44 UTC (rev 16321) @@ -1112,35 +1112,75 @@ </classes> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3282.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3282/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3282/EndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/jbws3282/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/jbws3282/*Handler.class"/> - <include name="org/jboss/test/ws/jaxws/jbws3282/jaxws-handlers-server.xml"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3282/WEB-INF"> - <include name="**/*" /> - </webinf> - </war> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3282.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3282/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws3282/EndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3282/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3282/*Handler.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3282/jaxws-handlers-server.xml"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3282/WEB-INF"> + <include name="**/jaxws-endpoint-config.xml" /> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3287-A.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3287/WEB-INF/web-A.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws3287/EndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3287/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3287/*Handler.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3287/WEB-INF"> + <include name="**/jaxws-endpoint-config.xml" /> + <include name="**/jboss-webservices.xml" /> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3287-B.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3287/WEB-INF/web-B.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws3287/EndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3287/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3287/*Handler.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3287/WEB-INF"> + <include name="**/jaxws-endpoint-config.xml" /> + </webinf> + </war> + +  + <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws3287-C.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws3287/EJB3EndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3287/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3287/*Handler.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws3287/META-INF"> + <include name="**/*" /> + </metainf> + </jar> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3276-usecase1.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3276/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws3276/POJOIface.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3276/POJOImpl.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3276/AnonymousPOJO.class"/> + </classes> + </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3276-usecase1.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3276/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3276/POJOIface.class"/> - <include name="org/jboss/test/ws/jaxws/jbws3276/POJOImpl.class"/> - <include name="org/jboss/test/ws/jaxws/jbws3276/AnonymousPOJO.class"/> - </classes> - </war> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3276-usecase2.war" needxmlfile="false"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/jbws3276/POJOIface.class"/> + <include name="org/jboss/test/ws/jaxws/jbws3276/AnonymousPOJO.class"/> + </classes> + </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3276-usecase2.war" needxmlfile="false"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3276/POJOIface.class"/> - <include name="org/jboss/test/ws/jaxws/jbws3276/AnonymousPOJO.class"/> - </classes> - </war> -  <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3293.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3293/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/AuthorizationHandler.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/AuthorizationHandler.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/AuthorizationHandler.java 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3287; + +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPBodyElement; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.logging.Logger; +import org.jboss.ws.api.handler.GenericSOAPHandler; + +public class AuthorizationHandler extends GenericSOAPHandler +{ + // Provide logging + private static Logger log = Logger.getLogger(AuthorizationHandler.class); + + protected boolean handleInbound(MessageContext msgContext) + { + log.info("handleInbound"); + + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + + SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + SOAPElement soapElement = (SOAPElement)soapBodyElement.getChildElements().next(); + String value = soapElement.getValue(); + soapElement.setValue(value + "|AuthIn"); + } + catch (SOAPException e) + { + throw new WebServiceException(e); + } + + return true; + } + + protected boolean handleOutbound(MessageContext msgContext) + { + log.info("handleOutbound"); + + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + + SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + SOAPElement soapElement = (SOAPElement)soapBodyElement.getChildElements().next(); + String value = soapElement.getValue(); + soapElement.setValue(value + "|AuthOut"); + } + catch (SOAPException e) + { + throw new WebServiceException(e); + } + + return true; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EJB3EndpointImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EJB3EndpointImpl.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EJB3EndpointImpl.java 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3287; + +import javax.ejb.Stateless; +import javax.jws.HandlerChain; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +@Stateless +@WebService(name="Endpoint", serviceName="EndpointImplService") +@SOAPBinding(style = SOAPBinding.Style.RPC) +@HandlerChain(file = "jaxws-handlers-server.xml") // relative path from the class file +public class EJB3EndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(EJB3EndpointImpl.class); + + @WebMethod + public String echo(String input) + { + log.info("echo: " + input); + return input + "|endpoint"; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/Endpoint.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/Endpoint.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/Endpoint.java 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3287; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name="Endpoint") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface Endpoint +{ + public String echo(String input); +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EndpointHandler.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EndpointHandler.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EndpointHandler.java 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3287; + +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPBodyElement; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.logging.Logger; +import org.jboss.ws.api.handler.GenericSOAPHandler; + +public class EndpointHandler extends GenericSOAPHandler +{ + // Provide logging + private static Logger log = Logger.getLogger(EndpointHandler.class); + + protected boolean handleInbound(MessageContext msgContext) + { + log.info("handleInbound"); + + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + + SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + SOAPElement soapElement = (SOAPElement)soapBodyElement.getChildElements().next(); + String value = soapElement.getValue(); + soapElement.setValue(value + "|EpIn"); + } + catch (SOAPException e) + { + throw new WebServiceException(e); + } + + return true; + } + + protected boolean handleOutbound(MessageContext msgContext) + { + log.info("handleOutbound"); + + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + + SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + SOAPElement soapElement = (SOAPElement)soapBodyElement.getChildElements().next(); + String value = soapElement.getValue(); + soapElement.setValue(value + "|EpOut"); + } + catch (SOAPException e) + { + throw new WebServiceException(e); + } + + return true; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EndpointImpl.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EndpointImpl.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/EndpointImpl.java 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3287; + +import javax.jws.HandlerChain; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +@WebService(name="Endpoint") +@SOAPBinding(style = SOAPBinding.Style.RPC) +@HandlerChain(file = "jaxws-handlers-server.xml") // relative path from the class file +public class EndpointImpl +{ + // Provide logging + private static Logger log = Logger.getLogger(EndpointImpl.class); + + @WebMethod + public String echo(String input) + { + log.info("echo: " + input); + return input + "|endpoint"; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3287; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Verifies deployment descriptor support for jbossws-config-file / jbossws-config-name + * + * https://issues.jboss.org/browse/JBWS-3287 + * + * @author alessio.soldano(a)jboss.com + * @since 25-May-2012 + */ +public class JBWS3287TestCase extends JBossWSTest +{ + private static final String targetNS = "http://jbws3287.jaxws.ws.test.jboss.org/"; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS3287TestCase.class, "jaxws-jbws3287-A.war, jaxws-jbws3287-B.war, jaxws-jbws3287-C.jar"); + } + + public void testJBossWebservicesXmlDD() throws Exception + { + runTestInternal("jaxws-jbws3287-A/TestService?wsdl"); + } + + public void testWebXmlDD() throws Exception + { + runTestInternal("jaxws-jbws3287-B/TestService?wsdl"); + } + + public void testEJB3JBossWebservicesXmlDD() throws Exception + { + runTestInternal("jaxws-jbws3287-C/EndpointImplService/Endpoint?wsdl"); + } + + private void runTestInternal(String path) throws Exception { + QName serviceName = new QName(targetNS, "EndpointImplService"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + path); + + Service service = Service.create(wsdlURL, serviceName); + Endpoint port = (Endpoint)service.getPort(Endpoint.class); + + String resStr = port.echo("Kermit"); + assertEquals("Kermit|RoutIn|AuthIn|EpIn|LogIn|endpoint|LogOut|EpOut|AuthOut|RoutOut", resStr); + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/LogHandler.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/LogHandler.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/LogHandler.java 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,85 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3287; + +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPBodyElement; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.logging.Logger; +import org.jboss.ws.api.handler.GenericSOAPHandler; + +public class LogHandler extends GenericSOAPHandler +{ + // Provide logging + private static Logger log = Logger.getLogger(LogHandler.class); + + protected boolean handleInbound(MessageContext msgContext) + { + log.info("handleInbound"); + + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + + SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + SOAPElement soapElement = (SOAPElement)soapBodyElement.getChildElements().next(); + String value = soapElement.getValue(); + soapElement.setValue(value + "|LogIn"); + } + catch (SOAPException e) + { + throw new WebServiceException(e); + } + + return true; + } + + protected boolean handleOutbound(MessageContext msgContext) + { + log.info("handleOutbound"); + + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + + SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + SOAPElement soapElement = (SOAPElement)soapBodyElement.getChildElements().next(); + String value = soapElement.getValue(); + soapElement.setValue(value + "|LogOut"); + } + catch (SOAPException e) + { + throw new WebServiceException(e); + } + + return true; + } + +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/RoutingHandler.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/RoutingHandler.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/RoutingHandler.java 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jbws3287; + +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPBodyElement; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.logging.Logger; +import org.jboss.ws.api.handler.GenericSOAPHandler; + +public class RoutingHandler extends GenericSOAPHandler +{ + // Provide logging + private static Logger log = Logger.getLogger(RoutingHandler.class); + + protected boolean handleInbound(MessageContext msgContext) + { + log.info("handleInbound"); + + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + + SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + SOAPElement soapElement = (SOAPElement)soapBodyElement.getChildElements().next(); + String value = soapElement.getValue(); + soapElement.setValue(value + "|RoutIn"); + } + catch (SOAPException e) + { + throw new WebServiceException(e); + } + + return true; + } + + protected boolean handleOutbound(MessageContext msgContext) + { + log.info("handleOutbound"); + + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + + SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); + SOAPElement soapElement = (SOAPElement)soapBodyElement.getChildElements().next(); + String value = soapElement.getValue(); + soapElement.setValue(value + "|RoutOut"); + } + catch (SOAPException e) + { + throw new WebServiceException(e); + } + + return true; + } +} Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3287/jaxws-handlers-server.xml 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> + + <handler-chain> + <handler> + <handler-name> EndpointHandler </handler-name> + <handler-class> org.jboss.test.ws.jaxws.jbws3287.EndpointHandler </handler-class> + </handler> + </handler-chain> +</handler-chains> \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/META-INF/jaxws-endpoint-config.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/META-INF/jaxws-endpoint-config.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/META-INF/jaxws-endpoint-config.xml 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jbossws-jaxws-config_4_0.xsd"> + + <endpoint-config> + <config-name>Custom Endpoint</config-name> + <pre-handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>Log Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws3287.LogHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </pre-handler-chains> + <post-handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>Authorization Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws3287.AuthorizationHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>Routing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws3287.RoutingHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + +</jaxws-config> \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/META-INF/jboss-webservices.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/META-INF/jboss-webservices.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/META-INF/jboss-webservices.xml 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,11 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.2" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee"> + + <config-name>Custom Endpoint</config-name> + <config-file>META-INF/jaxws-endpoint-config.xml</config-file> + +</webservices> \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/jaxws-endpoint-config.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/jaxws-endpoint-config.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/jaxws-endpoint-config.xml 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jbossws-jaxws-config_4_0.xsd"> + + <endpoint-config> + <config-name>Custom Endpoint</config-name> + <pre-handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>Log Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws3287.LogHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </pre-handler-chains> + <post-handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name>Authorization Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws3287.AuthorizationHandler</javaee:handler-class> + </javaee:handler> + <javaee:handler> + <javaee:handler-name>Routing Handler</javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws3287.RoutingHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </endpoint-config> + +</jaxws-config> \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/jboss-webservices.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/jboss-webservices.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/jboss-webservices.xml 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,11 @@ +<?xml version="1.1" encoding="UTF-8"?> +<webservices + xmlns="http://www.jboss.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + version="1.2" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee"> + + <config-name>Custom Endpoint</config-name> + <config-file>WEB-INF/jaxws-endpoint-config.xml</config-file> + +</webservices> \ No newline at end of file Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/web-A.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/web-A.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/web-A.xml 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws3287.EndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/web-B.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/web-B.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3287/WEB-INF/web-B.xml 2012-05-25 17:09:44 UTC (rev 16321) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws3287.EndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + + <context-param> + <param-name>jbossws-config-name</param-name> + <param-value>Custom Endpoint</param-value> + </context-param> + + <context-param> + <param-name>jbossws-config-file</param-name> + <param-value>WEB-INF/jaxws-endpoint-config.xml</param-value> + </context-param> + +</web-app> +

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r16320 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: deployment/aspect and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-05-25 13:09:13 -0400 (Fri, 25 May 2012) New Revision: 16320 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java Log: [JBWS-3287] Using deployment descriptor contribution too for jbossws endpoint config name / file Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-05-25 16:20:22 UTC (rev 16319) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-05-25 17:09:13 UTC (rev 16320) @@ -126,10 +126,12 @@ * @param customization The binding customization to set in the configurer, if any * @param wsdlPublisher The wsdl file publisher to set in the configurer, if any * @param depEndpoints The list of deployment endpoints + * @param epConfigName The endpoint configuration name, if any + * @param epConfigFile The endpoint configuration file, if any * @return The new jbossws cxf configurer */ public abstract Configurer createServerConfigurer(BindingCustomization customization, - WSDLFilePublisher wsdlPublisher, List<Endpoint> depEndpoints, UnifiedVirtualFile root); + WSDLFilePublisher wsdlPublisher, List<Endpoint> depEndpoints, UnifiedVirtualFile root, String epConfigName, String epConfigFile); protected static void setInterceptors(Bus bus) { Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2012-05-25 16:20:22 UTC (rev 16319) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2012-05-25 17:09:13 UTC (rev 16320) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -179,13 +179,15 @@ @Override public Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher, - List<Endpoint> depEndpoints, UnifiedVirtualFile root) + List<Endpoint> depEndpoints, UnifiedVirtualFile root, String epConfigName, String epConfigFile) { ServerBeanCustomizer customizer = new ServerBeanCustomizer(); customizer.setBindingCustomization(customization); customizer.setWsdlPublisher(wsdlPublisher); customizer.setDeploymentEndpoints(depEndpoints); customizer.setDeploymentRoot(root); + customizer.setEpConfigFile(epConfigFile); + customizer.setEpConfigName(epConfigName); return new JBossWSNonSpringConfigurer(customizer); } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2012-05-25 16:20:22 UTC (rev 16319) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2012-05-25 17:09:13 UTC (rev 16320) @@ -58,6 +58,10 @@ private UnifiedVirtualFile deploymentRoot; + private String epConfigName; + + private String epConfigFile; + @Override public void customize(Object beanInstance) { @@ -106,22 +110,34 @@ { endpoint.setInvoker(new JBossWSInvoker()); } - EndpointConfig epConfig = implementor.getClass().getAnnotation(EndpointConfig.class); + // ** Endpoint configuration setup ** + // 1) default values String configName = org.jboss.wsf.spi.metadata.config.EndpointConfig.STANDARD_ENDPOINT_CONFIG; String configFile = null; - if (epConfig != null) + // 2) annotation contribution + EndpointConfig epConfigAnn = implementor.getClass().getAnnotation(EndpointConfig.class); + if (epConfigAnn != null) { - if (!epConfig.configName().isEmpty()) + if (!epConfigAnn.configName().isEmpty()) { - configName = epConfig.configName(); + configName = epConfigAnn.configName(); } - if (!epConfig.configFile().isEmpty()) + if (!epConfigAnn.configFile().isEmpty()) { - configFile = epConfig.configFile(); + configFile = epConfigAnn.configFile(); } } - + // 3) descriptor overrides (jboss-webservices.xml or web.xml) + if (epConfigName != null && !epConfigName.isEmpty()) + { + configName = epConfigName; + } + if (epConfigFile != null && !epConfigFile.isEmpty()) + { + configFile = epConfigFile; + } + // 4) setup of configuration if (configFile == null) { //use endpoint configs from AS domain @@ -177,4 +193,15 @@ { this.depEndpoints = endpoints; } + + public void setEpConfigName(String epConfigName) + { + this.epConfigName = epConfigName; + } + + public void setEpConfigFile(String epConfigFile) + { + this.epConfigFile = epConfigFile; + } + } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-05-25 16:20:22 UTC (rev 16319) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-05-25 17:09:13 UTC (rev 16320) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -166,7 +166,7 @@ @Override public Configurer createServerConfigurer(BindingCustomization customization, WSDLFilePublisher wsdlPublisher, - List<Endpoint> depEndpoints, UnifiedVirtualFile root) + List<Endpoint> depEndpoints, UnifiedVirtualFile root, String epConfigName, String epConfigFile) { ApplicationContext ctx = bus.getExtension(BusApplicationContext.class); ServerBeanCustomizer customizer = new ServerBeanCustomizer(); @@ -174,6 +174,8 @@ customizer.setWsdlPublisher(wsdlPublisher); customizer.setDeploymentEndpoints(depEndpoints); customizer.setDeploymentRoot(root); + customizer.setEpConfigFile(epConfigFile); + customizer.setEpConfigName(epConfigName); Configurer orig = bus.getExtension(Configurer.class); JBossWSSpringConfigurer serverConfigurer = (orig instanceof JBossWSSpringConfigurer) ? (JBossWSSpringConfigurer)orig : new JBossWSSpringConfigurer(orig); serverConfigurer.setApplicationContext(ctx); Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-05-25 16:20:22 UTC (rev 16319) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-05-25 17:09:13 UTC (rev 16320) @@ -36,6 +36,7 @@ import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.ResourceResolver; +import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory; import org.jboss.wsf.stack.cxf.configuration.BusHolder; @@ -109,9 +110,23 @@ DDBeans metadata = dep.getAttachment(DDBeans.class); holder = new NonSpringBusHolder(metadata); } + + String epConfigName = null; + String epConfigFile = null; + JSEArchiveMetaData jsemd = dep.getAttachment(JSEArchiveMetaData.class); + JBossWebservicesMetaData wsmd = dep.getAttachment(JBossWebservicesMetaData.class); + //first check JSEArchiveMetaData as that has the actual merged value for POJO deployments + if (jsemd != null) { + epConfigName = jsemd.getConfigName(); + epConfigFile = jsemd.getConfigFile(); + } else if (wsmd != null) { + epConfigName = wsmd.getConfigName(); + epConfigFile = wsmd.getConfigFile(); + } + Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), - new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile()); - holder.configure(new SoapTransportFactoryExt(), resolver, configurer, dep.getAttachment(JBossWebservicesMetaData.class)); + new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile(), epConfigName, epConfigFile); + holder.configure(new SoapTransportFactoryExt(), resolver, configurer, wsmd); dep.addAttachment(BusHolder.class, holder); } finally

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r16319 - in stack/cxf/trunk/modules/server/src: main/java/org/jboss/wsf/stack/cxf/deployment/aspect and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-05-25 12:20:22 -0400 (Fri, 25 May 2012) New Revision: 16319 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java Log: [JBWS-3405] Keep spi Deployment out of BusHolder Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-05-25 15:02:51 UTC (rev 16318) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-05-25 16:20:22 UTC (rev 16319) @@ -40,7 +40,6 @@ import org.apache.cxf.ws.policy.PolicyEngine; import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector; import org.jboss.ws.api.binding.BindingCustomization; -import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; @@ -80,9 +79,9 @@ * @param soapTransportFactory The SoapTransportFactory to configure, if any * @param resolver The ResourceResolver to configure, if any * @param configurer The JBossWSCXFConfigurer to install in the bus, if any - * @param dep The current JBossWS-SPI Deployment + * @param wsmd The current JBossWebservicesMetaData, if any */ - public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, Deployment dep) + public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd) { bus.setProperty(org.jboss.wsf.stack.cxf.client.Constants.DEPLOYMENT_BUS, true); busHolderListener = new BusHolderLifeCycleListener(); @@ -96,7 +95,7 @@ setSoapTransportFactory(bus, soapTransportFactory); setResourceResolver(bus, resolver); - Map<String, String> props = getJBossWebservicesMetaDataProperties(dep); + Map<String, String> props = (wsmd == null) ? null : wsmd.getProperties(); if (bus.getExtension(PolicyEngine.class) != null) { @@ -216,16 +215,6 @@ return selector; } - private static Map<String, String> getJBossWebservicesMetaDataProperties(Deployment dep) { - if (dep != null) { - JBossWebservicesMetaData wsmd = dep.getAttachment(JBossWebservicesMetaData.class); - if (wsmd != null) { - return wsmd.getProperties(); - } - } - return null; - } - private static AutomaticWorkQueue createWorkQueue(String name, Map<String, String> props) { int mqs = parseInt(props.get(Constants.CXF_QUEUE_MAX_QUEUE_SIZE_PROP), 256); int initialThreads = parseInt(props.get(Constants.CXF_QUEUE_INITIAL_THREADS_PROP), 0); Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2012-05-25 15:02:51 UTC (rev 16318) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2012-05-25 16:20:22 UTC (rev 16319) @@ -40,9 +40,9 @@ import org.apache.cxf.ws.rm.RMManager; import org.jboss.ws.api.binding.BindingCustomization; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSNonSpringBusFactory; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSNonSpringConfigurer; import org.jboss.wsf.stack.cxf.deployment.EndpointImpl; @@ -82,15 +82,16 @@ * @param soapTransportFactory The SoapTransportFactory to configure, if any * @param resolver The ResourceResolver to configure, if any * @param configurer The JBossWSCXFConfigurer to install in the bus, if any + * @param wsmd The current JBossWebservicesMetaData, if any */ @Override - public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, Deployment dep) + public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd) { if (configured) { throw new IllegalStateException(BundleUtils.getMessage(bundle, "BUS_IS_ALREADY_CONFIGURED")); } - super.configure(soapTransportFactory, resolver, configurer, dep); + super.configure(soapTransportFactory, resolver, configurer, wsmd); for (DDEndpoint dde : metadata.getEndpoints()) { Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-05-25 15:02:51 UTC (rev 16318) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2012-05-25 16:20:22 UTC (rev 16319) @@ -41,9 +41,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.api.binding.BindingCustomization; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringConfigurer; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; @@ -123,15 +123,16 @@ * @param resolver The ResourceResolver to configure, if any * @param configurer The JBossWSCXFConfigurer to install in the bus, if any * @param dep The current JBossWS-SPI Deployment + * @param wsmd The current JBossWebservicesMetaData, if any */ @Override - public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, Deployment dep) + public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer, JBossWebservicesMetaData wsmd) { if (configured) { throw new IllegalStateException(BundleUtils.getMessage(bundle, "BUS_IS_ALREADY_CONFIGURED")); } - super.configure(soapTransportFactory, resolver, configurer, dep); + super.configure(soapTransportFactory, resolver, configurer, wsmd); if (additionalLocations != null) { for (URL jbossCxfXml : additionalLocations) Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-05-25 15:02:51 UTC (rev 16318) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2012-05-25 16:20:22 UTC (rev 16319) @@ -36,6 +36,7 @@ import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.ResourceResolver; +import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory; import org.jboss.wsf.stack.cxf.configuration.BusHolder; import org.jboss.wsf.stack.cxf.configuration.NonSpringBusHolder; @@ -110,7 +111,7 @@ } Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class), new WSDLFilePublisher(aDep), dep.getService().getEndpoints(), aDep.getRootFile()); - holder.configure(new SoapTransportFactoryExt(), resolver, configurer, dep); + holder.configure(new SoapTransportFactoryExt(), resolver, configurer, dep.getAttachment(JBossWebservicesMetaData.class)); dep.addAttachment(BusHolder.class, holder); } finally Modified: stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java =================================================================== --- stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2012-05-25 15:02:51 UTC (rev 16318) +++ stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2012-05-25 16:20:22 UTC (rev 16319) @@ -26,11 +26,6 @@ import org.apache.cxf.ws.policy.PolicyEngine; import org.apache.cxf.ws.policy.selector.FirstAlternativeSelector; import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector; -import org.jboss.wsf.spi.deployment.AbstractExtensible; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentState; -import org.jboss.wsf.spi.deployment.DeploymentType; -import org.jboss.wsf.spi.deployment.Service; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.wsf.stack.cxf.client.Constants; import org.jboss.wsf.stack.cxf.metadata.services.DDBeans; @@ -62,89 +57,18 @@ } private static String setupPropertyAndGetAlternativeSelector(String alternative) { - Deployment dep = new TestDeployment(); + JBossWebservicesMetaData wsmd = null; if (alternative != null) { - JBossWebservicesMetaData wsmd = new JBossWebservicesMetaData(null); + wsmd = new JBossWebservicesMetaData(null); wsmd.setProperty(Constants.CXF_POLICY_ALTERNATIVE_SELECTOR_PROP, alternative); - dep.addAttachment(JBossWebservicesMetaData.class, wsmd); } BusHolder holder = new NonSpringBusHolder(new DDBeans()); try { - holder.configure(null, null, null, dep); + holder.configure(null, null, null, wsmd); return holder.getBus().getExtension(PolicyEngine.class).getAlternativeSelector().getClass().getName(); } finally { holder.close(); } } - - private static class TestDeployment extends AbstractExtensible implements Deployment { - @Override - public String getSimpleName() - { - return null; - } - - @Override - public void setSimpleName(String name) - { - } - - @Override - public ClassLoader getInitialClassLoader() - { - return null; - } - - @Override - public void setInitialClassLoader(ClassLoader loader) - { - } - - @Override - public ClassLoader getRuntimeClassLoader() - { - return null; - } - - @Override - public void setRuntimeClassLoader(ClassLoader loader) - { - } - - @Override - public DeploymentType getType() - { - return null; - } - - @Override - public void setType(DeploymentType type) - { - } - - @Override - public DeploymentState getState() - { - return null; - } - - @Override - public void setState(DeploymentState type) - { - } - - @Override - public Service getService() - { - return null; - } - - @Override - public void setService(Service service) - { - } - - } - }

11 years, 11 months

1
0
0 / 0

JBossWS SVN: r16318 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/configuration and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-05-25 11:02:51 -0400 (Fri, 25 May 2012) New Revision: 16318 Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java Log: [JBWS-3504] Renaming constant Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java 2012-05-25 14:40:23 UTC (rev 16317) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/Constants.java 2012-05-25 15:02:51 UTC (rev 16318) @@ -39,5 +39,5 @@ public static final String CXF_QUEUE_HIGH_WATER_MARK_PROP = "highWaterMark"; public static final String CXF_QUEUE_LOW_WATER_MARK_PROP = "lowWaterMark"; public static final String CXF_QUEUE_DEQUEUE_TIMEOUT_PROP = "dequeueTimeout"; - public static final String CXF_POLICY_ALTERNATIVE_SELECTOR = "cxf.policy.alternativeSelector"; + public static final String CXF_POLICY_ALTERNATIVE_SELECTOR_PROP = "cxf.policy.alternativeSelector"; } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-05-25 14:40:23 UTC (rev 16317) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2012-05-25 15:02:51 UTC (rev 16318) @@ -203,7 +203,7 @@ //default to MaximalAlternativeSelector on server side [JBWS-3149] AlternativeSelector selector = new MaximalAlternativeSelector(); if (props != null && !props.isEmpty()) { - String className = props.get(Constants.CXF_POLICY_ALTERNATIVE_SELECTOR); + String className = props.get(Constants.CXF_POLICY_ALTERNATIVE_SELECTOR_PROP); if (className != null) { try { Class<?> clazz = Class.forName(className); Modified: stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java =================================================================== --- stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2012-05-25 14:40:23 UTC (rev 16317) +++ stack/cxf/trunk/modules/server/src/test/java/org/jboss/wsf/stack/cxf/configuration/BusHolderTest.java 2012-05-25 15:02:51 UTC (rev 16318) @@ -65,7 +65,7 @@ Deployment dep = new TestDeployment(); if (alternative != null) { JBossWebservicesMetaData wsmd = new JBossWebservicesMetaData(null); - wsmd.setProperty(Constants.CXF_POLICY_ALTERNATIVE_SELECTOR, alternative); + wsmd.setProperty(Constants.CXF_POLICY_ALTERNATIVE_SELECTOR_PROP, alternative); dep.addAttachment(JBossWebservicesMetaData.class, wsmd); } BusHolder holder = new NonSpringBusHolder(new DDBeans());

11 years, 11 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 May 2012