jbossws-commits April 2008

jbossws-commits@lists.jboss.org

2 participants
619 discussions

JBossWS SVN: r6645 - in stack/cxf/trunk: modules/client and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-24 02:24:26 -0400 (Thu, 24 Apr 2008) New Revision: 6645 Added: stack/cxf/trunk/profiles.xml.example Removed: stack/cxf/trunk/profiles-example.xml Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: switch to profiles Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-04-23 21:34:17 UTC (rev 6644) +++ stack/cxf/trunk/build.xml 2008-04-24 06:24:26 UTC (rev 6645) @@ -22,30 +22,30 @@   - <property name="cxf.dir" value="${basedir}"/> - <property name="cxf.distro.dir" value="${cxf.dir}/src/main/distro"/> - <property name="cxf.output.dir" value="${cxf.dir}/target"/> - <property name="cxf.modules.dir" value="${cxf.dir}/modules"/> - <property name="cxf.management.dir" value="${cxf.modules.dir}/management"/> - <property name="cxf.client.dir" value="${cxf.modules.dir}/client"/> - <property name="cxf.server.dir" value="${cxf.modules.dir}/server"/> + <property name="stack.dir" value="${basedir}"/> + <property name="stack.distro.dir" value="${stack.dir}/src/main/distro"/> + <property name="stack.output.dir" value="${stack.dir}/target"/> + <property name="stack.modules.dir" value="${stack.dir}/modules"/> + <property name="stack.management.dir" value="${stack.modules.dir}/management"/> + <property name="stack.client.dir" value="${stack.modules.dir}/client"/> + <property name="stack.server.dir" value="${stack.modules.dir}/server"/> - <property name="deploy.artifacts.dir" value="${cxf.output.dir}/deploy-artifacts"/> - <property name="deploy.structure.jboss42" value="${cxf.output.dir}/deploy-jboss422"/> - <property name="deploy.structure.jboss50" value="${cxf.output.dir}/deploy-jboss500"/> + <property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/> + <property name="deploy.structure.jboss42" value="${stack.output.dir}/deploy-jboss422"/> + <property name="deploy.structure.jboss50" value="${stack.output.dir}/deploy-jboss500"/> - <import file="${cxf.distro.dir}/build-setup.xml"/> - <import file="${cxf.distro.dir}/build-deploy.xml"/> - <import file="${cxf.distro.dir}/jbossws-deploy-macros.xml"/> + <import file="${stack.distro.dir}/build-setup.xml"/> + <import file="${stack.distro.dir}/build-deploy.xml"/> + <import file="${stack.distro.dir}/jbossws-deploy-macros.xml"/> - <property name="jbossws.default.deploy.conf" value="${cxf.distro.dir}/jbossws-default-deploy.conf"/> + <property name="jbossws.default.deploy.conf" value="${stack.distro.dir}/jbossws-default-deploy.conf"/>    <target name="init" depends="prepare"> - <xmlproperty file="${cxf.dir}/pom.xml"/> + <xmlproperty file="${stack.dir}/pom.xml"/> <property name="version.id" value="${project.version}"/> <echo message="version.id=${version.id}"/> </target> @@ -56,13 +56,13 @@ <target name="build-bin-dist" depends="prepare" description="Build the binary distribution"> - <echo message="*************************************"/> - <echo message="* mvn -P bindist assembly:directory *"/> - <echo message="*************************************"/> + <echo message="**********************************************"/> + <echo message="* mvn -P bindist,${jbossws.integration.target} assembly:directory *"/> + <echo message="**********************************************"/> - <delete dir="${cxf.output.dir}/jbossws-cxf-dist"/> + <delete dir="${stack.output.dir}/jbossws-cxf-dist"/> <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="-P bindist"/> + <arg value="-P bindist,${jbossws.integration.target}"/> <arg value="assembly:directory"/> </exec> </target> @@ -73,13 +73,9 @@ <target name="prepare-deploy" depends="prepare"> - <echo message="*************************************************"/> - <echo message="* mvn -Denv=${jbossws.integration.target} package assembly:directory *"/> - <echo message="*************************************************"/> - <delete dir="${deploy.artifacts.dir}"/> <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="-Denv=${jbossws.integration.target}"/> + <arg value="-P${jbossws.integration.target}"/> <arg value="package"/> <arg value="assembly:directory"/> </exec> Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2008-04-23 21:34:17 UTC (rev 6644) +++ stack/cxf/trunk/modules/client/pom.xml 2008-04-24 06:24:26 UTC (rev 6645) @@ -79,23 +79,4 @@ </dependency> </dependencies> -  - <profiles> - <profile> - <id>jboss422-client-profile</id> - <activation> - <property> - <name>env</name> - <value>jboss422</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> - </project> Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2008-04-23 21:34:17 UTC (rev 6644) +++ stack/cxf/trunk/modules/server/pom.xml 2008-04-24 06:24:26 UTC (rev 6645) @@ -164,23 +164,4 @@ </plugins> </build> -  - <profiles> - <profile> - <id>jboss422-profile</id> - <activation> - <property> - <name>env</name> - <value>jboss422</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> - </project> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2008-04-23 21:34:17 UTC (rev 6644) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2008-04-24 06:24:26 UTC (rev 6645) @@ -36,17 +36,11 @@ </plugins> </build> +  <profiles> -  <profile> - <id>jboss422-cxf-tests-profile</id> + <id>jboss422</id> <activation> - <property> - <name>env</name> - <value>jboss422</value> - </property> </activation> <build> <plugins> Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-23 21:34:17 UTC (rev 6644) +++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-24 06:24:26 UTC (rev 6645) @@ -73,18 +73,10 @@ </plugins> </build> +  <profiles> -  <profile> - <id>jboss422-cxf-tests-profile</id> - <activation> - <property> - <name>env</name> - <value>jboss422</value> - </property> - </activation> + <id>jboss422</id> <build> <plugins> <plugin> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2008-04-23 21:34:17 UTC (rev 6644) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-04-24 06:24:26 UTC (rev 6645) @@ -143,18 +143,10 @@ </plugins> </build> +  <profiles> -  <profile> - <id>jboss422-cxf-testsuite-profile</id> - <activation> - <property> - <name>env</name> - <value>jboss422</value> - </property> - </activation> + <id>jboss422</id> <properties> <jboss.version>4.2.2.GA</jboss.version> <jbossws.integration.target>jboss422</jbossws.integration.target> @@ -181,42 +173,6 @@ </plugins> </build> </profile> - -  - <profile> - <id>no-env-profile</id> - <activation> - <property> - <name>!env</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <echo message="************************************"/> - <echo message="* No test environment specified *"/> - <echo message="* Run: mvn -Denv=jboss??? test *"/> - <echo message="************************************"/> - <fail/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2008-04-23 21:34:17 UTC (rev 6644) +++ stack/cxf/trunk/pom.xml 2008-04-24 06:24:26 UTC (rev 6645) @@ -1,3 +1,91 @@ +<?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> @@ -204,6 +292,10 @@ <classifier>scripts</classifier> <type>zip</type> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + </dependency> </dependencies>  @@ -221,10 +313,9 @@ <configuration> <tasks> <echo/> + <echo message="profile=${jbossws.integration.target}"/> <echo message="jboss.home=${jboss.home}"/> <echo/> - <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/> - <fail message="Invalid integration target: ${jboss.home}" unless="jboss.available"/> </tasks> </configuration> </execution> @@ -259,17 +350,6 @@  <profiles>  - <profile> - <id>testsuite</id> - <modules> - <module>modules/testsuite</module> - </modules> - </profile> - -  @@ -293,22 +373,28 @@ </profile>  <profile> - <id>jboss422-user-profile</id> - <activation> - <property> - <name>env</name> - <value>jboss422</value> - </property> - </activation> + <id>jboss422</id> <properties> <jbossws.integration.target>jboss422</jbossws.integration.target> <jboss.home>${jboss422.home}</jboss.home> </properties> </profile> + +  + <profile> + <id>testsuite</id> + <modules> + <module>modules/testsuite</module> + </modules> + </profile> + </profiles>  Deleted: stack/cxf/trunk/profiles-example.xml =================================================================== --- stack/cxf/trunk/profiles-example.xml 2008-04-23 21:34:17 UTC (rev 6644) +++ stack/cxf/trunk/profiles-example.xml 2008-04-24 06:24:26 UTC (rev 6645) @@ -1,23 +0,0 @@ -<profilesXml 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/xsd/profiles-1.0.0.xsd"> - <profiles> - -  - <profile> - <id>jboss-home-profile</id> - <activation> - <property> - <name>user.name</name> - </property> - </activation> - <properties> - <jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home> - <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> - <jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home> - <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4</jboss500.home> - <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1</jboss501.home> - </properties> - </profile> - - </profiles> -</profilesXml> \ No newline at end of file Copied: stack/cxf/trunk/profiles.xml.example (from rev 6644, stack/cxf/trunk/profiles-example.xml) =================================================================== --- stack/cxf/trunk/profiles.xml.example (rev 0) +++ stack/cxf/trunk/profiles.xml.example 2008-04-24 06:24:26 UTC (rev 6645) @@ -0,0 +1,23 @@ +<profilesXml 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/xsd/profiles-1.0.0.xsd"> + <profiles> + +  + <profile> + <id>jboss-home-profile</id> + <activation> + <property> + <name>user.name</name> + </property> + </activation> + <properties> + <jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home> + <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> + <jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home> + <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4</jboss500.home> + <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1</jboss501.home> + </properties> + </profile> + + </profiles> +</profilesXml> \ No newline at end of file Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-23 21:34:17 UTC (rev 6644) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-24 06:24:26 UTC (rev 6645) @@ -7,8 +7,9 @@ </formats> <includeBaseDirectory>false</includeBaseDirectory> -  <dependencySets> + +  <dependencySet> <outputDirectory>bin</outputDirectory> <useStrictFiltering>true</useStrictFiltering> @@ -17,6 +18,16 @@ <include>*:jbossws-framework:zip:scripts</include> </includes> </dependencySet> + +  + <dependencySet> + <outputDirectory>lib</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <unpack>false</unpack> + <includes> + <include>*:jbossws-jboss42:jar</include> + </includes> + </dependencySet> </dependencySets>  @@ -46,7 +57,6 @@ <include>*:jbossws-common:jar</include> <include>*:jbossws-framework:jar</include> <include>*:jbossws-spi:jar</include> - <include>*:jbossws-jboss42:jar</include> <include>*:neethi:jar</include> <include>*:saaj-api:jar</include> <include>*:saaj-impl:jar</include>

18 years

1
0
0 / 0

JBossWS SVN: r6644 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-23 17:34:17 -0400 (Wed, 23 Apr 2008) New Revision: 6644 Modified: stack/cxf/trunk/profiles-example.xml Log: Fix activation Modified: stack/cxf/trunk/profiles-example.xml =================================================================== --- stack/cxf/trunk/profiles-example.xml 2008-04-23 21:02:26 UTC (rev 6643) +++ stack/cxf/trunk/profiles-example.xml 2008-04-23 21:34:17 UTC (rev 6644) @@ -6,7 +6,9 @@ <profile> <id>jboss-home-profile</id> <activation> - <activeByDefault>true</activeByDefault> + <property> + <name>user.name</name> + </property> </activation> <properties> <jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home>

18 years

1
0
0 / 0

JBossWS SVN: r6643 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-23 17:02:26 -0400 (Wed, 23 Apr 2008) New Revision: 6643 Modified: stack/cxf/trunk/pom.xml Log: <artifactId>jbossws-cxf</artifactId> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2008-04-23 20:31:35 UTC (rev 6642) +++ stack/cxf/trunk/pom.xml 2008-04-23 21:02:26 UTC (rev 6643) @@ -4,7 +4,7 @@ <name>JBoss Web Services - Stack CXF</name> <groupId>org.jboss.ws</groupId> - <artifactId>trunk</artifactId> + <artifactId>jbossws-cxf</artifactId> <packaging>pom</packaging> <version>3.0.2-SNAPSHOT</version>

18 years

1
0
0 / 0

JBossWS SVN: r6642 - framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-23 16:31:35 -0400 (Wed, 23 Apr 2008) New Revision: 6642 Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml Log: Switch build over to maven Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml 2008-04-23 20:10:36 UTC (rev 6641) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.2/config.xml 2008-04-23 20:31:35 UTC (rev 6642) @@ -13,7 +13,7 @@ STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Denv=jboss422 -Djboss422.home=$JBOSS_INSTANCE" # # stop jbossas @@ -25,7 +25,7 @@ # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss422 +ant $ENVIRONMENT clean deploy-jboss422 # # start jbossas @@ -43,7 +43,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out +mvn $ENVIRONMENT -P testsuite test 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # @@ -57,7 +57,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/tests/test-reports/*.xml</testResults> + <testResults>stack-cxf/modules/testsuite/*/target/surefire-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients>

18 years

1
0
0 / 0

JBossWS SVN: r6641 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-23 16:10:36 -0400 (Wed, 23 Apr 2008) New Revision: 6641 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java Log: Check img file Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2008-04-23 20:09:00 UTC (rev 6640) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2008-04-23 20:10:36 UTC (rev 6641) @@ -72,6 +72,8 @@ public void testImgRoundtrip() throws Exception { + assertTrue("Cannot find: " + imgFile, imgFile.exists()); + getBinding().setMTOMEnabled(true); Image img = XOPTestSupport.createTestImage(imgFile); @@ -89,6 +91,8 @@ public void testImgResponseOptimized() throws Exception { + assertTrue("Cannot find: " + imgFile, imgFile.exists()); + getBinding().setMTOMEnabled(false); Image img = XOPTestSupport.createTestImage(imgFile); @@ -132,29 +136,29 @@ assertNotNull(response); assertTrue(response.getData() instanceof Source); } - + public void testAttachmentpartSwap() throws Exception { getBinding().setMTOMEnabled(true); - DataHandler dh = new DataHandler( new GeneratorDataSource(1024*128) ); + DataHandler dh = new DataHandler(new GeneratorDataSource(1024 * 128)); DHResponse response = getPort().echoDataHandler(new DHRequest(dh)); assertNotNull(response); assertNotNull(response.getDataHandler().getContent()); - File tmpDir = new File(System.getProperty("jboss.home")+"/server/default/tmp/jbossws"); + File tmpDir = new File(System.getProperty("jboss.home") + "/server/default/tmp/jbossws"); assertTrue("Temp dir doesn't exist", tmpDir.exists()); - for(String fileName : tmpDir.list()) + for (String fileName : tmpDir.list()) { - assertTrue("Attachment part swap file does still exist: "+fileName, fileName.indexOf("JBossWSattachment") == -1); + assertTrue("Attachment part swap file does still exist: " + fileName, fileName.indexOf("JBossWSattachment") == -1); } } protected Object getContent(DataHandler dh) throws IOException { Object content = dh.getContent(); - + // Metro returns an ByteArrayInputStream if (content instanceof InputStream) {

18 years

1
0
0 / 0

JBossWS SVN: r6640 - in stack/cxf/trunk: modules and 89 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-23 16:09:00 -0400 (Wed, 23 Apr 2008) New Revision: 6640 Added: stack/cxf/trunk/modules/ stack/cxf/trunk/modules/client/ stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/client/src/ stack/cxf/trunk/modules/client/src/main/ stack/cxf/trunk/modules/client/src/main/java/ stack/cxf/trunk/modules/client/src/main/java/org/ stack/cxf/trunk/modules/client/src/main/java/org/jboss/ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderFactoryImpl.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceReferenceable.java stack/cxf/trunk/modules/client/src/main/resources/ stack/cxf/trunk/modules/client/src/main/resources/META-INF/ stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER stack/cxf/trunk/modules/client/src/main/resources/META-INF/LICENSE stack/cxf/trunk/modules/client/src/main/resources/META-INF/MANIFEST.MF stack/cxf/trunk/modules/client/src/main/resources/META-INF/NOTICE stack/cxf/trunk/modules/client/src/main/resources/META-INF/NOTICE.jdom stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.extension stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/service.validator.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml stack/cxf/trunk/modules/management/ stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/management/src/ stack/cxf/trunk/modules/management/src/main/ stack/cxf/trunk/modules/management/src/main/webapp/ stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/ stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/web.xml stack/cxf/trunk/modules/management/src/main/webapp/index.html stack/cxf/trunk/modules/management/src/main/webapp/styles.css stack/cxf/trunk/modules/server/ stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/ stack/cxf/trunk/modules/server/src/main/ stack/cxf/trunk/modules/server/src/main/java/ stack/cxf/trunk/modules/server/src/main/java/org/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java stack/cxf/trunk/modules/server/src/main/resources/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/aegis.xsd stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/jax-ws-catalog.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/javax.xml.ws.spi.Provider stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/org.apache.cxf.bus.factory stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml stack/cxf/trunk/modules/server/src/main/scripts/ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/ stack/cxf/trunk/modules/testsuite/cxf-tests/ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jndi.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/tst.policy stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_SimpleServicePort_Client.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/framework-tests/ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml stack/cxf/trunk/modules/testsuite/framework-tests/src/ stack/cxf/trunk/modules/testsuite/framework-tests/src/test/ stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/ stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/jndi.properties stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/tst.policy stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/pom.xml stack/cxf/trunk/profiles-example.xml stack/cxf/trunk/src/main/distro/JBossORG-EULA.txt stack/cxf/trunk/src/main/distro/ant.properties stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/distro/build-setup.xml stack/cxf/trunk/src/main/distro/build.xml stack/cxf/trunk/src/main/distro/jbossws-default-deploy.conf stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml stack/cxf/trunk/src/main/scripts/ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Removed: stack/cxf/trunk/ant-import-tests/ stack/cxf/trunk/ant-import/ stack/cxf/trunk/build.bat stack/cxf/trunk/build.sh stack/cxf/trunk/modules/client/ stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/client/src/ stack/cxf/trunk/modules/client/src/main/ stack/cxf/trunk/modules/client/src/main/java/ stack/cxf/trunk/modules/client/src/main/java/org/ stack/cxf/trunk/modules/client/src/main/java/org/jboss/ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderFactoryImpl.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceReferenceable.java stack/cxf/trunk/modules/client/src/main/resources/ stack/cxf/trunk/modules/client/src/main/resources/META-INF/ stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER stack/cxf/trunk/modules/client/src/main/resources/META-INF/LICENSE stack/cxf/trunk/modules/client/src/main/resources/META-INF/MANIFEST.MF stack/cxf/trunk/modules/client/src/main/resources/META-INF/NOTICE stack/cxf/trunk/modules/client/src/main/resources/META-INF/NOTICE.jdom stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.extension stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/service.validator.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml stack/cxf/trunk/modules/management/ stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/management/src/ stack/cxf/trunk/modules/management/src/main/ stack/cxf/trunk/modules/management/src/main/webapp/ stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/ stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/web.xml stack/cxf/trunk/modules/management/src/main/webapp/index.html stack/cxf/trunk/modules/management/src/main/webapp/styles.css stack/cxf/trunk/modules/server/ stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/ stack/cxf/trunk/modules/server/src/main/ stack/cxf/trunk/modules/server/src/main/java/ stack/cxf/trunk/modules/server/src/main/java/org/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java stack/cxf/trunk/modules/server/src/main/resources/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/aegis.xsd stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/jax-ws-catalog.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/javax.xml.ws.spi.Provider stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/org.apache.cxf.bus.factory stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml stack/cxf/trunk/modules/server/src/main/scripts/ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/ stack/cxf/trunk/modules/testsuite/cxf-tests/ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jndi.properties stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/tst.policy stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_SimpleServicePort_Client.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/framework-tests/ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml stack/cxf/trunk/modules/testsuite/framework-tests/src/ stack/cxf/trunk/modules/testsuite/framework-tests/src/test/ stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/ stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/jndi.properties stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/tst.policy stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/src/main/distro/ant.properties.example stack/cxf/trunk/src/main/distro/bin-dist-build.xml stack/cxf/trunk/src/main/etc/ stack/cxf/trunk/src/main/java/ stack/cxf/trunk/src/main/resources/ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/src/test/ stack/cxf/trunk/tools/ stack/cxf/trunk/version.properties Modified: stack/cxf/trunk/ stack/cxf/trunk/.classpath stack/cxf/trunk/.project stack/cxf/trunk/ant.properties.example stack/cxf/trunk/build.xml stack/cxf/trunk/src/ Log: Switch build over to maven Property changes on: stack/cxf/trunk ___________________________________________________________________ Name: svn:ignore - ant.properties apache-cxf output* thirdparty version.properties.md5 clipboard.* + ant.properties clipboard.* target .settings profiles.xml Modified: stack/cxf/trunk/.classpath =================================================================== --- stack/cxf/trunk/.classpath 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/.classpath 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,41 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/test-framework/java"/> - <classpathentry kind="src" path="src/test/java"/> + <classpathentry kind="src" path="modules/server/src/main/java"/> + <classpathentry kind="src" path="modules/client/src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> - <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-common-core-sources.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> - <classpathentry kind="lib" path="thirdparty/jbossws-framework.jar" sourcepath="thirdparty/jbossws-framework-src.zip"/> - <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/> - <classpathentry kind="lib" path="thirdparty/jdom-1.0.jar"/> - <classpathentry kind="lib" path="thirdparty/neethi-2.0.2.jar"/> - <classpathentry kind="lib" path="thirdparty/resolver.jar"/> - <classpathentry kind="lib" path="thirdparty/saaj-api-1.3.jar" sourcepath="apache-cxf"/> - <classpathentry kind="lib" path="thirdparty/saaj-impl-1.3.jar"/> - <classpathentry kind="lib" path="thirdparty/wsdl4j.jar"/> - <classpathentry kind="lib" path="thirdparty/wsdl4j-src.jar"/> - <classpathentry kind="lib" path="thirdparty/xbean-2.2.0.jar"/> - <classpathentry kind="lib" path="thirdparty/xml-resolver-1.2.jar"/> - <classpathentry kind="lib" path="thirdparty/XmlSchema-1.3.2.jar"/> - <classpathentry kind="lib" path="thirdparty/jaxws-api-2.0.jar"/> - <classpathentry kind="lib" path="tools/ant/lib/junit.jar"/> - <classpathentry kind="lib" path="thirdparty/activation.jar"/> - <classpathentry kind="lib" path="thirdparty/jbossws-common.jar" sourcepath="thirdparty/jbossws-common-src.zip"/> - <classpathentry kind="lib" path="thirdparty/geronimo-javamail_1.4_spec-1.2.jar"/> - <classpathentry kind="lib" path="thirdparty/geronimo-stax-api_1.0_spec-1.0.1.jar"/> - <classpathentry kind="lib" path="thirdparty/geronimo-ws-metadata_2.0_spec-1.1.2.jar"/> - <classpathentry kind="lib" path="thirdparty/spring-beans-2.0.8.jar"/> - <classpathentry kind="lib" path="thirdparty/spring-context-2.0.8.jar"/> - <classpathentry kind="lib" path="thirdparty/spring-core-2.0.8.jar"/> - <classpathentry kind="lib" path="thirdparty/wstx-asl-3.2.4.jar"/> - <classpathentry kind="lib" path="thirdparty/cxf-2.0.5-incubator.jar"/> - <classpathentry kind="output" path="output/eclipse"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/eclipse-classes"/> </classpath> Modified: stack/cxf/trunk/.project =================================================================== --- stack/cxf/trunk/.project 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/.project 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>stack-cxf</name> + <name>jbossws-cxf</name> <comment></comment> <projects> </projects> @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> </natures> </projectDescription> Modified: stack/cxf/trunk/ant.properties.example =================================================================== --- stack/cxf/trunk/ant.properties.example 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/ant.properties.example 2008-04-23 20:09:00 UTC (rev 6640) @@ -14,31 +14,7 @@ # The JBoss settings jboss.server.instance=default -jboss.bind.address=localhost -# JBoss JMX invoker authentication -#jmx.authentication.username=admin -#jmx.authentication.password=admin - -# JBoss Repository -#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository -jboss.repository=http://repository.jboss.org - # JBossWS Release jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content -jboss.local.repository=/home/tdiesler/svn/jboss.local.repository - -# Force thirdparty HTTP get -#force.thirdparty.get=true - -# JDK settings -#java.home.jdk16=/usr/java/jdk1.6 - -# Endpoint servlet used by test descriptors -endpoint.servlet=org.jboss.wsf.stack.cxf.CXFServletExt - -# Java Compiler options -javac.debug=yes -javac.deprecation=no -javac.fail.onerror=yes -javac.verbose=no +jboss.local.repository=/home/tdiesler/svn/jboss.local.repository \ No newline at end of file Deleted: stack/cxf/trunk/build.bat =================================================================== --- stack/cxf/trunk/build.bat 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/build.bat 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,101 +0,0 @@ -@echo off - -REM ====================================================================== -REM -REM This is the main entry point for the build system. -REM -REM Users should be sure to execute this file rather than 'ant' to ensure -REM the correct version is being used with the correct configuration. -REM -REM ====================================================================== -REM -REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $ - -REM ****************************************************** -REM Ignore the ANT_HOME variable: we want to use *our* -REM ANT version and associated JARs. -REM ****************************************************** -REM Ignore the users classpath, cause it might mess -REM things up -REM ****************************************************** - -SETLOCAL - -set NOPAUSE=true -set CLASSPATH= -set ANT_HOME= - -set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat - -REM -REM - "for" loops have been unrolled for compatibility -REM with some WIN32 systems. -REM ****************************************************** - -set NAMES=tools\ant -set SUBFOLDERS=..;..\..;..\..\..;..\..\..\.. - -REM ****************************************************** -REM ********Save the command line arguments*************** -REM ****************************************************** -set BUILD_ARGS=%1 -if ""%1""=="""" goto completedArgs -shift -:processArg -if ""%1""=="""" goto completedArgs -set BUILD_ARGS=%BUILD_ARGS% %1 -shift -goto processArg - -:completedArgs - -REM ****************************************************** -REM ****************************************************** - -SET EXECUTED=FALSE -for %%i in (%NAMES%) do call :subLoop %%i %BUILD_ARGS% - -goto :EOF - -REM ****************************************************** -REM ********* Search for names in the subfolders ********* -REM ****************************************************** - -:subLoop -for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %BUILD_ARGS% - -goto :EOF - -REM ****************************************************** -REM ************ Test if ANT Batch file exists *********** -REM ****************************************************** - -:testIfExists -if exist %1 call :BatchFound %1 %BUILD_ARGS% - -goto :EOF - -REM ****************************************************** -REM ************** Batch file has been found ************* -REM ****************************************************** - -:BatchFound -if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %BUILD_ARGS% -set EXECUTED=TRUE - -goto :EOF - -REM ****************************************************** -REM ************* Execute Batch file only once *********** -REM ****************************************************** - -:ExecuteBatch -echo Calling %1 %BUILD_ARGS% - -REM set ENDORSED= -call %1 %BUILD_ARGS% - -:end - -if "%NOPAUSE%" == "" pause - Deleted: stack/cxf/trunk/build.sh =================================================================== --- stack/cxf/trunk/build.sh 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/build.sh 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,169 +0,0 @@ -#!/bin/sh -### ====================================================================== ### -## ## -## This is the main entry point for the build system. ## -## ## -## Users should be sure to execute this file rather than 'ant' to ensure ## -## the correct version is being used with the correct configuration. ## -## ## -## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ## -## ## -### ====================================================================== ### - -# $Id: build.sh 60589 2007-02-16 16:37:13Z jfrederic.clere(a)jboss.com $ - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` -GREP="grep" -ROOT="/" - -# Ignore user's ANT_HOME if it is set -ANT_HOME="" - -# the default search path for ant -ANT_SEARCH_PATH="tools/ant" - -# the default build file name -ANT_BUILD_FILE="build.xml" - -# the default arguments -ANT_OPTIONS="--noconfig -find $ANT_BUILD_FILE" - -# Use the maximum available, or set MAX_FD != -1 to use that -MAX_FD="maximum" - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -darwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; - - Darwin*) - darwin=true - ;; -esac - -# -# Helper to complain. -# -die() { - echo "${PROGNAME}: $*" - exit 1 -} - -# -# Helper to complain. -# -warn() { - echo "${PROGNAME}: $*" -} - -# -# Helper to source a file if it exists. -# -maybe_source() { - for file in $*; do - if [ -f "$file" ]; then - . $file - fi - done -} - -search() { - search="$*" - for d in $search; do - ANT_HOME="`pwd`/$d" - ANT="$ANT_HOME/bin/ant" - if [ -x "$ANT" ]; then - # found one - echo $ANT_HOME - break - fi - done -} - -# -# Main function. -# -main() { - # if there is a build config file. then source it - maybe_source "$DIRNAME/build.conf" - - # Increase the maximum file descriptors if we can - if [ $cygwin = "false" ]; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ]; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then - # use the system max - MAX_FD="$MAX_FD_LIMIT" - fi - - ulimit -n $MAX_FD - if [ $? -ne 0 ]; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" - fi - fi - - # try the search path - ANT_HOME=`search $ANT_SEARCH_PATH` - - # try looking up to root - if [ "x$ANT_HOME" = "x" ]; then - target="build" - _cwd=`pwd` - - while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do - cd .. - cwd=`pwd` - ANT_HOME=`search $ANT_SEARCH_PATH` - done - - # make sure we get back - cd $_cwd - - if [ "$cwd" != "$ROOT" ]; then - found="true" - fi - - # complain if we did not find anything - if [ "$found" != "true" ]; then - die "Could not locate Ant; check \$ANT or \$ANT_HOME." - fi - fi - - # make sure we have one - ANT=$ANT_HOME/bin/ant - if [ ! -x "$ANT" ]; then - die "Ant file is not executable: $ANT" - fi - - # Set the max memory to 256m - ANT_OPTS=-Xmx256m - - # Endorse JAXB, JAXWS API - ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" - - # setup some build properties - ANT_OPTS="$ANT_OPTS -Dbuild.script=$0" - - # change to the directory where the script lives so users are not forced - # to be in the same directory as build.xml - cd $DIRNAME - - # export some stuff for ant - export ANT ANT_HOME ANT_OPTS - - # run ant - $ANT $ANT_OPTIONS "$@" -} - -## -## Bootstrap -## - -main "$@" Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/build.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -11,240 +11,89 @@  -<project default="main" basedir="." name="JBossWS-CXF"> +<project basedir="." name="JBossWS-CXF"> - <property name="int.cxf.dir" value="${basedir}"/> +  + <available property="ant.properties.available" file="${basedir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + <property file="${basedir}/ant.properties"/> - <import file="${basedir}/ant-import/build-setup.xml"/> - <import file="${basedir}/ant-import/build-bin-dist.xml"/> - <import file="${basedir}/ant-import/build-prepare-deploy.xml"/> - <import file="${basedir}/ant-import/build-deploy.xml"/> - <import file="${basedir}/ant-import/build-release.xml"/> - <import file="${basedir}/ant-import/build-thirdparty.xml"/> - <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/> -    + + <property name="cxf.dir" value="${basedir}"/> + <property name="cxf.distro.dir" value="${cxf.dir}/src/main/distro"/> + <property name="cxf.output.dir" value="${cxf.dir}/target"/> + <property name="cxf.modules.dir" value="${cxf.dir}/modules"/> + <property name="cxf.management.dir" value="${cxf.modules.dir}/management"/> + <property name="cxf.client.dir" value="${cxf.modules.dir}/client"/> + <property name="cxf.server.dir" value="${cxf.modules.dir}/server"/> - <property name="cxf.dir" value="${int.cxf.dir}"/> - <property name="cxf.src.dir" value="${cxf.dir}/src/main"/> - <property name="cxf.etc.dir" value="${cxf.src.dir}/etc"/> - <property name="cxf.distro.dir" value="${cxf.src.dir}/distro"/> - <property name="cxf.java.dir" value="${cxf.src.dir}/java"/> - <property name="cxf.resources.dir" value="${cxf.src.dir}/resources"/> - <property name="cxf.output.dir" value="${cxf.dir}/output"/> - <property name="cxf.output.apidocs.dir" value="${cxf.output.dir}/apidocs"/> - <property name="cxf.output.classes.dir" value="${cxf.output.dir}/classes"/> - <property name="cxf.output.deploy.dir" value="${cxf.output.dir}/deploy"/> - <property name="cxf.output.etc.dir" value="${cxf.output.dir}/etc"/> - <property name="cxf.output.lib.dir" value="${cxf.output.dir}/lib"/> - <property name="cxf.output.resources.dir" value="${cxf.output.dir}/resources"/> + <property name="deploy.artifacts.dir" value="${cxf.output.dir}/deploy-artifacts"/> + <property name="deploy.structure.jboss42" value="${cxf.output.dir}/deploy-jboss422"/> + <property name="deploy.structure.jboss50" value="${cxf.output.dir}/deploy-jboss500"/> - <property name="deploy.artifacts.dir" value="${cxf.output.deploy.dir}-artifacts"/> - <property name="deploy.structure.jboss42" value="${cxf.output.deploy.dir}-jboss42"/> - <property name="deploy.structure.jboss50" value="${cxf.output.deploy.dir}-jboss50"/> - <property name="jbossws.default.deploy.conf" value="${cxf.dir}/ant-import/jbossws-default-deploy.conf"/> - - <import file="${basedir}/ant-import-tests/build-testsuite.xml"/> + <import file="${cxf.distro.dir}/build-setup.xml"/> + <import file="${cxf.distro.dir}/build-deploy.xml"/> + <import file="${cxf.distro.dir}/jbossws-deploy-macros.xml"/> + <property name="jbossws.default.deploy.conf" value="${cxf.distro.dir}/jbossws-default-deploy.conf"/> +    - <target name="init" depends="prepare,thirdparty"> - <mkdir dir="${cxf.output.apidocs.dir}"/> + <target name="init" depends="prepare"> + <xmlproperty file="${cxf.dir}/pom.xml"/> + <property name="version.id" value="${project.version}"/> + <echo message="version.id=${version.id}"/> </target>  -  +   -  - - <target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/> - -  - <target name="compile-classes" depends="compile-classes-cxf"/> - <target name="compile-classes-cxf" depends="init"> - <mkdir dir="${cxf.output.classes.dir}"/> - <javac srcdir="${cxf.java.dir}" sourcepath="" destdir="${cxf.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/wsf/stack/cxf/**"/> - <classpath refid="cxf.integration.classpath"/> - </javac> - </target> - -  - <target name="compile-etc" depends="init"> - <mkdir dir="${cxf.output.etc.dir}"/> - <copy todir="${cxf.output.etc.dir}" filtering="yes" overwrite="true"> - <fileset dir="${cxf.etc.dir}"> - <include name="component-info.xml"/> - <include name="default.mf"/> - </fileset> - <filterset> - <filter token="java.vm.version" value="${java.vm.version}"/> - <filter token="java.vm.vendor" value="${java.vm.vendor}"/> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${int.cxf.dir}/version.properties"/> - </filterset> - </copy> - </target> - -  - <target name="compile42-resources" if="jbossws.integration.jboss42"> - <mkdir dir="${cxf.output.resources.dir}"/> - <unzip dest="${cxf.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> - <concat destfile="${cxf.output.resources.dir}/jbossws-cxf42-beans.xml"> - <header trimleading="yes"> - <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> - </header> - <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/> - <fileset file="${cxf.output.resources.dir}/jbossws-jboss42-config.xml"/> - <footer trimleading="yes"> - </deployment> - </footer> - </concat> - - </target> - <target name="compile50-resources" if="jbossws.integration.jboss50"> - <mkdir dir="${cxf.output.resources.dir}"/> - <unzip src="${thirdparty.dir}/jbossws-jboss50-deployer-resources.zip" dest="${cxf.output.resources.dir}"/> - - <concat destfile="${cxf.output.resources.dir}/jbossws-cxf50-beans.xml"> - <header trimleading="yes"> - <deployment xmlns="urn:jboss:bean-deployer:2.0"> - </header> - <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/> - <footer trimleading="yes"> - </deployment> - </footer> - </concat> - - </target> - - <target name="compile-resources" depends="init, compile42-resources, compile50-resources"> + <target name="build-bin-dist" depends="prepare" description="Build the binary distribution"> - <mkdir dir="${cxf.output.resources.dir}"/> - <copy todir="${cxf.output.resources.dir}"> - <fileset dir="${cxf.resources.dir}"> - <include name="jbossws-cxf.sar/**"/> - </fileset> - </copy> + <echo message="*************************************"/> + <echo message="* mvn -P bindist assembly:directory *"/> + <echo message="*************************************"/> + + <delete dir="${cxf.output.dir}/jbossws-cxf-dist"/> + <exec dir="${basedir}" executable="mvn" failonerror="true"> + <arg value="-P bindist"/> + <arg value="assembly:directory"/> + </exec> </target> - +  -  +   -  - <target name="jars" depends="compile" description="Builds all jar files."> + <target name="prepare-deploy" depends="prepare"> -  - <mkdir dir="${cxf.output.lib.dir}"/> - <jar jarfile="${cxf.output.lib.dir}/jbossws-cxf.jar" manifest="${cxf.output.etc.dir}/default.mf"> - <fileset dir="${cxf.output.classes.dir}"> - <include name="org/jboss/wsf/stack/cxf/**"/> - </fileset> - <metainf dir="${cxf.resources.dir}/jbossws-cxf.jar/META-INF"/> - </jar> + <echo message="*************************************************"/> + <echo message="* mvn -Denv=${jbossws.integration.target} package assembly:directory *"/> + <echo message="*************************************************"/> - <jar jarfile="${cxf.output.lib.dir}/jbossws-cxf-client.jar" manifest="${cxf.output.etc.dir}/default.mf"> - <fileset dir="${cxf.output.classes.dir}"> - <include name="org/jboss/wsf/stack/cxf/client/**"/> - </fileset> - <metainf dir="${cxf.resources.dir}/jbossws-cxf-client.jar/META-INF"/> - </jar> - -  - <copy todir="${cxf.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true"> - <fileset dir="${cxf.resources.dir}/jbossws-context.war"/> - <filterset> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${cxf.dir}/version.properties"/> - </filterset> - </copy> - <war warfile="${cxf.output.lib.dir}/jbossws-context.war" - webxml="${cxf.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml" - manifest="${cxf.output.etc.dir}/default.mf"> - <fileset dir="${cxf.output.resources.dir}/jbossws-context.war"> - <include name="index.html"/> - <include name="styles.css"/> - </fileset> - <webinf dir="${cxf.output.resources.dir}/jbossws-context.war/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - -  - <unjar src="${thirdparty.dir}/cxf-${cxf.version}.jar" dest="${cxf.output.lib.dir}/cxf-${cxf.version}"/> - <jar destfile="${cxf.output.lib.dir}/cxf-${cxf.version}.jar" manifest="${cxf.output.lib.dir}/cxf-${cxf.version}/META-INF/MANIFEST.MF"> - <fileset dir="${cxf.output.lib.dir}/cxf-${cxf.version}"> - <exclude name="META-INF/**"/> - </fileset> - </jar> - -  - <zip zipfile="${cxf.output.lib.dir}/jbossws-cxf-src.zip" > - <fileset dir="${cxf.java.dir}"/> - </zip> + <delete dir="${deploy.artifacts.dir}"/> + <exec dir="${basedir}" executable="mvn" failonerror="true"> + <arg value="-Denv=${jbossws.integration.target}"/> + <arg value="package"/> + <arg value="assembly:directory"/> + </exec> </target> -  - <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc"> - -  - <mkdir dir="${cxf.output.dir}/thirdparty-sources"/> - <unzip src="${thirdparty.dir}/cxf-distribution-sources.jar" dest="${cxf.output.dir}/thirdparty-sources"/> - - - <javadoc destdir="${cxf.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API ${version.id} "> - <classpath> - <pathelement path="${cxf.integration.classpath}"/> - </classpath> - <packageset dir="${cxf.java.dir}" defaultexcludes="yes"> - <include name="org/jboss/wsf/**"/> - </packageset> - <packageset dir="${cxf.output.dir}/thirdparty-sources" defaultexcludes="yes"> - <include name="org/codehaus/**"/> - </packageset> - <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration CXF</h1>]]></doctitle> - <tag name="todo" scope="all" description="To do:"/> -  - <group title="Stack integration" packages="org.jboss.wsf.stack*"/> - <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/> - <group title="Container integration" packages="org.jboss.wsf.container*"/> - <tag name="todo" scope="all" description="To do:"/> - </javadoc> - </target> - -  -  -  - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${cxf.output.dir}"/> + + <echo message="*************************************"/> + <echo message="* mvn clean *"/> + <echo message="*************************************"/> + + <exec dir="${basedir}" executable="mvn" failonerror="true"> + <arg value="clean"/> + </exec> </target> - <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${int.cxf.dir}/thirdparty"/> - </target> - - <target name="main" description="Executes the default target (most)." depends="most"/> - - <target name="most" description="Builds almost everything." depends="jars,tests-main"/> - - <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/> - </project> Copied: stack/cxf/trunk/modules (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules) Property changes on: stack/cxf/trunk/modules ___________________________________________________________________ Name: svn:ignore + target Copied: stack/cxf/trunk/modules/client (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client) Property changes on: stack/cxf/trunk/modules/client ___________________________________________________________________ Name: svn:ignore + target Deleted: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/pom.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,101 +0,0 @@ -<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>JBoss Web Services - Stack CXF Runtime Client</name> - <artifactId>jbossws-cxf-client</artifactId> - <packaging>jar</packaging> - - <parent> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf</artifactId> - <version>3.0.2-SNAPSHOT</version> - </parent> - -  - <dependencies> - -  - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - </dependency> - -  - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-soap</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxws</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http-jetty</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-jms</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-rm</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-policy</artifactId> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </dependency> - -  - <dependency> - <groupId>javax.xml</groupId> - <artifactId>jaxrpc-api</artifactId> - </dependency> - -  - <dependency> - <groupId>jboss.common</groupId> - <artifactId>jboss-common</artifactId> - </dependency> - </dependencies> - -  - <profiles> - <profile> - <id>jboss422-client-profile</id> - <activation> - <property> - <name>env</name> - <value>jboss422</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> - -</project> Copied: stack/cxf/trunk/modules/client/pom.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml) =================================================================== --- stack/cxf/trunk/modules/client/pom.xml (rev 0) +++ stack/cxf/trunk/modules/client/pom.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,101 @@ +<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>JBoss Web Services - Stack CXF Runtime Client</name> + <artifactId>jbossws-cxf-client</artifactId> + <packaging>jar</packaging> + + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + +  + <dependencies> + +  + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + </dependency> + +  + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-bindings-soap</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http-jetty</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-jms</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-rm</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </dependency> + +  + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + </dependency> + +  + <dependency> + <groupId>jboss.common</groupId> + <artifactId>jboss-common</artifactId> + </dependency> + </dependencies> + +  + <profiles> + <profile> + <id>jboss422-client-profile</id> + <activation> + <property> + <name>env</name> + <value>jboss422</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> + +</project> Copied: stack/cxf/trunk/modules/client/src (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src) Copied: stack/cxf/trunk/modules/client/src/main (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main) Copied: stack/cxf/trunk/modules/client/src/main/java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java) Copied: stack/cxf/trunk/modules/client/src/main/java/org (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org) Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss) Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf) Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack) Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf) Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client) Deleted: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,216 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.client; - -// $Id$ - -import org.jboss.wsf.spi.WSFException; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; - -import javax.naming.*; -import javax.naming.spi.ObjectFactory; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.net.URL; -import java.util.Hashtable; -import org.jboss.logging.Logger; - -/** - * This ServiceObjectFactory reconstructs a javax.xml.ws.Service - * for a given WSDL when the webservice client does a JNDI lookup - * - * @see ServiceReferenceable - * - * @author Thomas.Diesler(a)jboss.com - * @since 06-Dec-2007 - */ -public class ServiceObjectFactory implements ObjectFactory -{ - protected final Logger log = Logger.getLogger(ServiceObjectFactory.class); - - /** - * Creates an object using the location or reference information specified. - * <p/> - * - * @param obj The possibly null object containing location or reference - * information that can be used in creating an object. - * @param name The name of this object relative to <code>nameCtx</code>, - * or null if no name is specified. - * @param nameCtx The context relative to which the <code>name</code> - * parameter is specified, or null if <code>name</code> is - * relative to the default initial context. - * @param environment The possibly null environment that is used in - * creating the object. - * @return The object created; null if an object cannot be created. - * @throws Exception if this object factory encountered an exception - * while attempting to create an object, and no other object factories are - * to be tried. - * @see javax.naming.spi.NamingManager#getObjectInstance - * @see javax.naming.spi.NamingManager#getURLContext - */ - public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception - { - try - { - Reference ref = (Reference)obj; - - // Get the target class name - String targetClassName = (String)ref.get(ServiceReferenceable.TARGET_CLASS_NAME).getContent(); - - // Unmarshall the UnifiedServiceRef - UnifiedServiceRefMetaData serviceRef = unmarshallServiceRef(ref); - String serviceRefName = serviceRef.getServiceRefName(); - QName serviceQName = serviceRef.getServiceQName(); - - String serviceImplClass = serviceRef.getServiceImplClass(); - if (serviceImplClass == null) - serviceImplClass = (String)ref.get(ServiceReferenceable.SERVICE_IMPL_CLASS).getContent(); - - // If the target defaults to javax.xml.ws.Service, use the service as the target - if (Service.class.getName().equals(targetClassName)) - targetClassName = serviceImplClass; - - log.debug("getObjectInstance [name=" + serviceRefName + ",service=" + serviceImplClass + ",target=" + targetClassName + "]"); - - // Load the service class - ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); - Class serviceClass = ctxLoader.loadClass(serviceImplClass); - Class targetClass = (targetClassName != null ? ctxLoader.loadClass(targetClassName) : null); - - if (Service.class.isAssignableFrom(serviceClass) == false) - throw new IllegalArgumentException("WebServiceRef type '" + serviceClass + "' is not assignable to javax.xml.ws.Service"); - - // Receives either a javax.xml.ws.Service or a dynamic proxy - Object target; - - // Get the URL to the wsdl - URL wsdlURL = serviceRef.getWsdlLocation(); - - // Generic javax.xml.ws.Service - if (serviceClass == Service.class) - { - if (wsdlURL != null) - { - target = Service.create(wsdlURL, serviceQName); - } - else - { - throw new IllegalArgumentException("Cannot create generic javax.xml.ws.Service without wsdlLocation: " + serviceRefName); - } - } - // Generated javax.xml.ws.Service subclass - else - { - if (wsdlURL != null) - { - Constructor ctor = serviceClass.getConstructor(new Class[] { URL.class, QName.class }); - target = ctor.newInstance(new Object[] { wsdlURL, serviceQName }); - } - else - { - target = (Service)serviceClass.newInstance(); - } - } - - // Configure the service - configureService((Service)target, serviceRef); - - if (targetClassName != null && targetClassName.equals(serviceImplClass) == false) - { - try - { - Object port = null; - if (serviceClass != Service.class) - { - for (Method method : serviceClass.getDeclaredMethods()) - { - String methodName = method.getName(); - Class retType = method.getReturnType(); - if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType)) - { - port = method.invoke(target, new Object[0]); - target = port; - break; - } - } - } - - if (port == null) - { - Method method = serviceClass.getMethod("getPort", new Class[] { Class.class }); - port = method.invoke(target, new Object[] { targetClass }); - target = port; - } - } - catch (InvocationTargetException ex) - { - throw ex.getTargetException(); - } - } - - return target; - } - catch (Throwable ex) - { - WSFException.rethrow("Cannot create service", ex); - return null; - } - } - - - private void configureService(Service service, UnifiedServiceRefMetaData serviceRef) - { - log.warn("Service configuration not available in Apache-CXF"); - } - - private UnifiedServiceRefMetaData unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException - { - UnifiedServiceRefMetaData sref; - RefAddr refAddr = ref.get(ServiceReferenceable.SERVICE_REF_META_DATA); - ByteArrayInputStream bais = new ByteArrayInputStream((byte[])refAddr.getContent()); - try - { - ObjectInputStream ois = new ObjectInputStream(bais); - sref = (UnifiedServiceRefMetaData)ois.readObject(); - ois.close(); - } - catch (IOException e) - { - throw new NamingException("Cannot unmarshall service ref meta data, cause: " + e.toString()); - } - - /* Verify it. There is some know coinstraints - if(sref.getServiceQName() == null) - throw new IllegalArgumentException("ServiceQName may not be null. " + - "Specify a service QName in the <service-ref> declaration, or thorugh the @WebServiceClient annotation."); - */ - - return sref; - } -} - Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java) =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java (rev 0) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,216 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.client; + +// $Id$ + +import org.jboss.wsf.spi.WSFException; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +import javax.naming.*; +import javax.naming.spi.ObjectFactory; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.URL; +import java.util.Hashtable; +import org.jboss.logging.Logger; + +/** + * This ServiceObjectFactory reconstructs a javax.xml.ws.Service + * for a given WSDL when the webservice client does a JNDI lookup + * + * @see ServiceReferenceable + * + * @author Thomas.Diesler(a)jboss.com + * @since 06-Dec-2007 + */ +public class ServiceObjectFactory implements ObjectFactory +{ + protected final Logger log = Logger.getLogger(ServiceObjectFactory.class); + + /** + * Creates an object using the location or reference information specified. + * <p/> + * + * @param obj The possibly null object containing location or reference + * information that can be used in creating an object. + * @param name The name of this object relative to <code>nameCtx</code>, + * or null if no name is specified. + * @param nameCtx The context relative to which the <code>name</code> + * parameter is specified, or null if <code>name</code> is + * relative to the default initial context. + * @param environment The possibly null environment that is used in + * creating the object. + * @return The object created; null if an object cannot be created. + * @throws Exception if this object factory encountered an exception + * while attempting to create an object, and no other object factories are + * to be tried. + * @see javax.naming.spi.NamingManager#getObjectInstance + * @see javax.naming.spi.NamingManager#getURLContext + */ + public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception + { + try + { + Reference ref = (Reference)obj; + + // Get the target class name + String targetClassName = (String)ref.get(ServiceReferenceable.TARGET_CLASS_NAME).getContent(); + + // Unmarshall the UnifiedServiceRef + UnifiedServiceRefMetaData serviceRef = unmarshallServiceRef(ref); + String serviceRefName = serviceRef.getServiceRefName(); + QName serviceQName = serviceRef.getServiceQName(); + + String serviceImplClass = serviceRef.getServiceImplClass(); + if (serviceImplClass == null) + serviceImplClass = (String)ref.get(ServiceReferenceable.SERVICE_IMPL_CLASS).getContent(); + + // If the target defaults to javax.xml.ws.Service, use the service as the target + if (Service.class.getName().equals(targetClassName)) + targetClassName = serviceImplClass; + + log.debug("getObjectInstance [name=" + serviceRefName + ",service=" + serviceImplClass + ",target=" + targetClassName + "]"); + + // Load the service class + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + Class serviceClass = ctxLoader.loadClass(serviceImplClass); + Class targetClass = (targetClassName != null ? ctxLoader.loadClass(targetClassName) : null); + + if (Service.class.isAssignableFrom(serviceClass) == false) + throw new IllegalArgumentException("WebServiceRef type '" + serviceClass + "' is not assignable to javax.xml.ws.Service"); + + // Receives either a javax.xml.ws.Service or a dynamic proxy + Object target; + + // Get the URL to the wsdl + URL wsdlURL = serviceRef.getWsdlLocation(); + + // Generic javax.xml.ws.Service + if (serviceClass == Service.class) + { + if (wsdlURL != null) + { + target = Service.create(wsdlURL, serviceQName); + } + else + { + throw new IllegalArgumentException("Cannot create generic javax.xml.ws.Service without wsdlLocation: " + serviceRefName); + } + } + // Generated javax.xml.ws.Service subclass + else + { + if (wsdlURL != null) + { + Constructor ctor = serviceClass.getConstructor(new Class[] { URL.class, QName.class }); + target = ctor.newInstance(new Object[] { wsdlURL, serviceQName }); + } + else + { + target = (Service)serviceClass.newInstance(); + } + } + + // Configure the service + configureService((Service)target, serviceRef); + + if (targetClassName != null && targetClassName.equals(serviceImplClass) == false) + { + try + { + Object port = null; + if (serviceClass != Service.class) + { + for (Method method : serviceClass.getDeclaredMethods()) + { + String methodName = method.getName(); + Class retType = method.getReturnType(); + if (methodName.startsWith("get") && targetClass.isAssignableFrom(retType)) + { + port = method.invoke(target, new Object[0]); + target = port; + break; + } + } + } + + if (port == null) + { + Method method = serviceClass.getMethod("getPort", new Class[] { Class.class }); + port = method.invoke(target, new Object[] { targetClass }); + target = port; + } + } + catch (InvocationTargetException ex) + { + throw ex.getTargetException(); + } + } + + return target; + } + catch (Throwable ex) + { + WSFException.rethrow("Cannot create service", ex); + return null; + } + } + + + private void configureService(Service service, UnifiedServiceRefMetaData serviceRef) + { + log.warn("Service configuration not available in Apache-CXF"); + } + + private UnifiedServiceRefMetaData unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException + { + UnifiedServiceRefMetaData sref; + RefAddr refAddr = ref.get(ServiceReferenceable.SERVICE_REF_META_DATA); + ByteArrayInputStream bais = new ByteArrayInputStream((byte[])refAddr.getContent()); + try + { + ObjectInputStream ois = new ObjectInputStream(bais); + sref = (UnifiedServiceRefMetaData)ois.readObject(); + ois.close(); + } + catch (IOException e) + { + throw new NamingException("Cannot unmarshall service ref meta data, cause: " + e.toString()); + } + + /* Verify it. There is some know coinstraints + if(sref.getServiceQName() == null) + throw new IllegalArgumentException("ServiceQName may not be null. " + + "Specify a service QName in the <service-ref> declaration, or thorugh the @WebServiceClient annotation."); + */ + + return sref; + } +} + Deleted: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderFactoryImpl.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderFactoryImpl.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderFactoryImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.client; - -// $Id$ - -import org.jboss.wsf.spi.serviceref.ServiceRefBinder; -import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory; -import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type; - -/** - * Binds a JAXWS Service object in the client's ENC - * - * @author Thomas.Diesler(a)jboss.com - * @since 06-Dec-2007 - */ -public class ServiceRefBinderFactoryImpl implements ServiceRefBinderFactory -{ - public ServiceRefBinder newServiceRefBinder(Type type) - { - return (type == Type.JAXRPC ? new ServiceRefBinderJAXRPC() : new ServiceRefBinderJAXWS()); - } -} Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderFactoryImpl.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderFactoryImpl.java) =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderFactoryImpl.java (rev 0) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderFactoryImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.client; + +// $Id$ + +import org.jboss.wsf.spi.serviceref.ServiceRefBinder; +import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory; +import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type; + +/** + * Binds a JAXWS Service object in the client's ENC + * + * @author Thomas.Diesler(a)jboss.com + * @since 06-Dec-2007 + */ +public class ServiceRefBinderFactoryImpl implements ServiceRefBinderFactory +{ + public ServiceRefBinder newServiceRefBinder(Type type) + { + return (type == Type.JAXRPC ? new ServiceRefBinderJAXRPC() : new ServiceRefBinderJAXWS()); + } +} Deleted: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,44 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.client; - -// $Id$ - -import java.lang.reflect.AnnotatedElement; - -import javax.naming.Context; -import javax.naming.NamingException; - -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.wsf.spi.serviceref.ServiceRefBinder; - -/** - * @author Thomas.Diesler(a)jboss.com - * @since 06-Dec-2007 - */ -public class ServiceRefBinderJAXRPC implements ServiceRefBinder -{ - public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException - { - throw new IllegalArgumentException("Deployed stack does not support JAX-RPC service-ref deployments"); - } -} Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java) =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java (rev 0) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.client; + +// $Id$ + +import java.lang.reflect.AnnotatedElement; + +import javax.naming.Context; +import javax.naming.NamingException; + +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.serviceref.ServiceRefBinder; + +/** + * @author Thomas.Diesler(a)jboss.com + * @since 06-Dec-2007 + */ +public class ServiceRefBinderJAXRPC implements ServiceRefBinder +{ + public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException + { + throw new IllegalArgumentException("Deployed stack does not support JAX-RPC service-ref deployments"); + } +} Deleted: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,223 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.client; - -// $Id$ - -import java.lang.annotation.Annotation; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import javax.jws.HandlerChain; -import javax.naming.Context; -import javax.naming.NamingException; -import javax.naming.Referenceable; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceClient; -import javax.xml.ws.WebServiceRef; -import javax.xml.ws.WebServiceRefs; - -import org.jboss.logging.Logger; -import org.jboss.util.naming.Util; -import org.jboss.wsf.spi.WSFException; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.wsf.spi.serviceref.ServiceRefBinder; - -/** - * @author Thomas.Diesler(a)jboss.com - * @since 06-Dec-2007 - */ -public class ServiceRefBinderJAXWS implements ServiceRefBinder -{ - // logging support - private static Logger log = Logger.getLogger(ServiceRefBinderJAXWS.class); - - public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) - throws NamingException - { - WebServiceRef wsref = null; - - if (null == loader) - throw new IllegalArgumentException("There needs to be a classloader available"); - - // Build the list of @WebServiceRef relevant annotations - List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); - - if (anElement != null) - { - for (Annotation an : anElement.getAnnotations()) - { - if (an instanceof WebServiceRef) - wsrefList.add((WebServiceRef)an); - - if (an instanceof WebServiceRefs) - { - WebServiceRefs wsrefs = (WebServiceRefs)an; - for (WebServiceRef aux : wsrefs.value()) - wsrefList.add(aux); - } - } - } - - // Use the single @WebServiceRef - if (wsrefList.size() == 1) - { - wsref = wsrefList.get(0); - } - else - { - for (WebServiceRef aux : wsrefList) - { - if (encName.endsWith("/" + aux.name())) - { - wsref = aux; - break; - } - } - } - - Class targetClass = null; - if (anElement instanceof Field) - { - targetClass = ((Field)anElement).getType(); - } - else if (anElement instanceof Method) - { - targetClass = ((Method)anElement).getParameterTypes()[0]; - } - else - { - if (wsref != null && (wsref.type() != Object.class)) - targetClass = wsref.type(); - } - - String targetClassName = (targetClass != null ? targetClass.getName() : null); - String externalName = encCtx.getNameInNamespace() + "/" + encName; - log.debug("setupServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); - - String serviceImplClass = null; - - // #1 Use the explicit @WebServiceRef.value - if (wsref != null && wsref.value() != Object.class) - serviceImplClass = wsref.value().getName(); - - // #2 Use the target ref type - if (serviceImplClass == null && targetClass != null && Service.class.isAssignableFrom(targetClass)) - serviceImplClass = targetClass.getName(); - - // #3 Use <service-interface> - if (serviceImplClass == null && serviceRef.getServiceInterface() != null) - serviceImplClass = serviceRef.getServiceInterface(); - - // #4 Use javax.xml.ws.Service - if (serviceImplClass == null) - serviceImplClass = Service.class.getName(); - - // #1 Use the explicit @WebServiceRef.type - if (wsref != null && wsref.type() != Object.class) - targetClassName = wsref.type().getName(); - - // #2 Use the target ref type - if (targetClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass) == false) - targetClassName = targetClass.getName(); - - // Set the wsdlLocation if there is no override already - if (serviceRef.getWsdlOverride() == null && wsref != null && wsref.wsdlLocation().length() > 0) - serviceRef.setWsdlOverride(wsref.wsdlLocation()); - - // Set the handlerChain from @HandlerChain on the annotated element - String handlerChain = serviceRef.getHandlerChain(); - if (anElement != null) - { - HandlerChain anHandlerChain = anElement.getAnnotation(HandlerChain.class); - if (handlerChain == null && anHandlerChain != null && anHandlerChain.file().length() > 0) - handlerChain = anHandlerChain.file(); - } - - // Resolve path to handler chain - if (handlerChain != null) - { - try - { - new URL(handlerChain); - } - catch (MalformedURLException ex) - { - Class declaringClass = null; - if (anElement instanceof Field) - declaringClass = ((Field)anElement).getDeclaringClass(); - else if (anElement instanceof Method) - declaringClass = ((Method)anElement).getDeclaringClass(); - else if (anElement instanceof Class) - declaringClass = (Class)anElement; - - handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain; - } - - serviceRef.setHandlerChain(handlerChain); - } - - // Extract service QName for target service - if (null == serviceRef.getServiceQName()) - { - try - { - Class serviceClass = loader.loadClass(serviceImplClass); - if (serviceClass.getAnnotation(WebServiceClient.class) != null) - { - WebServiceClient clientDecl = (WebServiceClient)serviceClass.getAnnotation(WebServiceClient.class); - serviceRef.setServiceQName(new QName(clientDecl.targetNamespace(), clientDecl.name())); - } - } - catch (ClassNotFoundException e) - { - WSFException.rethrow("Cannot extract service QName for target service", e); - } - } - - // Do not use rebind, the binding should be unique - // [JBWS-1499] - Revisit WebServiceRefHandler JNDI rebind - Referenceable serviceReferenceable = buildServiceReferenceable(serviceImplClass, targetClassName, serviceRef); - Util.bind(encCtx, encName, serviceReferenceable); - - } - - /** - * Create a Apache-CXF specific service referenceable. - * Most of the setup is done in {@link org.jboss.wsf.framework.serviceref.ServiceRefBinderJAXWS} - * - * @param serviceImplClass - * @param targetClassName - * @param serviceRef - * @return a Apache-CXF specific service referenceable. - */ - protected Referenceable buildServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef) - { - return new ServiceReferenceable(serviceImplClass, targetClassName, serviceRef); - } -} Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java) =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java (rev 0) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,223 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.client; + +// $Id$ + +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.jws.HandlerChain; +import javax.naming.Context; +import javax.naming.NamingException; +import javax.naming.Referenceable; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceClient; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; + +import org.jboss.logging.Logger; +import org.jboss.util.naming.Util; +import org.jboss.wsf.spi.WSFException; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.serviceref.ServiceRefBinder; + +/** + * @author Thomas.Diesler(a)jboss.com + * @since 06-Dec-2007 + */ +public class ServiceRefBinderJAXWS implements ServiceRefBinder +{ + // logging support + private static Logger log = Logger.getLogger(ServiceRefBinderJAXWS.class); + + public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) + throws NamingException + { + WebServiceRef wsref = null; + + if (null == loader) + throw new IllegalArgumentException("There needs to be a classloader available"); + + // Build the list of @WebServiceRef relevant annotations + List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); + + if (anElement != null) + { + for (Annotation an : anElement.getAnnotations()) + { + if (an instanceof WebServiceRef) + wsrefList.add((WebServiceRef)an); + + if (an instanceof WebServiceRefs) + { + WebServiceRefs wsrefs = (WebServiceRefs)an; + for (WebServiceRef aux : wsrefs.value()) + wsrefList.add(aux); + } + } + } + + // Use the single @WebServiceRef + if (wsrefList.size() == 1) + { + wsref = wsrefList.get(0); + } + else + { + for (WebServiceRef aux : wsrefList) + { + if (encName.endsWith("/" + aux.name())) + { + wsref = aux; + break; + } + } + } + + Class targetClass = null; + if (anElement instanceof Field) + { + targetClass = ((Field)anElement).getType(); + } + else if (anElement instanceof Method) + { + targetClass = ((Method)anElement).getParameterTypes()[0]; + } + else + { + if (wsref != null && (wsref.type() != Object.class)) + targetClass = wsref.type(); + } + + String targetClassName = (targetClass != null ? targetClass.getName() : null); + String externalName = encCtx.getNameInNamespace() + "/" + encName; + log.debug("setupServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); + + String serviceImplClass = null; + + // #1 Use the explicit @WebServiceRef.value + if (wsref != null && wsref.value() != Object.class) + serviceImplClass = wsref.value().getName(); + + // #2 Use the target ref type + if (serviceImplClass == null && targetClass != null && Service.class.isAssignableFrom(targetClass)) + serviceImplClass = targetClass.getName(); + + // #3 Use <service-interface> + if (serviceImplClass == null && serviceRef.getServiceInterface() != null) + serviceImplClass = serviceRef.getServiceInterface(); + + // #4 Use javax.xml.ws.Service + if (serviceImplClass == null) + serviceImplClass = Service.class.getName(); + + // #1 Use the explicit @WebServiceRef.type + if (wsref != null && wsref.type() != Object.class) + targetClassName = wsref.type().getName(); + + // #2 Use the target ref type + if (targetClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass) == false) + targetClassName = targetClass.getName(); + + // Set the wsdlLocation if there is no override already + if (serviceRef.getWsdlOverride() == null && wsref != null && wsref.wsdlLocation().length() > 0) + serviceRef.setWsdlOverride(wsref.wsdlLocation()); + + // Set the handlerChain from @HandlerChain on the annotated element + String handlerChain = serviceRef.getHandlerChain(); + if (anElement != null) + { + HandlerChain anHandlerChain = anElement.getAnnotation(HandlerChain.class); + if (handlerChain == null && anHandlerChain != null && anHandlerChain.file().length() > 0) + handlerChain = anHandlerChain.file(); + } + + // Resolve path to handler chain + if (handlerChain != null) + { + try + { + new URL(handlerChain); + } + catch (MalformedURLException ex) + { + Class declaringClass = null; + if (anElement instanceof Field) + declaringClass = ((Field)anElement).getDeclaringClass(); + else if (anElement instanceof Method) + declaringClass = ((Method)anElement).getDeclaringClass(); + else if (anElement instanceof Class) + declaringClass = (Class)anElement; + + handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain; + } + + serviceRef.setHandlerChain(handlerChain); + } + + // Extract service QName for target service + if (null == serviceRef.getServiceQName()) + { + try + { + Class serviceClass = loader.loadClass(serviceImplClass); + if (serviceClass.getAnnotation(WebServiceClient.class) != null) + { + WebServiceClient clientDecl = (WebServiceClient)serviceClass.getAnnotation(WebServiceClient.class); + serviceRef.setServiceQName(new QName(clientDecl.targetNamespace(), clientDecl.name())); + } + } + catch (ClassNotFoundException e) + { + WSFException.rethrow("Cannot extract service QName for target service", e); + } + } + + // Do not use rebind, the binding should be unique + // [JBWS-1499] - Revisit WebServiceRefHandler JNDI rebind + Referenceable serviceReferenceable = buildServiceReferenceable(serviceImplClass, targetClassName, serviceRef); + Util.bind(encCtx, encName, serviceReferenceable); + + } + + /** + * Create a Apache-CXF specific service referenceable. + * Most of the setup is done in {@link org.jboss.wsf.framework.serviceref.ServiceRefBinderJAXWS} + * + * @param serviceImplClass + * @param targetClassName + * @param serviceRef + * @return a Apache-CXF specific service referenceable. + */ + protected Referenceable buildServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef) + { + return new ServiceReferenceable(serviceImplClass, targetClassName, serviceRef); + } +} Deleted: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceReferenceable.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceReferenceable.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceReferenceable.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,91 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.client; - -// $Id$ - -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; - -import javax.naming.*; -import java.io.ByteArrayOutputStream; -import java.io.ObjectOutputStream; -import java.io.IOException; - -/** - * A JNDI reference to a javax.xml.ws.Service - * - * It holds the information to reconstrut the javax.xml.ws.Service - * when the client does a JNDI lookup. - * - * @author Thomas.Diesler(a)jboss.com - * @since 06-Dec-2007 - */ -public class ServiceReferenceable implements Referenceable -{ - public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; - public static final String SERVICE_IMPL_CLASS = "SERVICE_CLASS_NAME"; - public static final String TARGET_CLASS_NAME = "TARGET_CLASS_NAME"; - - private String serviceImplClass; - private String targetClassName; - private UnifiedServiceRefMetaData serviceRef; - - public ServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef) - { - this.serviceImplClass = serviceImplClass; - this.targetClassName = targetClassName; - this.serviceRef = serviceRef; - } - - /** - * Retrieves the Reference of this object. - * - * @return The non-null Reference of this object. - * @throws javax.naming.NamingException If a naming exception was encountered while retrieving the reference. - */ - public Reference getReference() throws NamingException - { - Reference myRef = new Reference(ServiceReferenceable.class.getName(), ServiceObjectFactory.class.getName(), null); - - myRef.add(new StringRefAddr(SERVICE_IMPL_CLASS, serviceImplClass)); - myRef.add(new StringRefAddr(TARGET_CLASS_NAME, targetClassName)); - myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshall(serviceRef))); - - return myRef; - } - - private byte[] marshall(Object obj) throws NamingException - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(512); - try - { - ObjectOutputStream oos = new ObjectOutputStream(baos); - oos.writeObject(obj); - oos.close(); - } - catch (IOException e) - { - throw new NamingException("Cannot marshall object, cause: " + e.toString()); - } - return baos.toByteArray(); - } -} Copied: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceReferenceable.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceReferenceable.java) =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceReferenceable.java (rev 0) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceReferenceable.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,91 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.client; + +// $Id$ + +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +import javax.naming.*; +import java.io.ByteArrayOutputStream; +import java.io.ObjectOutputStream; +import java.io.IOException; + +/** + * A JNDI reference to a javax.xml.ws.Service + * + * It holds the information to reconstrut the javax.xml.ws.Service + * when the client does a JNDI lookup. + * + * @author Thomas.Diesler(a)jboss.com + * @since 06-Dec-2007 + */ +public class ServiceReferenceable implements Referenceable +{ + public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; + public static final String SERVICE_IMPL_CLASS = "SERVICE_CLASS_NAME"; + public static final String TARGET_CLASS_NAME = "TARGET_CLASS_NAME"; + + private String serviceImplClass; + private String targetClassName; + private UnifiedServiceRefMetaData serviceRef; + + public ServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef) + { + this.serviceImplClass = serviceImplClass; + this.targetClassName = targetClassName; + this.serviceRef = serviceRef; + } + + /** + * Retrieves the Reference of this object. + * + * @return The non-null Reference of this object. + * @throws javax.naming.NamingException If a naming exception was encountered while retrieving the reference. + */ + public Reference getReference() throws NamingException + { + Reference myRef = new Reference(ServiceReferenceable.class.getName(), ServiceObjectFactory.class.getName(), null); + + myRef.add(new StringRefAddr(SERVICE_IMPL_CLASS, serviceImplClass)); + myRef.add(new StringRefAddr(TARGET_CLASS_NAME, targetClassName)); + myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshall(serviceRef))); + + return myRef; + } + + private byte[] marshall(Object obj) throws NamingException + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(512); + try + { + ObjectOutputStream oos = new ObjectOutputStream(baos); + oos.writeObject(obj); + oos.close(); + } + catch (IOException e) + { + throw new NamingException("Cannot marshall object, cause: " + e.toString()); + } + return baos.toByteArray(); + } +} Copied: stack/cxf/trunk/modules/client/src/main/resources (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources) Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF) Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,10 +0,0 @@ -Apache CXF is an effort undergoing incubation at the Apache Software -Foundation (ASF), sponsored by the Apache Incubator PMC. - -Incubation is required of all newly accepted projects until a further review -indicates that the infrastructure, communications, and decision making process -have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness -or stability of the code, it does indicate that the project has yet to be -fully endorsed by the ASF. Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/DISCLAIMER 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,10 @@ +Apache CXF is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness +or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/LICENSE =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/LICENSE 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/LICENSE 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/LICENSE (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/LICENSE) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/LICENSE (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/LICENSE 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/MANIFEST.MF =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/MANIFEST.MF 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/MANIFEST.MF 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,13 +0,0 @@ -Manifest-Version: 1.0 -Archiver-Version: Plexus Archiver -Created-By: Apache Maven -Built-By: tdiesler -Build-Jdk: 1.5.0_12 -Implementation-Title: Apache CXF Runtime JAX-WS Frontend -Implementation-Vendor: The Apache Software Foundation -Implementation-Vendor-Id: org.apache -Implementation-Version: 2.0.3-incubator -Specification-Title: Apache CXF Runtime JAX-WS Frontend -Specification-Vendor: The Apache Software Foundation -Specification-Version: 2.0.3-incubator - Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/MANIFEST.MF (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/MANIFEST.MF) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/MANIFEST.MF (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/MANIFEST.MF 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Archiver-Version: Plexus Archiver +Created-By: Apache Maven +Built-By: tdiesler +Build-Jdk: 1.5.0_12 +Implementation-Title: Apache CXF Runtime JAX-WS Frontend +Implementation-Vendor: The Apache Software Foundation +Implementation-Vendor-Id: org.apache +Implementation-Version: 2.0.3-incubator +Specification-Title: Apache CXF Runtime JAX-WS Frontend +Specification-Vendor: The Apache Software Foundation +Specification-Version: 2.0.3-incubator + Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/NOTICE =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/NOTICE 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/NOTICE 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,677 +0,0 @@ -// ------------------------------------------------------------------ -// NOTICE file corresponding to the section 4d of The Apache License, -// Version 2.0, in this case for Apache CXF -// ------------------------------------------------------------------ - -Apache CXF -Copyright 2006-2007 Apache Software Foundation - -This product includes software developed at -Apache Software Foundation (http://www.apache.org/). - -This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) -- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Java API for XML-Based Web Services (JAX-WS API) (javax.xml.ws:jaxws-api:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) - -This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) -- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) - -This product includes/uses software(s) developed by 'an unknown organization' -- AOP alliance (aopalliance:aopalliance:jar:1.0) (http://aopalliance.sourceforge.net) -License: Public Domain -- StAX Utilities (net.java.dev.stax-utils:stax-utils:jar:20060502:compile) (http://stax-utils.dev.java.net/stax-utils) -License: BSD (https://stax-utils.dev.java.net/source/browse/*checkout*/stax-utils/LICENSE) -- StAX API (stax:stax-api:jar:1.0.1) (http://stax.codehaus.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- WSDL4J (wsdl4j:wsdl4j:jar:1.6.1) (http://sf.net/projects/wsdl4j) -License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Envoi Solutions LLC' (http://www.envoisolutions.com/) -- Java Rest Annotations (org.codehaus.jra:jra:jar:1.0-alpha-4) (http://jra.codehaus.org) -License: The Apache Software License, Version 2.0 (http://jra.codehaus.org/License) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org) -- XML APIs (xml-apis:xml-apis:jar:1.3.02:compile) (http://xml.apache.org/commons/#external/xml-apis) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) -- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Java API for XML-Based Web Services (JAX-WS API) (javax.xml.ws:jaxws-api:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) - -This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) -- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Sun JAXB Reference Implementation Tools (com.sun.xml.bind:jaxb-xjc:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Sun SAAJ Reference Implementation (com.sun.xml.messaging.saaj:saaj-impl:jar:1.3:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Sun SAAJ API (javax.xml.soap:saaj-api:jar:1.3:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) - -This product includes/uses software(s) developed by 'Codehaus' (http://www.codehaus.org) -- jaxen (jaxen:jaxen:jar:1.1) (http://jaxen.codehaus.org/) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org) -- Apache WSS4J (wss4j:wss4j:jar:1.5.1:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache Xalan-Java (xalan:xalan:jar:2.7.0:runtime) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- XML Security (xml-security:xmlsec:jar:1.3.0:runtime) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org) -- Activation 1.1 (org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-activation_1.1_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1) (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Validator (org.apache.cxf:cxf-tools-validator:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools WSDLTo Core (org.apache.cxf:cxf-tools-wsdlto-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools WSDLTo JAXWS Frontend (org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Validator (org.apache.cxf:cxf-tools-validator:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools WSDLTo Core (org.apache.cxf:cxf-tools-wsdlto-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'an unknown organization' -- AOP alliance (aopalliance:aopalliance:jar:1.0) (http://aopalliance.sourceforge.net) -License: Public Domain -- StAX Utilities (net.java.dev.stax-utils:stax-utils:jar:20060502:compile) (http://stax-utils.dev.java.net/stax-utils) -License: BSD (https://stax-utils.dev.java.net/source/browse/*checkout*/stax-utils/LICENSE) -- Rhino (rhino:js:jar:1.6R5) (http://www.mozilla.org/rhino/) -License: Mozilla Public License version 1.1 (http://www.mozilla.org/MPL/MPL-1.1.html) -- StAX API (stax:stax-api:jar:1.0.1) (http://stax.codehaus.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- WSDL4J (wsdl4j:wsdl4j:jar:1.6.1) (http://sf.net/projects/wsdl4j) -License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) - -This product also includes schemas and specification developed by: -- the W3C consortium (http://www.w3c.org) -(http://www.w3.org/XML/1998/namespace) - -This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) -- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Sun JAXB Reference Implementation Tools (com.sun.xml.bind:jaxb-xjc:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Sun SAAJ API (javax.xml.soap:saaj-api:jar:1.3:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Java API for XML-Based Web Services (JAX-WS API) (javax.xml.ws:jaxws-api:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) - -This product includes/uses software(s) developed by 'jdom.org' (http://www.jdom.org) -- JDOM (jdom:jdom:jar:1.0:compile) -License: Modified Apache Software License (licenses/jdom.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime HTTP Transport (org.apache.cxf:cxf-rt-transports-http:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org) -- Activation 1.1 (org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-activation_1.1_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- JavaMail 1.4 (org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-javamail_1.4_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1) (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org) -- Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- JavaMail 1.4 (org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-javamail_1.4_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- JMS 1.1 (org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-jms_1.1_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1) (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Spring Framework' (http://www.springframework.org/) -- Spring Framework: Beans (org.springframework:spring-beans:jar:2.0.6) (http://www.springframework.org) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Spring Framework: Context (org.springframework:spring-context:jar:2.0.6) (http://www.springframework.org) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Spring Framework: Core (org.springframework:spring-core:jar:2.0.6) (http://www.springframework.org) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'ObjectWeb' (http://www.objectweb.org/) -- ASM Core (asm:asm:jar:2.2.3) (http://asm.objectweb.org/asm) - -This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org) -- Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1) (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Management (org.apache.cxf:cxf-rt-management:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Mort Bay Consulting' (http://www.mortbay.com) -- Jetty Server (org.mortbay.jetty:jetty:jar:6.1.5) (http://jetty.mortbay.org) -License: Apache License Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) -- Jetty Utilities (org.mortbay.jetty:jetty-util:jar:6.1.5) (http://jetty.mortbay.org) -License: Apache License Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Validator (org.apache.cxf:cxf-tools-validator:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://jakarta.apache.org) -- Lang (commons-lang:commons-lang:jar:2.1) (http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/) -License: The Apache Software License, Version 2.0 (/LICENSE.txt) -- Logging (commons-logging:commons-logging:jar:1.1) (http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/) -License: The Apache Software License, Version 2.0 (/LICENSE.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Colocated Binding (org.apache.cxf:cxf-rt-bindings-coloc:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime HTTP Binding (org.apache.cxf:cxf-rt-bindings-http:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Object Binding (org.apache.cxf:cxf-rt-bindings-object:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime SOAP Binding (org.apache.cxf:cxf-rt-bindings-soap:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime XML Binding (org.apache.cxf:cxf-rt-bindings-xml:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Aegis Databinding (org.apache.cxf:cxf-rt-databinding-aegis:jar:2.0.3-incubator) (http://cwiki.apache.org/confluence/display/CXF/Index) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime JAX-WS Frontend (org.apache.cxf:cxf-rt-frontend-jaxws:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime JavaScript Frontend (org.apache.cxf:cxf-rt-frontend-js:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Simple Frontend (org.apache.cxf:cxf-rt-frontend-simple:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Management (org.apache.cxf:cxf-rt-management:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime HTTP Transport (org.apache.cxf:cxf-rt-transports-http:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime HTTP Jetty Transport (org.apache.cxf:cxf-rt-transports-http-jetty:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime JMS Transport (org.apache.cxf:cxf-rt-transports-jms:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Local Transport (org.apache.cxf:cxf-rt-transports-local:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime WS Addressing (org.apache.cxf:cxf-rt-ws-addr:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime WS Policy (org.apache.cxf:cxf-rt-ws-policy:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime WS Reliable Messaging (org.apache.cxf:cxf-rt-ws-rm:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime WS Security (org.apache.cxf:cxf-rt-ws-security:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools JavaTo Core (org.apache.cxf:cxf-tools-java2wsdl:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools WSDLTo Misctools (org.apache.cxf:cxf-tools-misctools:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Validator (org.apache.cxf:cxf-tools-validator:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools WSDLTo Core (org.apache.cxf:cxf-tools-wsdlto-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools WSDLTo JAXB Databinding (org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools WSDLTo JAXWS Frontend (org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF XJC Default Value Plugin (org.apache.cxf:cxf-xjc-dv:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF XJC toString Plugin (org.apache.cxf:cxf-xjc-ts:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime SOAP Binding (org.apache.cxf:cxf-rt-bindings-soap:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Simple Frontend (org.apache.cxf:cxf-rt-frontend-simple:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) -- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) - -This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) -- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Sun JAXB Reference Implementation Tools (com.sun.xml.bind:jaxb-xjc:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Sun SAAJ API (javax.xml.soap:saaj-api:jar:1.3:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) - -Apache CXF -Copyright 2006-2007 The Apache Software Foundation - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime SOAP Binding (org.apache.cxf:cxf-rt-bindings-soap:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime SOAP Binding (org.apache.cxf:cxf-rt-bindings-soap:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Local Transport (org.apache.cxf:cxf-rt-transports-local:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Codehaus' (http://www.codehaus.org/) -- Woodstox (org.codehaus.woodstox:wstx-asl:jar:3.2.1) (http://woodstox.codehaus.org) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) -- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Sun JAXB Reference Implementation Tools (com.sun.xml.bind:jaxb-xjc:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) - -This product includes/uses software(s) developed by 'an unknown organization' -- AOP alliance (aopalliance:aopalliance:jar:1.0) (http://aopalliance.sourceforge.net) -License: Public Domain -- Rhino (rhino:js:jar:1.6R5) (http://www.mozilla.org/rhino/) -License: Mozilla Public License version 1.1 (http://www.mozilla.org/MPL/MPL-1.1.html) -- StAX API (stax:stax-api:jar:1.0.1) (http://stax.codehaus.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- WSDL4J (wsdl4j:wsdl4j:jar:1.6.1) (http://sf.net/projects/wsdl4j) -License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) - -This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org) -- Activation 1.1 (org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-activation_1.1_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- JavaMail 1.4 (org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-javamail_1.4_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Servlet 2.5 (org.apache.geronimo.specs:geronimo-servlet_2.5_spec:jar:1.1-M1) (http://geronimo.apache.org/specs/geronimo-servlet_2.5_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1) (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'The Legion of the Bouncy Castle' (http://www.bouncycastle.org) -- Bouncy Castle Crypto APIs for Java (bouncycastle:bcprov-jdk14:jar:136:runtime) (http://www.bouncycastle.org/java.html/bcprov-jdk14) -License: Bouncy Castle License (http://www.bouncycastle.org/licence.html) - -This product includes/uses software(s) developed by 'Spring Framework' (http://www.springframework.org/) -- Spring Framework: Beans (org.springframework:spring-beans:jar:2.0.6) (http://www.springframework.org) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Spring Framework: Context (org.springframework:spring-context:jar:2.0.6) (http://www.springframework.org) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Spring Framework: Core (org.springframework:spring-core:jar:2.0.6) (http://www.springframework.org) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Spring Framework: Web (org.springframework:spring-web:jar:2.0.6) (http://www.springframework.org) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org/) -- XmlSchema (org.apache.ws.commons.schema:XmlSchema:jar:1.3.2) (http://ws.apache.org/commons/XmlSchema) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- XML Commons Resolver Component (xml-resolver:xml-resolver:jar:1.2) (http://xml.apache.org/commons/components/resolver/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org) -- Apache Ant (ant:ant:jar:1.6.5:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org/) -- XmlSchema (org.apache.ws.commons.schema:XmlSchema:jar:1.3.2) (http://ws.apache.org/commons/XmlSchema) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- XML Commons Resolver Component (xml-resolver:xml-resolver:jar:1.2) (http://xml.apache.org/commons/components/resolver/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- XMLBeans main classes (xmlbeans:xbean:jar:2.2.0) (http://xmlbeans.apache.org) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Local Transport (org.apache.cxf:cxf-rt-transports-local:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime SOAP Binding (org.apache.cxf:cxf-rt-bindings-soap:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime XML Binding (org.apache.cxf:cxf-rt-bindings-xml:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime JAX-WS Frontend (org.apache.cxf:cxf-rt-frontend-jaxws:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Simple Frontend (org.apache.cxf:cxf-rt-frontend-simple:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime HTTP Transport (org.apache.cxf:cxf-rt-transports-http:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'an unknown organization' -- AOP alliance (aopalliance:aopalliance:jar:1.0) (http://aopalliance.sourceforge.net) -License: Public Domain -- StAX API (stax:stax-api:jar:1.0.1) (http://stax.codehaus.org/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- WSDL4J (wsdl4j:wsdl4j:jar:1.6.1) (http://sf.net/projects/wsdl4j) -License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) - -This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) -- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Sun SAAJ Reference Implementation (com.sun.xml.messaging.saaj:saaj-impl:jar:1.3:runtime) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Sun SAAJ API (javax.xml.soap:saaj-api:jar:1.3:runtime) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org) -- Apache WSS4J (wss4j:wss4j:jar:1.5.1:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache Xalan-Java (xalan:xalan:jar:2.7.0:runtime) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- XML APIs (xml-apis:xml-apis:jar:1.3.02:compile) (http://xml.apache.org/commons/#external/xml-apis) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- XML Security (xml-security:xmlsec:jar:1.3.0:runtime) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org) -- Activation 1.1 (org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-activation_1.1_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- JavaMail 1.4 (org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-javamail_1.4_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- JMS 1.1 (org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-jms_1.1_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Servlet 2.5 (org.apache.geronimo.specs:geronimo-servlet_2.5_spec:jar:1.1-M1) (http://geronimo.apache.org/specs/geronimo-servlet_2.5_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1) (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'QOS.ch' (http://www.qos.ch) -- SLF4J API Module (org.slf4j:slf4j-api:jar:1.3.1) (http://www.slf4j.org) -- SLF4J JDK14 Binding (org.slf4j:slf4j-jdk14:jar:1.3.1) (http://www.slf4j.org) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org) -- Log4j (log4j:log4j:jar:1.2.14) (http://logging.apache.org/log4j/docs/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1) (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -The product contains code (StaxBuilder.java) that is -Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. -All rights reserved. -See the NOTICE.jdom file for additional information - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime SOAP Binding (org.apache.cxf:cxf-rt-bindings-soap:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime WS Addressing (org.apache.cxf:cxf-rt-ws-addr:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime SOAP Binding (org.apache.cxf:cxf-rt-bindings-soap:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime XML Binding (org.apache.cxf:cxf-rt-bindings-xml:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Simple Frontend (org.apache.cxf:cxf-rt-frontend-simple:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Local Transport (org.apache.cxf:cxf-rt-transports-local:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - -This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) -- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Sun JAXB Reference Implementation Tools (com.sun.xml.bind:jaxb-xjc:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Sun SAAJ Reference Implementation (com.sun.xml.messaging.saaj:saaj-impl:jar:1.3:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Sun SAAJ API (javax.xml.soap:saaj-api:jar:1.3:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) -- Java API for XML-Based Web Services (JAX-WS API) (javax.xml.ws:jaxws-api:jar:2.0:compile) -License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) - -This product includes/uses software(s) developed by 'Apache Software Foundation' (http://jakarta.apache.org/) -- Velocity (velocity:velocity:jar:1.4) (http://jakarta.apache.org/velocity/) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Velocity (velocity:velocity-dep:jar:1.4) (http://jakarta.apache.org/velocity/) - -This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) -- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) -- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) -License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) - - Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/NOTICE (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/NOTICE) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/NOTICE (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/NOTICE 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,677 @@ +// ------------------------------------------------------------------ +// NOTICE file corresponding to the section 4d of The Apache License, +// Version 2.0, in this case for Apache CXF +// ------------------------------------------------------------------ + +Apache CXF +Copyright 2006-2007 Apache Software Foundation + +This product includes software developed at +Apache Software Foundation (http://www.apache.org/). + +This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) +- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Java API for XML-Based Web Services (JAX-WS API) (javax.xml.ws:jaxws-api:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) + +This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) +- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) + +This product includes/uses software(s) developed by 'an unknown organization' +- AOP alliance (aopalliance:aopalliance:jar:1.0) (http://aopalliance.sourceforge.net) +License: Public Domain +- StAX Utilities (net.java.dev.stax-utils:stax-utils:jar:20060502:compile) (http://stax-utils.dev.java.net/stax-utils) +License: BSD (https://stax-utils.dev.java.net/source/browse/*checkout*/stax-utils/LICENSE) +- StAX API (stax:stax-api:jar:1.0.1) (http://stax.codehaus.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- WSDL4J (wsdl4j:wsdl4j:jar:1.6.1) (http://sf.net/projects/wsdl4j) +License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Envoi Solutions LLC' (http://www.envoisolutions.com/) +- Java Rest Annotations (org.codehaus.jra:jra:jar:1.0-alpha-4) (http://jra.codehaus.org) +License: The Apache Software License, Version 2.0 (http://jra.codehaus.org/License) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org) +- XML APIs (xml-apis:xml-apis:jar:1.3.02:compile) (http://xml.apache.org/commons/#external/xml-apis) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) +- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Java API for XML-Based Web Services (JAX-WS API) (javax.xml.ws:jaxws-api:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) + +This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) +- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Sun JAXB Reference Implementation Tools (com.sun.xml.bind:jaxb-xjc:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Sun SAAJ Reference Implementation (com.sun.xml.messaging.saaj:saaj-impl:jar:1.3:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Sun SAAJ API (javax.xml.soap:saaj-api:jar:1.3:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) + +This product includes/uses software(s) developed by 'Codehaus' (http://www.codehaus.org) +- jaxen (jaxen:jaxen:jar:1.1) (http://jaxen.codehaus.org/) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org) +- Apache WSS4J (wss4j:wss4j:jar:1.5.1:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache Xalan-Java (xalan:xalan:jar:2.7.0:runtime) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- XML Security (xml-security:xmlsec:jar:1.3.0:runtime) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org) +- Activation 1.1 (org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-activation_1.1_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1) (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Validator (org.apache.cxf:cxf-tools-validator:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools WSDLTo Core (org.apache.cxf:cxf-tools-wsdlto-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools WSDLTo JAXWS Frontend (org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Validator (org.apache.cxf:cxf-tools-validator:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools WSDLTo Core (org.apache.cxf:cxf-tools-wsdlto-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'an unknown organization' +- AOP alliance (aopalliance:aopalliance:jar:1.0) (http://aopalliance.sourceforge.net) +License: Public Domain +- StAX Utilities (net.java.dev.stax-utils:stax-utils:jar:20060502:compile) (http://stax-utils.dev.java.net/stax-utils) +License: BSD (https://stax-utils.dev.java.net/source/browse/*checkout*/stax-utils/LICENSE) +- Rhino (rhino:js:jar:1.6R5) (http://www.mozilla.org/rhino/) +License: Mozilla Public License version 1.1 (http://www.mozilla.org/MPL/MPL-1.1.html) +- StAX API (stax:stax-api:jar:1.0.1) (http://stax.codehaus.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- WSDL4J (wsdl4j:wsdl4j:jar:1.6.1) (http://sf.net/projects/wsdl4j) +License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) + +This product also includes schemas and specification developed by: +- the W3C consortium (http://www.w3c.org) +(http://www.w3.org/XML/1998/namespace) + +This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) +- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Sun JAXB Reference Implementation Tools (com.sun.xml.bind:jaxb-xjc:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Sun SAAJ API (javax.xml.soap:saaj-api:jar:1.3:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Java API for XML-Based Web Services (JAX-WS API) (javax.xml.ws:jaxws-api:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) + +This product includes/uses software(s) developed by 'jdom.org' (http://www.jdom.org) +- JDOM (jdom:jdom:jar:1.0:compile) +License: Modified Apache Software License (licenses/jdom.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime HTTP Transport (org.apache.cxf:cxf-rt-transports-http:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org) +- Activation 1.1 (org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-activation_1.1_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- JavaMail 1.4 (org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-javamail_1.4_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1) (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org) +- Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- JavaMail 1.4 (org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-javamail_1.4_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- JMS 1.1 (org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-jms_1.1_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1) (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Spring Framework' (http://www.springframework.org/) +- Spring Framework: Beans (org.springframework:spring-beans:jar:2.0.6) (http://www.springframework.org) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Spring Framework: Context (org.springframework:spring-context:jar:2.0.6) (http://www.springframework.org) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Spring Framework: Core (org.springframework:spring-core:jar:2.0.6) (http://www.springframework.org) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'ObjectWeb' (http://www.objectweb.org/) +- ASM Core (asm:asm:jar:2.2.3) (http://asm.objectweb.org/asm) + +This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org) +- Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1) (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Management (org.apache.cxf:cxf-rt-management:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Mort Bay Consulting' (http://www.mortbay.com) +- Jetty Server (org.mortbay.jetty:jetty:jar:6.1.5) (http://jetty.mortbay.org) +License: Apache License Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) +- Jetty Utilities (org.mortbay.jetty:jetty-util:jar:6.1.5) (http://jetty.mortbay.org) +License: Apache License Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Validator (org.apache.cxf:cxf-tools-validator:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://jakarta.apache.org) +- Lang (commons-lang:commons-lang:jar:2.1) (http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/) +License: The Apache Software License, Version 2.0 (/LICENSE.txt) +- Logging (commons-logging:commons-logging:jar:1.1) (http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/) +License: The Apache Software License, Version 2.0 (/LICENSE.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Colocated Binding (org.apache.cxf:cxf-rt-bindings-coloc:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime HTTP Binding (org.apache.cxf:cxf-rt-bindings-http:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Object Binding (org.apache.cxf:cxf-rt-bindings-object:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime SOAP Binding (org.apache.cxf:cxf-rt-bindings-soap:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime XML Binding (org.apache.cxf:cxf-rt-bindings-xml:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Aegis Databinding (org.apache.cxf:cxf-rt-databinding-aegis:jar:2.0.3-incubator) (http://cwiki.apache.org/confluence/display/CXF/Index) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime JAX-WS Frontend (org.apache.cxf:cxf-rt-frontend-jaxws:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime JavaScript Frontend (org.apache.cxf:cxf-rt-frontend-js:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Simple Frontend (org.apache.cxf:cxf-rt-frontend-simple:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Management (org.apache.cxf:cxf-rt-management:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime HTTP Transport (org.apache.cxf:cxf-rt-transports-http:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime HTTP Jetty Transport (org.apache.cxf:cxf-rt-transports-http-jetty:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime JMS Transport (org.apache.cxf:cxf-rt-transports-jms:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Local Transport (org.apache.cxf:cxf-rt-transports-local:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime WS Addressing (org.apache.cxf:cxf-rt-ws-addr:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime WS Policy (org.apache.cxf:cxf-rt-ws-policy:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime WS Reliable Messaging (org.apache.cxf:cxf-rt-ws-rm:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime WS Security (org.apache.cxf:cxf-rt-ws-security:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools JavaTo Core (org.apache.cxf:cxf-tools-java2wsdl:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools WSDLTo Misctools (org.apache.cxf:cxf-tools-misctools:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Validator (org.apache.cxf:cxf-tools-validator:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools WSDLTo Core (org.apache.cxf:cxf-tools-wsdlto-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools WSDLTo JAXB Databinding (org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools WSDLTo JAXWS Frontend (org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF XJC Default Value Plugin (org.apache.cxf:cxf-xjc-dv:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF XJC toString Plugin (org.apache.cxf:cxf-xjc-ts:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime SOAP Binding (org.apache.cxf:cxf-rt-bindings-soap:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Simple Frontend (org.apache.cxf:cxf-rt-frontend-simple:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) +- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) + +This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) +- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Sun JAXB Reference Implementation Tools (com.sun.xml.bind:jaxb-xjc:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Sun SAAJ API (javax.xml.soap:saaj-api:jar:1.3:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) + +Apache CXF +Copyright 2006-2007 The Apache Software Foundation + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime SOAP Binding (org.apache.cxf:cxf-rt-bindings-soap:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime SOAP Binding (org.apache.cxf:cxf-rt-bindings-soap:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Local Transport (org.apache.cxf:cxf-rt-transports-local:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Codehaus' (http://www.codehaus.org/) +- Woodstox (org.codehaus.woodstox:wstx-asl:jar:3.2.1) (http://woodstox.codehaus.org) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) +- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Sun JAXB Reference Implementation Tools (com.sun.xml.bind:jaxb-xjc:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) + +This product includes/uses software(s) developed by 'an unknown organization' +- AOP alliance (aopalliance:aopalliance:jar:1.0) (http://aopalliance.sourceforge.net) +License: Public Domain +- Rhino (rhino:js:jar:1.6R5) (http://www.mozilla.org/rhino/) +License: Mozilla Public License version 1.1 (http://www.mozilla.org/MPL/MPL-1.1.html) +- StAX API (stax:stax-api:jar:1.0.1) (http://stax.codehaus.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- WSDL4J (wsdl4j:wsdl4j:jar:1.6.1) (http://sf.net/projects/wsdl4j) +License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) + +This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org) +- Activation 1.1 (org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-activation_1.1_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- JavaMail 1.4 (org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-javamail_1.4_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Servlet 2.5 (org.apache.geronimo.specs:geronimo-servlet_2.5_spec:jar:1.1-M1) (http://geronimo.apache.org/specs/geronimo-servlet_2.5_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1) (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'The Legion of the Bouncy Castle' (http://www.bouncycastle.org) +- Bouncy Castle Crypto APIs for Java (bouncycastle:bcprov-jdk14:jar:136:runtime) (http://www.bouncycastle.org/java.html/bcprov-jdk14) +License: Bouncy Castle License (http://www.bouncycastle.org/licence.html) + +This product includes/uses software(s) developed by 'Spring Framework' (http://www.springframework.org/) +- Spring Framework: Beans (org.springframework:spring-beans:jar:2.0.6) (http://www.springframework.org) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Spring Framework: Context (org.springframework:spring-context:jar:2.0.6) (http://www.springframework.org) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Spring Framework: Core (org.springframework:spring-core:jar:2.0.6) (http://www.springframework.org) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Spring Framework: Web (org.springframework:spring-web:jar:2.0.6) (http://www.springframework.org) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org/) +- XmlSchema (org.apache.ws.commons.schema:XmlSchema:jar:1.3.2) (http://ws.apache.org/commons/XmlSchema) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- XML Commons Resolver Component (xml-resolver:xml-resolver:jar:1.2) (http://xml.apache.org/commons/components/resolver/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org) +- Apache Ant (ant:ant:jar:1.6.5:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org/) +- XmlSchema (org.apache.ws.commons.schema:XmlSchema:jar:1.3.2) (http://ws.apache.org/commons/XmlSchema) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- XML Commons Resolver Component (xml-resolver:xml-resolver:jar:1.2) (http://xml.apache.org/commons/components/resolver/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- XMLBeans main classes (xmlbeans:xbean:jar:2.2.0) (http://xmlbeans.apache.org) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Local Transport (org.apache.cxf:cxf-rt-transports-local:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime SOAP Binding (org.apache.cxf:cxf-rt-bindings-soap:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime XML Binding (org.apache.cxf:cxf-rt-bindings-xml:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime JAX-WS Frontend (org.apache.cxf:cxf-rt-frontend-jaxws:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Simple Frontend (org.apache.cxf:cxf-rt-frontend-simple:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime HTTP Transport (org.apache.cxf:cxf-rt-transports-http:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'an unknown organization' +- AOP alliance (aopalliance:aopalliance:jar:1.0) (http://aopalliance.sourceforge.net) +License: Public Domain +- StAX API (stax:stax-api:jar:1.0.1) (http://stax.codehaus.org/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- WSDL4J (wsdl4j:wsdl4j:jar:1.6.1) (http://sf.net/projects/wsdl4j) +License: CPL (http://www.opensource.org/licenses/cpl1.0.txt) + +This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) +- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Sun SAAJ Reference Implementation (com.sun.xml.messaging.saaj:saaj-impl:jar:1.3:runtime) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Sun SAAJ API (javax.xml.soap:saaj-api:jar:1.3:runtime) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org) +- Apache WSS4J (wss4j:wss4j:jar:1.5.1:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache Xalan-Java (xalan:xalan:jar:2.7.0:runtime) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- XML APIs (xml-apis:xml-apis:jar:1.3.02:compile) (http://xml.apache.org/commons/#external/xml-apis) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- XML Security (xml-security:xmlsec:jar:1.3.0:runtime) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org) +- Activation 1.1 (org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-activation_1.1_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- JavaMail 1.4 (org.apache.geronimo.specs:geronimo-javamail_1.4_spec:jar:1.0-M1) (http://geronimo.apache.org/specs/geronimo-javamail_1.4_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- JMS 1.1 (org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-jms_1.1_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Servlet 2.5 (org.apache.geronimo.specs:geronimo-servlet_2.5_spec:jar:1.1-M1) (http://geronimo.apache.org/specs/geronimo-servlet_2.5_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1) (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'QOS.ch' (http://www.qos.ch) +- SLF4J API Module (org.slf4j:slf4j-api:jar:1.3.1) (http://www.slf4j.org) +- SLF4J JDK14 Binding (org.slf4j:slf4j-jdk14:jar:1.3.1) (http://www.slf4j.org) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Apache Software Foundation' (http://www.apache.org) +- Log4j (log4j:log4j:jar:1.2.14) (http://logging.apache.org/log4j/docs/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Annotation 1.0 (org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar:1.1) (http://geronimo.apache.org/specs/geronimo-annotation_1.0_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Web Services Metadata 2.0 (org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:jar:1.1.1) (http://geronimo.apache.org/specs/geronimo-ws-metadata_2.0_spec) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +The product contains code (StaxBuilder.java) that is +Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. +All rights reserved. +See the NOTICE.jdom file for additional information + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime SOAP Binding (org.apache.cxf:cxf-rt-bindings-soap:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime WS Addressing (org.apache.cxf:cxf-rt-ws-addr:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime SOAP Binding (org.apache.cxf:cxf-rt-bindings-soap:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime XML Binding (org.apache.cxf:cxf-rt-bindings-xml:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime JAXB DataBinding (org.apache.cxf:cxf-rt-databinding-jaxb:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Simple Frontend (org.apache.cxf:cxf-rt-frontend-simple:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Local Transport (org.apache.cxf:cxf-rt-transports-local:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Command Line Tools Common (org.apache.cxf:cxf-tools-common:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes/uses software(s) developed by 'Sun Microsystems' (http://www.sun.com/) +- Sun JAXB Reference Implementation Runtime (com.sun.xml.bind:jaxb-impl:jar:2.0.5:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Sun JAXB Reference Implementation Tools (com.sun.xml.bind:jaxb-xjc:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Sun SAAJ Reference Implementation (com.sun.xml.messaging.saaj:saaj-impl:jar:1.3:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Java Architecture for XML Binding (JAXB API) (javax.xml.bind:jaxb-api:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Sun SAAJ API (javax.xml.soap:saaj-api:jar:1.3:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) +- Java API for XML-Based Web Services (JAX-WS API) (javax.xml.ws:jaxws-api:jar:2.0:compile) +License: COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 (http://www.sun.com/cddl/cddl.html) + +This product includes/uses software(s) developed by 'Apache Software Foundation' (http://jakarta.apache.org/) +- Velocity (velocity:velocity:jar:1.4) (http://jakarta.apache.org/velocity/) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Velocity (velocity:velocity-dep:jar:1.4) (http://jakarta.apache.org/velocity/) + +This product includes/uses software(s) developed by 'The Apache Software Foundation' (http://www.apache.org/) +- Apache CXF API (org.apache.cxf:cxf-api:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Schemas (org.apache.cxf:cxf-common-schemas:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF/cxf-common-schemas) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Common Utilities (org.apache.cxf:cxf-common-utilities:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Apache CXF Runtime Core (org.apache.cxf:cxf-rt-core:jar:2.0.3-incubator) (http://cwiki.apache.org/CXF) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +- Neethi (org.apache.neethi:neethi:jar:2.0.2:compile) +License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + + Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/NOTICE.jdom =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/NOTICE.jdom 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/NOTICE.jdom 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,49 +0,0 @@ - Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions, and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions, and the disclaimer that follows - these conditions in the documentation and/or other materials - provided with the distribution. - - 3. The name "JDOM" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact <request_AT_jdom_DOT_org>. - - 4. Products derived from this software may not be called "JDOM", nor - may "JDOM" appear in their name, without prior written permission - from the JDOM Project Management <request_AT_jdom_DOT_org>. - - In addition, we request (but do not require) that you include in the - end-user documentation provided with the redistribution and/or in the - software itself an acknowledgement equivalent to the following: - "This product includes software developed by the - JDOM Project (http://www.jdom.org/)." - Alternatively, the acknowledgment may be graphical using the logos - available at http://www.jdom.org/images/logos. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - - This software consists of voluntary contributions made by many - individuals on behalf of the JDOM Project and was originally - created by Jason Hunter <jhunter_AT_jdom_DOT_org> and - Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information - on the JDOM Project, please see <http://www.jdom.org/>. Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/NOTICE.jdom (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/NOTICE.jdom) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/NOTICE.jdom (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/NOTICE.jdom 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,49 @@ + Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions, and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions, and the disclaimer that follows + these conditions in the documentation and/or other materials + provided with the distribution. + + 3. The name "JDOM" must not be used to endorse or promote products + derived from this software without prior written permission. For + written permission, please contact <request_AT_jdom_DOT_org>. + + 4. Products derived from this software may not be called "JDOM", nor + may "JDOM" appear in their name, without prior written permission + from the JDOM Project Management <request_AT_jdom_DOT_org>. + + In addition, we request (but do not require) that you include in the + end-user documentation provided with the redistribution and/or in the + software itself an acknowledgement equivalent to the following: + "This product includes software developed by the + JDOM Project (http://www.jdom.org/)." + Alternatively, the acknowledgment may be graphical using the logos + available at http://www.jdom.org/images/logos. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + + This software consists of voluntary contributions made by many + individuals on behalf of the JDOM Project and was originally + created by Jason Hunter <jhunter_AT_jdom_DOT_org> and + Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information + on the JDOM Project, please see <http://www.jdom.org/>. Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<extensions xmlns="http://cxf.apache.org/bus/extension"> - <extension class="org.apache.cxf.binding.object.ObjectBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> - <namespace>http://cxf.apache.org/binding/object/</namespace> - </extension> - <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="true"> - <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace> - <namespace>http://schemas.xmlsoap.org/soap/http</namespace> - <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace> - <namespace>http://cxf.apache.org/transports/http/configuration</namespace> - <namespace>http://cxf.apache.org/bindings/xformat</namespace> - </extension> - <extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> - <namespace>http://apache.org/cxf/binding/http</namespace> - </extension> - <extension class="org.apache.cxf.binding.xml.XMLBindingFactory" deferred="true"> - <namespace>http://cxf.apache.org/bindings/xformat</namespace> - <namespace>http://www.w3.org/2004/08/wsdl/http</namespace> - </extension> - <extension class="org.apache.cxf.wsdl11.WSDLManagerImpl" interface="org.apache.cxf.wsdl.WSDLManager"/> - <extension class="org.apache.cxf.phase.PhaseManagerImpl" interface="org.apache.cxf.phase.PhaseManager"/> - <extension class="org.apache.cxf.workqueue.WorkQueueManagerImpl" interface="org.apache.cxf.workqueue.WorkQueueManager"/> - <extension class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager" interface="org.apache.cxf.buslifecycle.BusLifeCycleManager"/> - <extension class="org.apache.cxf.endpoint.ServerRegistryImpl" interface="org.apache.cxf.endpoint.ServerRegistry"/> - <extension class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl" interface="org.apache.cxf.transports.http.QueryHandlerRegistry"/> - <extension class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl" interface="org.apache.cxf.endpoint.EndpointResolverRegistry"/> - <extension class="org.apache.cxf.headers.HeaderManagerImpl" interface="org.apache.cxf.headers.HeaderManager"/> - <extension class="org.apache.cxf.catalog.OASISCatalogManager" interface="org.apache.cxf.catalog.OASISCatalogManager"/> - <extension class="org.apache.cxf.transport.jms.JMSTransportFactory" deferred="true"> - <namespace>http://cxf.apache.org/transports/jms</namespace> - <namespace>http://cxf.apache.org/transports/jms/configuration</namespace> - </extension> - <extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager"/> - <extension class="org.apache.cxf.binding.soap.SoapBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> - <namespace>http://schemas.xmlsoap.org/soap/</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace> - <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace> - </extension> - <extension class="org.apache.cxf.binding.soap.SoapTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true"> - <namespace>http://schemas.xmlsoap.org/soap/</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace> - </extension> -</extensions> \ No newline at end of file Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<extensions xmlns="http://cxf.apache.org/bus/extension"> + <extension class="org.apache.cxf.binding.object.ObjectBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> + <namespace>http://cxf.apache.org/binding/object/</namespace> + </extension> + <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="true"> + <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace> + <namespace>http://schemas.xmlsoap.org/soap/http</namespace> + <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace> + <namespace>http://cxf.apache.org/transports/http/configuration</namespace> + <namespace>http://cxf.apache.org/bindings/xformat</namespace> + </extension> + <extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> + <namespace>http://apache.org/cxf/binding/http</namespace> + </extension> + <extension class="org.apache.cxf.binding.xml.XMLBindingFactory" deferred="true"> + <namespace>http://cxf.apache.org/bindings/xformat</namespace> + <namespace>http://www.w3.org/2004/08/wsdl/http</namespace> + </extension> + <extension class="org.apache.cxf.wsdl11.WSDLManagerImpl" interface="org.apache.cxf.wsdl.WSDLManager"/> + <extension class="org.apache.cxf.phase.PhaseManagerImpl" interface="org.apache.cxf.phase.PhaseManager"/> + <extension class="org.apache.cxf.workqueue.WorkQueueManagerImpl" interface="org.apache.cxf.workqueue.WorkQueueManager"/> + <extension class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager" interface="org.apache.cxf.buslifecycle.BusLifeCycleManager"/> + <extension class="org.apache.cxf.endpoint.ServerRegistryImpl" interface="org.apache.cxf.endpoint.ServerRegistry"/> + <extension class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl" interface="org.apache.cxf.transports.http.QueryHandlerRegistry"/> + <extension class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl" interface="org.apache.cxf.endpoint.EndpointResolverRegistry"/> + <extension class="org.apache.cxf.headers.HeaderManagerImpl" interface="org.apache.cxf.headers.HeaderManager"/> + <extension class="org.apache.cxf.catalog.OASISCatalogManager" interface="org.apache.cxf.catalog.OASISCatalogManager"/> + <extension class="org.apache.cxf.transport.jms.JMSTransportFactory" deferred="true"> + <namespace>http://cxf.apache.org/transports/jms</namespace> + <namespace>http://cxf.apache.org/transports/jms/configuration</namespace> + </extension> + <extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager"/> + <extension class="org.apache.cxf.binding.soap.SoapBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> + <namespace>http://schemas.xmlsoap.org/soap/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace> + <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace> + </extension> + <extension class="org.apache.cxf.binding.soap.SoapTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true"> + <namespace>http://schemas.xmlsoap.org/soap/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace> + </extension> +</extensions> \ No newline at end of file Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf) Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,96 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="unqualified" attributeFormDefault="unqualified" -> - - <xsd:element name="mappings"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="mapping" type="mappingType" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:complexType name="mappingType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="property" type="propertyType" /> - <xsd:element name="method" type="methodType" /> - <xsd:element name="component" type="componentTypeType" /> - </xsd:choice> - <xsd:attribute name="uri" type="xsd:string" /> - <xsd:attribute name="name" type="xsd:string" /> - </xsd:complexType> - - <xsd:complexType name="propertyType"> - <xsd:attributeGroup ref="mappedType" /> - <xsd:anyAttribute namespace='##other' processContents='lax' /> - </xsd:complexType> - - <xsd:complexType name="methodType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="return-type" type="return-typeType" /> - <xsd:element name="parameter" type="parameterType" /> - </xsd:choice> - <xsd:attribute name="name" type="xsd:string" /> - </xsd:complexType> - - <xsd:complexType name="return-typeType"> - <xsd:attributeGroup ref="mappedType" /> - <xsd:anyAttribute namespace='##other' processContents='lax' /> - </xsd:complexType> - - <xsd:complexType name="parameterType"> - <xsd:attribute name="index" type="xsd:int" /> - <xsd:attribute name="class" type="xsd:string" /> - <xsd:attributeGroup ref="mappedType" /> - <xsd:anyAttribute namespace='##other' processContents='lax' /> - </xsd:complexType> - - <xsd:complexType name="componentTypeType"> - <xsd:attribute name="class" type="xsd:string" /> - <xsd:attributeGroup ref="mappedType" /> - <xsd:anyAttribute namespace='##other' processContents='lax' /> - </xsd:complexType> - - <xsd:attributeGroup name="mappedType"> - <xsd:attribute name="name" type="xsd:string" /> - <xsd:attribute name="type" type="xsd:string" /> - <xsd:attribute name="typeName" type="xsd:string" /> - <xsd:attribute name="mappedName" type="xsd:string" /> - <xsd:attribute name="nillable" type="xsd:boolean" /> - <xsd:attribute name="flag" type="xsd:boolean" /> - <xsd:attribute name="ignore" type="xsd:boolean" /> - <xsd:attribute name="componentType" type="xsd:string" /> - <xsd:attribute name="keyType" type="xsd:string" /> - <xsd:attribute name="valueType" type="xsd:string" /> - <xsd:attribute name="minOccurs" type="xsd:int" /> - <xsd:attribute name="maxOccurs" type="xsd:string" /> - <xsd:attribute name="style"> - <xsd:simpleType> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="attribute" /> - <xsd:enumeration value="element" /> - </xsd:restriction> - </xsd:simpleType> - </xsd:attribute> - <xsd:anyAttribute namespace='##other' processContents='lax' /> - </xsd:attributeGroup> -</xsd:schema> \ No newline at end of file Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/aegis.xsd 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="unqualified" attributeFormDefault="unqualified" +> + + <xsd:element name="mappings"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="mapping" type="mappingType" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + <xsd:complexType name="mappingType"> + <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="property" type="propertyType" /> + <xsd:element name="method" type="methodType" /> + <xsd:element name="component" type="componentTypeType" /> + </xsd:choice> + <xsd:attribute name="uri" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + + <xsd:complexType name="propertyType"> + <xsd:attributeGroup ref="mappedType" /> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:complexType> + + <xsd:complexType name="methodType"> + <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="return-type" type="return-typeType" /> + <xsd:element name="parameter" type="parameterType" /> + </xsd:choice> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + + <xsd:complexType name="return-typeType"> + <xsd:attributeGroup ref="mappedType" /> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:complexType> + + <xsd:complexType name="parameterType"> + <xsd:attribute name="index" type="xsd:int" /> + <xsd:attribute name="class" type="xsd:string" /> + <xsd:attributeGroup ref="mappedType" /> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:complexType> + + <xsd:complexType name="componentTypeType"> + <xsd:attribute name="class" type="xsd:string" /> + <xsd:attributeGroup ref="mappedType" /> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:complexType> + + <xsd:attributeGroup name="mappedType"> + <xsd:attribute name="name" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="typeName" type="xsd:string" /> + <xsd:attribute name="mappedName" type="xsd:string" /> + <xsd:attribute name="nillable" type="xsd:boolean" /> + <xsd:attribute name="flag" type="xsd:boolean" /> + <xsd:attribute name="ignore" type="xsd:boolean" /> + <xsd:attribute name="componentType" type="xsd:string" /> + <xsd:attribute name="keyType" type="xsd:string" /> + <xsd:attribute name="valueType" type="xsd:string" /> + <xsd:attribute name="minOccurs" type="xsd:int" /> + <xsd:attribute name="maxOccurs" type="xsd:string" /> + <xsd:attribute name="style"> + <xsd:simpleType> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="attribute" /> + <xsd:enumeration value="element" /> + </xsd:restriction> + </xsd:simpleType> + </xsd:attribute> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:attributeGroup> +</xsd:schema> \ No newline at end of file Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder"> - <constructor-arg ref="cxf"/> - </bean> - - <bean class="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"/> - - <bean id="org.apache.cxf.ws.addressing.policy.UsingAddressingAssertionBuilder" - class="org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder"> - <property name="knownElements"> - <set> - <bean class="javax.xml.namespace.QName"> - <constructor-arg value="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy"/> - <constructor-arg value="UsingAddressing"/> - </bean> - <bean class="javax.xml.namespace.QName"> - <constructor-arg value="http://www.w3.org/2005/02/addressing/wsdl"/> - <constructor-arg value="UsingAddressing"/> - </bean> - <bean class="javax.xml.namespace.QName"> - <constructor-arg value="http://www.w3.org/2006/05/addressing/wsdl"/> - <constructor-arg value="UsingAddressing"/> - </bean> - </set> - </property> - </bean> - -</beans> \ No newline at end of file Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder"> + <constructor-arg ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"/> + + <bean id="org.apache.cxf.ws.addressing.policy.UsingAddressingAssertionBuilder" + class="org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder"> + <property name="knownElements"> + <set> + <bean class="javax.xml.namespace.QName"> + <constructor-arg value="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy"/> + <constructor-arg value="UsingAddressing"/> + </bean> + <bean class="javax.xml.namespace.QName"> + <constructor-arg value="http://www.w3.org/2005/02/addressing/wsdl"/> + <constructor-arg value="UsingAddressing"/> + </bean> + <bean class="javax.xml.namespace.QName"> + <constructor-arg value="http://www.w3.org/2006/05/addressing/wsdl"/> + <constructor-arg value="UsingAddressing"/> + </bean> + </set> + </property> + </bean> + +</beans> \ No newline at end of file Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.binding.http.HttpBindingFactory" lazy-init="true"> - <property name="activationNamespaces"> - <set> - <value>http://apache.org/cxf/binding/http</value> - </set> - </property> - <property name="bus" ref="cxf"/> - </bean> -</beans> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.binding.http.HttpBindingFactory" lazy-init="true"> + <property name="activationNamespaces"> + <set> + <value>http://apache.org/cxf/binding/http</value> + </set> + </property> + <property name="bus" ref="cxf"/> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> - - <bean class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" - lazy-init="false" - depends-on="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"> - <property name="bus" ref="cxf"/> - <property name="transportIds"> - <list> - <value>http://schemas.xmlsoap.org/soap/http</value> - <value>http://schemas.xmlsoap.org/wsdl/http/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> - <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> - <value>http://cxf.apache.org/transports/http/configuration</value> - <value>http://cxf.apache.org/bindings/xformat</value> - </list> - </property> - </bean> - -</beans> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> + + <bean class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" + lazy-init="false" + depends-on="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <list> + <value>http://schemas.xmlsoap.org/soap/http</value> + <value>http://schemas.xmlsoap.org/wsdl/http/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> + <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> + <value>http://cxf.apache.org/transports/http/configuration</value> + <value>http://cxf.apache.org/bindings/xformat</value> + </list> + </property> + </bean> + +</beans> Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"/> - <bean class="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"/> - - - <bean class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" - id="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" - lazy-init="true"> - <property name="bus" ref="cxf"/> - <property name="transportIds"> - <list> - <value>http://schemas.xmlsoap.org/soap/http</value> - <value>http://schemas.xmlsoap.org/wsdl/http/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> - <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> - <value>http://cxf.apache.org/transports/http/configuration</value> - <value>http://cxf.apache.org/bindings/xformat</value> - </list> - </property> - </bean> -</beans> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"/> + <bean class="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"/> + + + <bean class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" + id="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" + lazy-init="true"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <list> + <value>http://schemas.xmlsoap.org/soap/http</value> + <value>http://schemas.xmlsoap.org/wsdl/http/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> + <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> + <value>http://cxf.apache.org/transports/http/configuration</value> + <value>http://cxf.apache.org/bindings/xformat</value> + </list> + </property> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" lazy-init="false"/> -</beans> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" lazy-init="false"/> +</beans> Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.transport.jms.JMSTransportFactory" lazy-init="true"> - <property name="bus" ref="cxf"/> - <property name="transportIds"> - <list> - <value>http://cxf.apache.org/transports/jms</value> - <value>http://cxf.apache.org/transports/jms/configuration</value> - </list> - </property> - </bean> -</beans> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.transport.jms.JMSTransportFactory" lazy-init="true"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <list> + <value>http://cxf.apache.org/transports/jms</value> + <value>http://cxf.apache.org/transports/jms/configuration</value> + </list> + </property> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="true"> - <property name="bus" ref="cxf"/> - <property name="transportIds"> - <list> - <value>http://cxf.apache.org/transports/local</value> - </list> - </property> - </bean> -</beans> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="true"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <list> + <value>http://cxf.apache.org/transports/local</value> + </list> + </property> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean id="org.apache.cxf.management.jmx.InstrumentationManagerImpl" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl"> - <property name="bus" ref="cxf"/> - <property name="enabled" value="false"/> - <property name="threaded" value="false"/> - <property name="daemon" value="false"/> - </bean> - -</beans> \ No newline at end of file Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean id="org.apache.cxf.management.jmx.InstrumentationManagerImpl" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl"> + <property name="bus" ref="cxf"/> + <property name="enabled" value="false"/> + <property name="threaded" value="false"/> + <property name="daemon" value="false"/> + </bean> + +</beans> \ No newline at end of file Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.binding.object.ObjectBindingFactory" - lazy-init="true" depends-on="org.apache.cxf.endpoint.ServerLifeCycleManager" > - <property name="bus" ref="cxf"/> - <property name="activationNamespaces"> - <set> - <value>http://cxf.apache.org/binding/object</value> - </set> - </property> - </bean> -</beans> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.binding.object.ObjectBindingFactory" + lazy-init="true" depends-on="org.apache.cxf.endpoint.ServerLifeCycleManager" > + <property name="bus" ref="cxf"/> + <property name="activationNamespaces"> + <set> + <value>http://cxf.apache.org/binding/object</value> + </set> + </property> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean id="org.apache.cxf.ws.policy.AssertionBuilderRegistry" class="org.apache.cxf.ws.policy.AssertionBuilderRegistryImpl"> - <constructor-arg> - <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> - <property name="type" value="org.apache.cxf.ws.policy.AssertionBuilder"/> - <property name="idsProperty" value="knownElements"/> - </bean> - </constructor-arg> - </bean> - - <bean class="org.apache.cxf.ws.policy.PolicyConstants"/> - - <bean id="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry" class="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl"> - <constructor-arg> - <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> - <property name="type" value="org.apache.cxf.ws.policy.PolicyInterceptorProvider"/> - <property name="idsProperty" value="assertionTypes"/> - </bean> - </constructor-arg> - </bean> - - <bean id="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry" - class="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry"> - <constructor-arg> - <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> - <property name="type" value="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilder"/> - <property name="idsProperty" value="domainExpressionTypes"/> - </bean> - </constructor-arg> - </bean> - - <bean class="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"/> - - <bean id="org.apache.cxf.ws.policy.PolicyBuilder" class="org.apache.cxf.ws.policy.PolicyBuilderImpl"> - <property name="assertionBuilderRegistry" ref="org.apache.cxf.ws.policy.AssertionBuilderRegistry"/> - </bean> - - <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine"> - <property name="bus" ref="cxf"/> - </bean> - - <bean class="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider"> - <constructor-arg ref="cxf"/> - </bean> - - <bean class="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider"> - <constructor-arg ref="cxf"/> - </bean> - -  - <bean class="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder"> - <property name="bus" ref="cxf"/> - </bean> - <bean class="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"/> -</beans> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean id="org.apache.cxf.ws.policy.AssertionBuilderRegistry" class="org.apache.cxf.ws.policy.AssertionBuilderRegistryImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> + <property name="type" value="org.apache.cxf.ws.policy.AssertionBuilder"/> + <property name="idsProperty" value="knownElements"/> + </bean> + </constructor-arg> + </bean> + + <bean class="org.apache.cxf.ws.policy.PolicyConstants"/> + + <bean id="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry" class="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> + <property name="type" value="org.apache.cxf.ws.policy.PolicyInterceptorProvider"/> + <property name="idsProperty" value="assertionTypes"/> + </bean> + </constructor-arg> + </bean> + + <bean id="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry" + class="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> + <property name="type" value="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilder"/> + <property name="idsProperty" value="domainExpressionTypes"/> + </bean> + </constructor-arg> + </bean> + + <bean class="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"/> + + <bean id="org.apache.cxf.ws.policy.PolicyBuilder" class="org.apache.cxf.ws.policy.PolicyBuilderImpl"> + <property name="assertionBuilderRegistry" ref="org.apache.cxf.ws.policy.AssertionBuilderRegistry"/> + </bean> + + <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine"> + <property name="bus" ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider"> + <constructor-arg ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider"> + <constructor-arg ref="cxf"/> + </bean> + +  + <bean class="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder"> + <property name="bus" ref="cxf"/> + </bean> + <bean class="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"/> +</beans> Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean id="org.apache.cxf.ws.rm.RMManager" class="org.apache.cxf.ws.rm.RMManager"> - <property name="bus" ref="cxf"/> - </bean> - - <bean class="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider"> - <constructor-arg><ref bean="cxf"/></constructor-arg> - </bean> - - <bean id="org.apache.cxf.ws.rm.RMAssertionBuilder" class="org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertionBuilder"> - <constructor-arg value="org.apache.cxf.ws.rm.policy.RMAssertion"/> - <constructor-arg> - <bean class="javax.xml.namespace.QName"> - <constructor-arg value="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> - <constructor-arg value="RMAssertion"/> - </bean> - </constructor-arg> - </bean> - -</beans> \ No newline at end of file Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean id="org.apache.cxf.ws.rm.RMManager" class="org.apache.cxf.ws.rm.RMManager"> + <property name="bus" ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider"> + <constructor-arg><ref bean="cxf"/></constructor-arg> + </bean> + + <bean id="org.apache.cxf.ws.rm.RMAssertionBuilder" class="org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertionBuilder"> + <constructor-arg value="org.apache.cxf.ws.rm.policy.RMAssertion"/> + <constructor-arg> + <bean class="javax.xml.namespace.QName"> + <constructor-arg value="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> + <constructor-arg value="RMAssertion"/> + </bean> + </constructor-arg> + </bean> + +</beans> \ No newline at end of file Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.binding.soap.SoapBindingFactory" lazy-init="true"> - <property name="activationNamespaces"> - <set> - <value>http://schemas.xmlsoap.org/soap/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap12/</value> - <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> - </set> - </property> - <property name="bus" ref="cxf"/> - </bean> - - <bean class="org.apache.cxf.binding.soap.SoapTransportFactory" lazy-init="true"> - <property name="transportIds"> - <list> - <value>http://schemas.xmlsoap.org/soap/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap12/</value> - </list> - </property> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.binding.soap.customEditorConfigurer" - class="org.springframework.beans.factory.config.CustomEditorConfigurer"> - <property name="customEditors"> - <map> - <entry key="org.apache.cxf.binding.soap.SoapVersion"> - <bean class="org.apache.cxf.binding.soap.SoapVersionPropertyEditor"/> - </entry> - </map> - </property> - </bean> -</beans> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.binding.soap.SoapBindingFactory" lazy-init="true"> + <property name="activationNamespaces"> + <set> + <value>http://schemas.xmlsoap.org/soap/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap12/</value> + <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> + </set> + </property> + <property name="bus" ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.binding.soap.SoapTransportFactory" lazy-init="true"> + <property name="transportIds"> + <list> + <value>http://schemas.xmlsoap.org/soap/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap12/</value> + </list> + </property> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.binding.soap.customEditorConfigurer" + class="org.springframework.beans.factory.config.CustomEditorConfigurer"> + <property name="customEditors"> + <map> + <entry key="org.apache.cxf.binding.soap.SoapVersion"> + <bean class="org.apache.cxf.binding.soap.SoapVersionPropertyEditor"/> + </entry> + </map> + </property> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.binding.xml.XMLBindingFactory" lazy-init="true"> - <property name="activationNamespaces"> - <set> - <value>http://cxf.apache.org/bindings/xformat</value> - <value>http://www.w3.org/2004/08/wsdl/http</value> - </set> - </property> - <property name="bus" ref="cxf"/> - </bean> - -</beans> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.binding.xml.XMLBindingFactory" lazy-init="true"> + <property name="activationNamespaces"> + <set> + <value>http://cxf.apache.org/bindings/xformat</value> + <value>http://www.w3.org/2004/08/wsdl/http</value> + </set> + </property> + <property name="bus" ref="cxf"/> + </bean> + +</beans> Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.transport.servlet.ServletTransportFactory"> - <property name="bus" ref="cxf"/> - <property name="transportIds"> - <set> - <value>http://cxf.apache.org/bindings/xformat</value> - <value>http://schemas.xmlsoap.org/soap/http</value> - <value>http://schemas.xmlsoap.org/wsdl/http/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> - <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> - <value>http://cxf.apache.org/transports/http/configuration</value> - </set> - </property> - </bean> -</beans> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf-servlet.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.transport.servlet.ServletTransportFactory"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <set> + <value>http://cxf.apache.org/bindings/xformat</value> + <value>http://schemas.xmlsoap.org/soap/http</value> + <value>http://schemas.xmlsoap.org/wsdl/http/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> + <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> + <value>http://cxf.apache.org/transports/http/configuration</value> + </set> + </property> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.extension =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.extension 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.extension 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,13 +0,0 @@ -META-INF/cxf/cxf-extension-jaxws.xml -META-INF/cxf/cxf-extension-rm.xml -META-INF/cxf/cxf-extension-addr.xml -META-INF/cxf/cxf-extension-object-binding.xml -META-INF/cxf/cxf-extension-http-jetty.xml -META-INF/cxf/cxf-extension-http.xml -META-INF/cxf/cxf-extension-http-binding.xml -META-INF/cxf/cxf-extension-xml.xml -META-INF/cxf/cxf-extension-policy.xml -META-INF/cxf/cxf-extension-jms.xml -META-INF/cxf/cxf-extension-local.xml -META-INF/cxf/cxf-extension-management.xml -META-INF/cxf/cxf-extension-soap.xml Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.extension (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.extension) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.extension (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.extension 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,13 @@ +META-INF/cxf/cxf-extension-jaxws.xml +META-INF/cxf/cxf-extension-rm.xml +META-INF/cxf/cxf-extension-addr.xml +META-INF/cxf/cxf-extension-object-binding.xml +META-INF/cxf/cxf-extension-http-jetty.xml +META-INF/cxf/cxf-extension-http.xml +META-INF/cxf/cxf-extension-http-binding.xml +META-INF/cxf/cxf-extension-xml.xml +META-INF/cxf/cxf-extension-policy.xml +META-INF/cxf/cxf-extension-jms.xml +META-INF/cxf/cxf-extension-local.xml +META-INF/cxf/cxf-extension-management.xml +META-INF/cxf/cxf-extension-soap.xml Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/> - <bean class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/> - <bean class="org.apache.cxf.bus.spring.BusExtensionPostProcessor" id="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/> - - <bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.cxf.bus.resource.ResourceManagerImpl"> - <constructor-arg> - <list> - <bean class="org.apache.cxf.resource.ClasspathResolver"/> - <bean class="org.apache.cxf.resource.ClassLoaderResolver"/> - <bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/> - </list> - </constructor-arg> - <property name="bus" ref="cxf"/> - </bean> - <bean id="org.apache.cxf.configuration.Configurer" - class="org.apache.cxf.configuration.spring.ConfigurerImpl"> - </bean> - - <bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl"> - <constructor-arg> - <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> - <property name="type" value="org.apache.cxf.binding.BindingFactory"/> - <property name="idsProperty" value="activationNamespaces"/> - </bean> - </constructor-arg> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.transport.DestinationFactoryManager" class="org.apache.cxf.transport.DestinationFactoryManagerImpl"> - <constructor-arg> - <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> - <property name="type" value="org.apache.cxf.transport.DestinationFactory"/> - <property name="idsProperty" value="transportIds"/> - </bean> - </constructor-arg> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.transport.ConduitInitiatorManager" class="org.apache.cxf.transport.ConduitInitiatorManagerImpl"> - <constructor-arg> - <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> - <property name="type" value="org.apache.cxf.transport.ConduitInitiator"/> - <property name="idsProperty" value="transportIds"/> - </bean> - </constructor-arg> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.wsdl.WSDLManager" class="org.apache.cxf.wsdl11.WSDLManagerImpl"> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.phase.PhaseManager" class="org.apache.cxf.phase.PhaseManagerImpl"> - - </bean> - - <bean id="org.apache.cxf.workqueue.WorkQueueManager" class="org.apache.cxf.workqueue.WorkQueueManagerImpl"> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.buslifecycle.BusLifeCycleManager" class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager"> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.endpoint.ServerRegistry" class="org.apache.cxf.endpoint.ServerRegistryImpl"> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.endpoint.ServerLifeCycleManager" class="org.apache.cxf.endpoint.ServerLifeCycleManagerImpl"/> - <bean id="org.apache.cxf.endpoint.ClientLifeCycleManager" class="org.apache.cxf.endpoint.ClientLifeCycleManagerImpl"/> - - - <bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl"> - <constructor-arg ref="cxf"/> - <constructor-arg> - <list> - <bean class="org.apache.cxf.transport.http.WSDLQueryHandler"> - <constructor-arg ref="cxf"/> - </bean> - </list> - </constructor-arg> - </bean> - - <bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl"> - <property name="bus" ref="cxf"/> - </bean> - <bean id="org.apache.cxf.headers.HeaderManager" class="org.apache.cxf.headers.HeaderManagerImpl"> - <property name="bus" ref="cxf"/> - </bean> - <bean id="org.apache.cxf.catalog.OASISCatalogManager" class="org.apache.cxf.catalog.OASISCatalogManager"> - <property name="bus" ref="cxf"/> - </bean> -</beans> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/cxf/cxf.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/> + <bean class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/> + <bean class="org.apache.cxf.bus.spring.BusExtensionPostProcessor" id="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/> + + <bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.cxf.bus.resource.ResourceManagerImpl"> + <constructor-arg> + <list> + <bean class="org.apache.cxf.resource.ClasspathResolver"/> + <bean class="org.apache.cxf.resource.ClassLoaderResolver"/> + <bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/> + </list> + </constructor-arg> + <property name="bus" ref="cxf"/> + </bean> + <bean id="org.apache.cxf.configuration.Configurer" + class="org.apache.cxf.configuration.spring.ConfigurerImpl"> + </bean> + + <bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> + <property name="type" value="org.apache.cxf.binding.BindingFactory"/> + <property name="idsProperty" value="activationNamespaces"/> + </bean> + </constructor-arg> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.transport.DestinationFactoryManager" class="org.apache.cxf.transport.DestinationFactoryManagerImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> + <property name="type" value="org.apache.cxf.transport.DestinationFactory"/> + <property name="idsProperty" value="transportIds"/> + </bean> + </constructor-arg> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.transport.ConduitInitiatorManager" class="org.apache.cxf.transport.ConduitInitiatorManagerImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> + <property name="type" value="org.apache.cxf.transport.ConduitInitiator"/> + <property name="idsProperty" value="transportIds"/> + </bean> + </constructor-arg> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.wsdl.WSDLManager" class="org.apache.cxf.wsdl11.WSDLManagerImpl"> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.phase.PhaseManager" class="org.apache.cxf.phase.PhaseManagerImpl"> + + </bean> + + <bean id="org.apache.cxf.workqueue.WorkQueueManager" class="org.apache.cxf.workqueue.WorkQueueManagerImpl"> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.buslifecycle.BusLifeCycleManager" class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager"> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.endpoint.ServerRegistry" class="org.apache.cxf.endpoint.ServerRegistryImpl"> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.endpoint.ServerLifeCycleManager" class="org.apache.cxf.endpoint.ServerLifeCycleManagerImpl"/> + <bean id="org.apache.cxf.endpoint.ClientLifeCycleManager" class="org.apache.cxf.endpoint.ClientLifeCycleManagerImpl"/> + + + <bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl"> + <constructor-arg ref="cxf"/> + <constructor-arg> + <list> + <bean class="org.apache.cxf.transport.http.WSDLQueryHandler"> + <constructor-arg ref="cxf"/> + </bean> + </list> + </constructor-arg> + </bean> + + <bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl"> + <property name="bus" ref="cxf"/> + </bean> + <bean id="org.apache.cxf.headers.HeaderManager" class="org.apache.cxf.headers.HeaderManagerImpl"> + <property name="bus" ref="cxf"/> + </bean> + <bean id="org.apache.cxf.catalog.OASISCatalogManager" class="org.apache.cxf.catalog.OASISCatalogManager"> + <property name="bus" ref="cxf"/> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/extensions.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> - -<properties version="1.0"> - <entry key="org.apache.cxf.transports.http-1">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPClientPolicy</entry> - <entry key="org.apache.cxf.transports.http-2">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPServerPolicy</entry> - <entry key="org.apache.cxf.transports.http-3">javax.wsdl.Port=org.xmlsoap.schemas.wsdl.http.AddressType</entry> - <entry key="org.apache.cxf.bindings.xml-1">javax.wsdl.BindingInput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry> - <entry key="org.apache.cxf.bindings.xml-2">javax.wsdl.BindingOutput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry> - <entry key="org.apache.cxf.bindings.xml-3">javax.wsdl.Binding=org.apache.cxf.bindings.xformat.XMLFormatBinding</entry> - <entry key="org.apache.cxf.transport.jms-1">javax.wsdl.Port=org.apache.cxf.transport.jms.AddressType</entry> - <entry key="org.apache.cxf.transport.jms-2">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientBehaviorPolicyType</entry> - <entry key="org.apache.cxf.transport.jms-3">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerBehaviorPolicyType</entry> -</properties> \ No newline at end of file Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/extensions.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> + +<properties version="1.0"> + <entry key="org.apache.cxf.transports.http-1">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPClientPolicy</entry> + <entry key="org.apache.cxf.transports.http-2">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPServerPolicy</entry> + <entry key="org.apache.cxf.transports.http-3">javax.wsdl.Port=org.xmlsoap.schemas.wsdl.http.AddressType</entry> + <entry key="org.apache.cxf.bindings.xml-1">javax.wsdl.BindingInput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry> + <entry key="org.apache.cxf.bindings.xml-2">javax.wsdl.BindingOutput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry> + <entry key="org.apache.cxf.bindings.xml-3">javax.wsdl.Binding=org.apache.cxf.bindings.xformat.XMLFormatBinding</entry> + <entry key="org.apache.cxf.transport.jms-1">javax.wsdl.Port=org.apache.cxf.transport.jms.AddressType</entry> + <entry key="org.apache.cxf.transport.jms-2">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientBehaviorPolicyType</entry> + <entry key="org.apache.cxf.transport.jms-3">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerBehaviorPolicyType</entry> +</properties> \ No newline at end of file Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> - <rewriteSystem systemIdStartString="http://www.w3.org/2005/08/addressing" rewritePrefix="classpath:/schemas/wsdl"/> -</catalog> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/jax-ws-catalog.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> + <rewriteSystem systemIdStartString="http://www.w3.org/2005/08/addressing" rewritePrefix="classpath:/schemas/wsdl"/> +</catalog> Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/service.validator.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/service.validator.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/service.validator.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> -<properties> - <entry key="XMLFormatValidator">org.apache.cxf.binding.xml.XMLFormatValidator</entry> -</properties> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/service.validator.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/service.validator.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/service.validator.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/service.validator.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> + <entry key="XMLFormatValidator">org.apache.cxf.binding.xml.XMLFormatValidator</entry> +</properties> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/services) Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,2 +0,0 @@ -org.apache.cxf.xjc.ts.ToStringPlugin -org.apache.cxf.xjc.dv.DefaultValuePlugin Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,2 @@ +org.apache.cxf.xjc.ts.ToStringPlugin +org.apache.cxf.xjc.dv.DefaultValuePlugin Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2008-04-23 20:09:00 UTC (rev 6640) @@ -1 +0,0 @@ -org.apache.cxf.jaxws.spi.ProviderImpl Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1 @@ +org.apache.cxf.jaxws.spi.ProviderImpl Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,2 +0,0 @@ -org.apache.cxf.bus.spring.SpringBusFactory -org.springframework.context.ApplicationContext \ No newline at end of file Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,2 @@ +org.apache.cxf.bus.spring.SpringBusFactory +org.springframework.context.ApplicationContext \ No newline at end of file Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/spring.handlers 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,259 +0,0 @@ -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/jaxws=org.apache.cxf.jaxws.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/ws/rm/manager=org.apache.cxf.ws.rm.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/ws/addressing=org.apache.cxf.ws.addressing.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/bindings/object=org.apache.cxf.binding.object.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/transports/http-jetty/configuration=org.apache.cxf.transport.http_jetty.spring.NamespaceHandler - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/transports/http/configuration=org.apache.cxf.transport.http.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/simple=org.apache.cxf.frontend.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/policy=org.apache.cxf.ws.policy.spring.NamespaceHandler -http\://www.w3.org/ns/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler -http\://www.w3.org/2006/07/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler -http\://schemas.xmlsoap.org/ws/2004/09/policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/clustering=org.apache.cxf.clustering.spring.NamespaceHandler -http\://cxf.apache.org/core=org.apache.cxf.bus.spring.NamespaceHandler - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/transports/jms=org.apache.cxf.transport.jms.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/bindings/soap=org.apache.cxf.binding.soap.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/binding/coloc=org.apache.cxf.binding.coloc.spring.NamespaceHandler Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/spring.handlers) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.handlers 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,259 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/jaxws=org.apache.cxf.jaxws.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/ws/rm/manager=org.apache.cxf.ws.rm.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/ws/addressing=org.apache.cxf.ws.addressing.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/bindings/object=org.apache.cxf.binding.object.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/transports/http-jetty/configuration=org.apache.cxf.transport.http_jetty.spring.NamespaceHandler + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/transports/http/configuration=org.apache.cxf.transport.http.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/simple=org.apache.cxf.frontend.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/policy=org.apache.cxf.ws.policy.spring.NamespaceHandler +http\://www.w3.org/ns/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler +http\://www.w3.org/2006/07/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler +http\://schemas.xmlsoap.org/ws/2004/09/policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/clustering=org.apache.cxf.clustering.spring.NamespaceHandler +http\://cxf.apache.org/core=org.apache.cxf.bus.spring.NamespaceHandler + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/transports/jms=org.apache.cxf.transport.jms.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/bindings/soap=org.apache.cxf.binding.soap.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/binding/coloc=org.apache.cxf.binding.coloc.spring.NamespaceHandler Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/spring.schemas 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,293 +0,0 @@ -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/jaxws.xsd=schemas/jaxws.xsd -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/configuration/wsrm-manager-types.xsd=schemas/configuration/wsrm-manager-types.xsd -http\://cxf.apache.org/schemas/configuration/wsrm-manager.xsd=schemas/configuration/wsrm-manager.xsd -http\://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd=schemas/configuration/wsrm-policy.xsd -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/ws/addressing.xsd=schemas/ws-addr-conf.xsd -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schema/bindings/object.xsd=org/apache/cxf/binding/soap/spring/object.xsd -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/configuration/http-jetty.xsd=schemas/configuration/http-jetty.xsd - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/wsdl/http-conf.xsd=schemas/wsdl/http-conf.xsd -http\://cxf.apache.org/schemas/configuration/http-conf.xsd=schemas/configuration/http-conf.xsd - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/simple.xsd=schemas/simple.xsd -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://www.w3.org/2007/02/ws-policy.xsd=schemas/ws-policy-200702.xsd -http\://www.w3.org/2006/07/ws-policy.xsd=schemas/ws-policy-200607.xsd -http\://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd=schemas/ws-policy-200409.xsd -http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd -http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd -http\://www.w3.org/2001/xml.xsd=schemas/xml.xsd -http\://cxf.apache.org/schemas/policy.xsd=schemas/policy.xsd - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/wsdl/jms.xsd=schemas/wsdl/jms.xsd -http\://cxf.apache.org/schemas/configuration/jms.xsd=schemas/configuration/jms.xsd - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd -http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd -http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd - -http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd - - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/configuration/soap.xsd=schemas/configuration/soap.xsd Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/spring.schemas) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/spring.schemas 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,293 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/jaxws.xsd=schemas/jaxws.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/configuration/wsrm-manager-types.xsd=schemas/configuration/wsrm-manager-types.xsd +http\://cxf.apache.org/schemas/configuration/wsrm-manager.xsd=schemas/configuration/wsrm-manager.xsd +http\://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd=schemas/configuration/wsrm-policy.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/ws/addressing.xsd=schemas/ws-addr-conf.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schema/bindings/object.xsd=org/apache/cxf/binding/soap/spring/object.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/configuration/http-jetty.xsd=schemas/configuration/http-jetty.xsd + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/wsdl/http-conf.xsd=schemas/wsdl/http-conf.xsd +http\://cxf.apache.org/schemas/configuration/http-conf.xsd=schemas/configuration/http-conf.xsd + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/simple.xsd=schemas/simple.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://www.w3.org/2007/02/ws-policy.xsd=schemas/ws-policy-200702.xsd +http\://www.w3.org/2006/07/ws-policy.xsd=schemas/ws-policy-200607.xsd +http\://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd=schemas/ws-policy-200409.xsd +http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd +http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd +http\://www.w3.org/2001/xml.xsd=schemas/xml.xsd +http\://cxf.apache.org/schemas/policy.xsd=schemas/policy.xsd + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/wsdl/jms.xsd=schemas/wsdl/jms.xsd +http\://cxf.apache.org/schemas/configuration/jms.xsd=schemas/configuration/jms.xsd + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd +http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd +http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd + +http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd + + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/configuration/soap.xsd=schemas/configuration/soap.xsd Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<plugin xmlns="http://cxf.apache.org/tools/plugin" name="default" version="" provider="cxf.apache.org"> - <databinding name="jaxb" package="org.apache.cxf.tools.wsdlto.databinding.jaxb" profile="JAXBDataBinding"/> - <frontend name="jaxws" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile"> - <container name="JAXWSContainer" toolspec="jaxws-toolspec.xml"/> - <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/> - <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11"/> - <generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators"> - <generator name="AntGenerator"/> - <generator name="ClientGenerator"/> - <generator name="FaultGenerator"/> - <generator name="ImplGenerator"/> - <generator name="SEIGenerator"/> - <generator name="ServerGenerator"/> - <generator name="ServiceGenerator"/> - </generators> - </frontend> -</plugin> \ No newline at end of file Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/tools-plugin.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<plugin xmlns="http://cxf.apache.org/tools/plugin" name="default" version="" provider="cxf.apache.org"> + <databinding name="jaxb" package="org.apache.cxf.tools.wsdlto.databinding.jaxb" profile="JAXBDataBinding"/> + <frontend name="jaxws" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile"> + <container name="JAXWSContainer" toolspec="jaxws-toolspec.xml"/> + <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/> + <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11"/> + <generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators"> + <generator name="AntGenerator"/> + <generator name="ClientGenerator"/> + <generator name="FaultGenerator"/> + <generator name="ImplGenerator"/> + <generator name="SEIGenerator"/> + <generator name="ServerGenerator"/> + <generator name="ServiceGenerator"/> + </generators> + </frontend> +</plugin> \ No newline at end of file Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> -<properties> - <entry key="xml-javax.wsdl.Port">org.apache.cxf.binding.xml.wsdl11.HttpAddressPlugin</entry> - <entry key="xml-javax.wsdl.Binding">org.apache.cxf.binding.xml.wsdl11.XmlBindingPlugin</entry> - <entry key="xml-javax.wsdl.BindingInput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry> - <entry key="xml-javax.wsdl.BindingOutput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry> -</properties> Copied: stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml) =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/wsdl.plugin.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> + <entry key="xml-javax.wsdl.Port">org.apache.cxf.binding.xml.wsdl11.HttpAddressPlugin</entry> + <entry key="xml-javax.wsdl.Binding">org.apache.cxf.binding.xml.wsdl11.XmlBindingPlugin</entry> + <entry key="xml-javax.wsdl.BindingInput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry> + <entry key="xml-javax.wsdl.BindingOutput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry> +</properties> Copied: stack/cxf/trunk/modules/management (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/management) Property changes on: stack/cxf/trunk/modules/management ___________________________________________________________________ Name: svn:ignore + target Deleted: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/management/pom.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,25 +0,0 @@ -<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>JBoss Web Services - Stack CXF Management</name> - <artifactId>jbossws-cxf-management</artifactId> - <packaging>war</packaging> - - <parent> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf</artifactId> - <version>3.0.2-SNAPSHOT</version> - </parent> - - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> - </configuration> - </plugin> - </plugins> - </build> -</project> Copied: stack/cxf/trunk/modules/management/pom.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml) =================================================================== --- stack/cxf/trunk/modules/management/pom.xml (rev 0) +++ stack/cxf/trunk/modules/management/pom.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,25 @@ +<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>JBoss Web Services - Stack CXF Management</name> + <artifactId>jbossws-cxf-management</artifactId> + <packaging>war</packaging> + + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes> + </configuration> + </plugin> + </plugins> + </build> +</project> Copied: stack/cxf/trunk/modules/management/src (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/management/src) Copied: stack/cxf/trunk/modules/management/src/main (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/management/src/main) Copied: stack/cxf/trunk/modules/management/src/main/webapp (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/management/src/main/webapp) Copied: stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/management/src/main/webapp/WEB-INF) Deleted: stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<!DOCTYPE jboss-web - PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN" - "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd"> - -<jboss-web> - -  - <context-root>jbossws</context-root> - -</jboss-web> Copied: stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml) =================================================================== --- stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml (rev 0) +++ stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/jboss-web.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!DOCTYPE jboss-web + PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd"> + +<jboss-web> + +  + <context-root>jbossws</context-root> + +</jboss-web> Deleted: stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/web.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/management/src/main/webapp/WEB-INF/web.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/web.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - - - -<web-app version="2.4" 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"> - - <display-name>JBossWS</display-name> - - <servlet> - <servlet-name>ContextServlet</servlet-name> - <servlet-class>org.jboss.wsf.framework.management.ContextServlet</servlet-class> - </servlet> - -  - - <servlet-mapping> - <servlet-name>ContextServlet</servlet-name> - <url-pattern>/services/*</url-pattern> - </servlet-mapping> - -  - <mime-mapping> - <extension>wsdl</extension> - <mime-type>text/xml</mime-type> - </mime-mapping> - - <mime-mapping> - <extension>xsd</extension> - <mime-type>text/xml</mime-type> - </mime-mapping> - - <welcome-file-list id="WelcomeFileList"> - <welcome-file>index.html</welcome-file> - </welcome-file-list> - -</web-app> Copied: stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/web.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/management/src/main/webapp/WEB-INF/web.xml) =================================================================== --- stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/management/src/main/webapp/WEB-INF/web.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<web-app version="2.4" 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"> + + <display-name>JBossWS</display-name> + + <servlet> + <servlet-name>ContextServlet</servlet-name> + <servlet-class>org.jboss.wsf.framework.management.ContextServlet</servlet-class> + </servlet> + +  + + <servlet-mapping> + <servlet-name>ContextServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping> + +  + <mime-mapping> + <extension>wsdl</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <mime-mapping> + <extension>xsd</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <welcome-file-list id="WelcomeFileList"> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + +</web-app> Deleted: stack/cxf/trunk/modules/management/src/main/webapp/index.html =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/management/src/main/webapp/index.html 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/management/src/main/webapp/index.html 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,66 +0,0 @@ -<html><head> -<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'> -<title>JBossWS (@implementation.version@)</title> -<link rel='stylesheet' href='./styles.css'> -</head> -<body> - -<div class='pageHeader'>JBossWS</div> - -<div class="pageSection"> -<h2>Welcome to JBoss Web Services</h2> -JBossWS is a JAX-WS compliant web service stack developed to be part of JBoss' JavaEE5 offering. -</div> - -<div class="pageSection"> -<h3>Administration</h3> - -<fieldset> - <legend><b>Runtime information</b></legend> -<ul> - <li><b>Revision: @implementation.version@</b></li> - <li><b>Build: @build.id@</b></li> - <li><a href="services">View a list of deployed services</a></li> -  - <li><a href="/jmx-console/">Access JMX console</a></li> -</ul> -</fieldset> -</div> - -<div class="pageSection"> -<h3>Project information</h3> - -<fieldset> - <legend><b>Documentation</b></legend> - -<ul> - <li><a href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and samples</a></li> - <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JBossWS_FAQs">FAQ</a></li> - <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JAX-WS_User_Guide">User guide</a></li> - <li><a href="http://jbws.dyndns.org/mediawiki/index.php/Main_Page">JBossWS WIKI</a></li> - <li><a href="http://jbws.dyndns.org/mediawiki/index.php?title=Records_management">Records management</a></li> -</ul> -</fieldset> - -</br> -<fieldset> - <legend><b>Community</b></legend> -<ul> - <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=276">User forum</a></li> - <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=174">Design forum</a></li> - <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users">Mailing list</a></li> -</ul> -</fieldset> - -</br> -<fieldset> - <legend><b>Source repository</b></legend> -<ul> - <li><a href="http://jbws.dyndns.org/mediawiki/index.php?title=Subversion">Subversion repository</a></li> - <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li> -</ul> -</fieldset> -</div> - -</body> -</html> Copied: stack/cxf/trunk/modules/management/src/main/webapp/index.html (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/management/src/main/webapp/index.html) =================================================================== --- stack/cxf/trunk/modules/management/src/main/webapp/index.html (rev 0) +++ stack/cxf/trunk/modules/management/src/main/webapp/index.html 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,66 @@ +<html><head> +<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'> +<title>JBossWS (@implementation.version@)</title> +<link rel='stylesheet' href='./styles.css'> +</head> +<body> + +<div class='pageHeader'>JBossWS</div> + +<div class="pageSection"> +<h2>Welcome to JBoss Web Services</h2> +JBossWS is a JAX-WS compliant web service stack developed to be part of JBoss' JavaEE5 offering. +</div> + +<div class="pageSection"> +<h3>Administration</h3> + +<fieldset> + <legend><b>Runtime information</b></legend> +<ul> + <li><b>Revision: @implementation.version@</b></li> + <li><b>Build: @build.id@</b></li> + <li><a href="services">View a list of deployed services</a></li> +  + <li><a href="/jmx-console/">Access JMX console</a></li> +</ul> +</fieldset> +</div> + +<div class="pageSection"> +<h3>Project information</h3> + +<fieldset> + <legend><b>Documentation</b></legend> + +<ul> + <li><a href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and samples</a></li> + <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JBossWS_FAQs">FAQ</a></li> + <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JAX-WS_User_Guide">User guide</a></li> + <li><a href="http://jbws.dyndns.org/mediawiki/index.php/Main_Page">JBossWS WIKI</a></li> + <li><a href="http://jbws.dyndns.org/mediawiki/index.php?title=Records_management">Records management</a></li> +</ul> +</fieldset> + +</br> +<fieldset> + <legend><b>Community</b></legend> +<ul> + <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=276">User forum</a></li> + <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=174">Design forum</a></li> + <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users">Mailing list</a></li> +</ul> +</fieldset> + +</br> +<fieldset> + <legend><b>Source repository</b></legend> +<ul> + <li><a href="http://jbws.dyndns.org/mediawiki/index.php?title=Subversion">Subversion repository</a></li> + <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li> +</ul> +</fieldset> +</div> + +</body> +</html> Deleted: stack/cxf/trunk/modules/management/src/main/webapp/styles.css =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/management/src/main/webapp/styles.css 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/management/src/main/webapp/styles.css 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,186 +0,0 @@ - -/* table for list views */ -.table_list { -} - -/* table for detail views */ -.table_form { -} - -.pageHeader { - font-size: 14pt; - font-weight: BOLD; - color: #ffffff; - border-bottom-width:1px; - border-bottom-style:solid; - border-color:#000066; - margin-bottom:15px; - padding-left:15px; - padding-top:5px; - padding-bottom:5px; - background-color: #3b4f66; - max-width: 900px; -} - -.pageSection { - padding-left:15px; - margin-bottom: 5px; - max-width: 900px; -} - -.metrics -{ - font-size: 6pt; - background-color: #dddddd; - width: 100%; -} - -/* table row header */ -.list_tr_head { - font-family: Verdana, sans-serif; - font-size: 8pt; - font-weight: 600; - text-align: center; - background-color: #3b4f66; -} - -/* table row list view */ -.list_tr { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; - vertical-align: top; - background-color: #ffffff; -} - -/* table row list view odd lines */ -.list_tr_even { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; - vertical-align: top; - background-color: #ffffff; -} - -/* table row list view even lines */ -.list_tr_odd { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; - vertical-align: top; - background-color: #dddddd; -} - -/* form label */ -.form_label { - font-family: Verdana, sans-serif; - font-weight: 500; - font-size: 8pt; - color: #000066; - vertical-align: top; - background-color: #dddddd; - padding-top: 2px; - padding-bottom: 2px; -} - -/* form value */ -.form_value { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; - vertical-align: baseline; -} - -/* tiny writing */ -.tiny { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #666666; -} - -/* required input fields */ -.inputmust { - background-color: #dddddd; -} - -/* error message */ -.error { - font-family: Courier New; - color: #990000; -} - -/* error message */ -.error_trace { - font-family: Courier New; -} - -/* active tree node */ -.tree_active_label { - font-weight: bold; -} - -body { - font-family: Verdana,, sans-serif; - font-size: 8pt; - color: #000066; - background-color: #ffffff; -} - -/* title style */ -h1 { - font-family: Verdana, sans-serif; - font-size: 14pt; - font-weight: 600; - color: #000066; -} - -h2 { - font-family: Verdana, sans-serif; - font-size: 12pt; - font-weight: 600; - color: #000066; -} - -h3 { - font-family: Verdana, sans-serif; - font-size: 10pt; - font-weight: 600; - color: #000066; -} - -h4 { - font-family: Verdana, sans-serif; - font-size: 10pt; - font-weight: 500; - color: #000066; -} - -/* table desk */ -td { - font-family: Verdana, sans-serif; - font-size: 8pt; - padding-left: 5px; - padding-right: 5px; -} - -input, textarea, select, option { - font-family: Verdana, sans-serif; - font-size: 8pt; - color: #000066; -} - -a { - font-family: Verdana, sans-serif; - color: #3b4f66; - text-decoration: none; -} - -a:hover{ - font-family: Verdana, sans-serif; - color: #cc0000; - text-decoration: none; -} - -pre { - background:#dddddd -} \ No newline at end of file Copied: stack/cxf/trunk/modules/management/src/main/webapp/styles.css (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/management/src/main/webapp/styles.css) =================================================================== --- stack/cxf/trunk/modules/management/src/main/webapp/styles.css (rev 0) +++ stack/cxf/trunk/modules/management/src/main/webapp/styles.css 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,186 @@ + +/* table for list views */ +.table_list { +} + +/* table for detail views */ +.table_form { +} + +.pageHeader { + font-size: 14pt; + font-weight: BOLD; + color: #ffffff; + border-bottom-width:1px; + border-bottom-style:solid; + border-color:#000066; + margin-bottom:15px; + padding-left:15px; + padding-top:5px; + padding-bottom:5px; + background-color: #3b4f66; + max-width: 900px; +} + +.pageSection { + padding-left:15px; + margin-bottom: 5px; + max-width: 900px; +} + +.metrics +{ + font-size: 6pt; + background-color: #dddddd; + width: 100%; +} + +/* table row header */ +.list_tr_head { + font-family: Verdana, sans-serif; + font-size: 8pt; + font-weight: 600; + text-align: center; + background-color: #3b4f66; +} + +/* table row list view */ +.list_tr { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #ffffff; +} + +/* table row list view odd lines */ +.list_tr_even { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #ffffff; +} + +/* table row list view even lines */ +.list_tr_odd { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #dddddd; +} + +/* form label */ +.form_label { + font-family: Verdana, sans-serif; + font-weight: 500; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #dddddd; + padding-top: 2px; + padding-bottom: 2px; +} + +/* form value */ +.form_value { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: baseline; +} + +/* tiny writing */ +.tiny { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #666666; +} + +/* required input fields */ +.inputmust { + background-color: #dddddd; +} + +/* error message */ +.error { + font-family: Courier New; + color: #990000; +} + +/* error message */ +.error_trace { + font-family: Courier New; +} + +/* active tree node */ +.tree_active_label { + font-weight: bold; +} + +body { + font-family: Verdana,, sans-serif; + font-size: 8pt; + color: #000066; + background-color: #ffffff; +} + +/* title style */ +h1 { + font-family: Verdana, sans-serif; + font-size: 14pt; + font-weight: 600; + color: #000066; +} + +h2 { + font-family: Verdana, sans-serif; + font-size: 12pt; + font-weight: 600; + color: #000066; +} + +h3 { + font-family: Verdana, sans-serif; + font-size: 10pt; + font-weight: 600; + color: #000066; +} + +h4 { + font-family: Verdana, sans-serif; + font-size: 10pt; + font-weight: 500; + color: #000066; +} + +/* table desk */ +td { + font-family: Verdana, sans-serif; + font-size: 8pt; + padding-left: 5px; + padding-right: 5px; +} + +input, textarea, select, option { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; +} + +a { + font-family: Verdana, sans-serif; + color: #3b4f66; + text-decoration: none; +} + +a:hover{ + font-family: Verdana, sans-serif; + color: #cc0000; + text-decoration: none; +} + +pre { + background:#dddddd +} \ No newline at end of file Copied: stack/cxf/trunk/modules/server (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server) Property changes on: stack/cxf/trunk/modules/server ___________________________________________________________________ Name: svn:ignore + target Deleted: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/pom.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,186 +0,0 @@ -<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>JBoss Web Services - Stack CXF Runtime Server</name> - <artifactId>jbossws-cxf-server</artifactId> - <packaging>jar</packaging> - -  - <parent> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf</artifactId> - <version>3.0.2-SNAPSHOT</version> - </parent> - -  - <dependencies> - -  - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <classifier>scripts</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - -  - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-soap</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxws</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http-jetty</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-jms</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-rm</artifactId> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-ws-policy</artifactId> - </dependency> - <dependency> - <groupId>javax.xml</groupId> - <artifactId>jaxrpc-api</artifactId> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </dependency> - -  - <dependency> - <groupId>jboss.common</groupId> - <artifactId>jboss-common</artifactId> - </dependency> - -  - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-xjc</artifactId> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> - <groupId>jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <type>sar</type> - </dependency> - </dependencies> - -  - <build> - <resources> - <resource> - <targetPath>/</targetPath> - <directory>src/main/resources/jbossws-cxf-server.jar</directory> - </resource> - <resource> - <targetPath>../resources/jbossws-cxf.sar</targetPath> - <directory>src/main/resources/jbossws-cxf.sar</directory> - </resource> - </resources> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>package</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems>org.jboss.ws:jbossws-jboss42:zip:resources</artifactItems> - <artifactItems> - <artifactItem> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> - <version>${jbossws.jboss42.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> -  - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant antfile="src/main/scripts/antrun-beans-config.xml"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -  - <profiles> - <profile> - <id>jboss422-profile</id> - <activation> - <property> - <name>env</name> - <value>jboss422</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> - -</project> Copied: stack/cxf/trunk/modules/server/pom.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml) =================================================================== --- stack/cxf/trunk/modules/server/pom.xml (rev 0) +++ stack/cxf/trunk/modules/server/pom.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,186 @@ +<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>JBoss Web Services - Stack CXF Runtime Server</name> + <artifactId>jbossws-cxf-server</artifactId> + <packaging>jar</packaging> + +  + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + +  + <dependencies> + +  + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <classifier>scripts</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + <classifier>resources</classifier> + <type>zip</type> + </dependency> + +  + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-bindings-soap</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http-jetty</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-jms</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-rm</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </dependency> + +  + <dependency> + <groupId>jboss.common</groupId> + <artifactId>jboss-common</artifactId> + </dependency> + +  + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>jboss.jaxr</groupId> + <artifactId>juddi-service</artifactId> + <type>sar</type> + </dependency> + </dependencies> + +  + <build> + <resources> + <resource> + <targetPath>/</targetPath> + <directory>src/main/resources/jbossws-cxf-server.jar</directory> + </resource> + <resource> + <targetPath>../resources/jbossws-cxf.sar</targetPath> + <directory>src/main/resources/jbossws-cxf.sar</directory> + </resource> + </resources> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems>org.jboss.ws:jbossws-jboss42:zip:resources</artifactItems> + <artifactItems> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + <version>${jbossws.jboss42.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> +  + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant antfile="src/main/scripts/antrun-beans-config.xml"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +  + <profiles> + <profile> + <id>jboss422-profile</id> + <activation> + <property> + <name>env</name> + <value>jboss422</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> + +</project> Copied: stack/cxf/trunk/modules/server/src (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src) Copied: stack/cxf/trunk/modules/server/src/main (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main) Copied: stack/cxf/trunk/modules/server/src/main/java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java) Copied: stack/cxf/trunk/modules/server/src/main/java/org (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org) Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss) Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf) Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack) Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf) Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,152 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; - -//$Id$ - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.MessageContext.Scope; - -import org.apache.cxf.frontend.MethodDispatcher; -import org.apache.cxf.helpers.CastUtils; -import org.apache.cxf.jaxws.context.WebServiceContextImpl; -import org.apache.cxf.jaxws.context.WrappedMessageContext; -import org.apache.cxf.jaxws.support.ContextPropertiesMapping; -import org.apache.cxf.message.Exchange; -import org.apache.cxf.message.MessageContentsList; -import org.apache.cxf.service.Service; -import org.apache.cxf.service.invoker.Invoker; -import org.apache.cxf.service.model.BindingOperationInfo; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.EndpointAssociation; -import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.InvocationContext; -import org.jboss.wsf.spi.invocation.InvocationHandler; - -/** - * An abstract CXF invoker - * - * @author Thomas.Diesler(a)jboss.org - * @since 06-Dec-2007 - */ -public abstract class AbstractInvoker implements Invoker -{ - public Object invoke(Exchange exchange, Object o) - { - // set up the webservice request context - MessageContext msgCtx = ContextPropertiesMapping.createWebServiceContext(exchange); - - Map<String, Scope> scopes = CastUtils.cast((Map<?, ?>)msgCtx.get(WrappedMessageContext.SCOPES)); - Map<String, Object> handlerScopedStuff = new HashMap<String, Object>(); - if (scopes != null) - { - for (Map.Entry<String, Scope> scope : scopes.entrySet()) - { - if (scope.getValue() == Scope.HANDLER) - { - handlerScopedStuff.put(scope.getKey(), msgCtx.get(scope.getKey())); - } - } - for (String key : handlerScopedStuff.keySet()) - { - msgCtx.remove(key); - } - } - - WebServiceContextImpl.setMessageContext(msgCtx); - - BindingOperationInfo bop = exchange.get(BindingOperationInfo.class); - MethodDispatcher md = (MethodDispatcher)exchange.get(Service.class).get(MethodDispatcher.class.getName()); - Method m = md.getMethod(bop); - - Object[] params; - if (o instanceof List<?>) - { - List<Object> paramList = CastUtils.cast((List<?>)o); - params = paramList.toArray(); - } - else - { - params = new Object[]{o}; - } - - Endpoint ep = EndpointAssociation.getEndpoint(); - InvocationHandler invHandler = ep.getInvocationHandler(); - - Invocation inv = invHandler.createInvocation(); - InvocationContext invContext = inv.getInvocationContext(); - inv.getInvocationContext().addAttachment(WebServiceContext.class, getWebServiceContext(msgCtx)); - invContext.addAttachment(MessageContext.class, msgCtx); - inv.setJavaMethod(m); - inv.setArgs(params); - - Object retObj = null; - try - { - invContext.setTargetBean(getTargetBean(ep)); - invHandler.invoke(ep, inv); - retObj = inv.getReturnValue(); - } - catch (Exception ex) - { - handleException(ex); - } - - for (Map.Entry<String, Object> key : handlerScopedStuff.entrySet()) - { - msgCtx.put(key.getKey(), key.getValue()); - msgCtx.setScope(key.getKey(), Scope.HANDLER); - } - - //update the webservice response context - ContextPropertiesMapping.updateWebServiceContext(exchange, msgCtx); - //clear the WebServiceContextImpl's ThreadLocal variable - WebServiceContextImpl.clear(); - - return new MessageContentsList(retObj); - } - - protected abstract WebServiceContext getWebServiceContext(MessageContext msgCtx); - - protected Object getTargetBean(Endpoint ep) throws InstantiationException, IllegalAccessException - { - Class beanClass = ep.getTargetBeanClass(); - return beanClass.newInstance(); - } - - protected void handleException(Exception ex) - { - Throwable th = ex; - if (ex instanceof InvocationTargetException) - th = ((InvocationTargetException)ex).getTargetException(); - - throw new RuntimeException(th); - } - -} \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,152 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; + +//$Id$ + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.MessageContext.Scope; + +import org.apache.cxf.frontend.MethodDispatcher; +import org.apache.cxf.helpers.CastUtils; +import org.apache.cxf.jaxws.context.WebServiceContextImpl; +import org.apache.cxf.jaxws.context.WrappedMessageContext; +import org.apache.cxf.jaxws.support.ContextPropertiesMapping; +import org.apache.cxf.message.Exchange; +import org.apache.cxf.message.MessageContentsList; +import org.apache.cxf.service.Service; +import org.apache.cxf.service.invoker.Invoker; +import org.apache.cxf.service.model.BindingOperationInfo; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.EndpointAssociation; +import org.jboss.wsf.spi.invocation.Invocation; +import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.invocation.InvocationHandler; + +/** + * An abstract CXF invoker + * + * @author Thomas.Diesler(a)jboss.org + * @since 06-Dec-2007 + */ +public abstract class AbstractInvoker implements Invoker +{ + public Object invoke(Exchange exchange, Object o) + { + // set up the webservice request context + MessageContext msgCtx = ContextPropertiesMapping.createWebServiceContext(exchange); + + Map<String, Scope> scopes = CastUtils.cast((Map<?, ?>)msgCtx.get(WrappedMessageContext.SCOPES)); + Map<String, Object> handlerScopedStuff = new HashMap<String, Object>(); + if (scopes != null) + { + for (Map.Entry<String, Scope> scope : scopes.entrySet()) + { + if (scope.getValue() == Scope.HANDLER) + { + handlerScopedStuff.put(scope.getKey(), msgCtx.get(scope.getKey())); + } + } + for (String key : handlerScopedStuff.keySet()) + { + msgCtx.remove(key); + } + } + + WebServiceContextImpl.setMessageContext(msgCtx); + + BindingOperationInfo bop = exchange.get(BindingOperationInfo.class); + MethodDispatcher md = (MethodDispatcher)exchange.get(Service.class).get(MethodDispatcher.class.getName()); + Method m = md.getMethod(bop); + + Object[] params; + if (o instanceof List<?>) + { + List<Object> paramList = CastUtils.cast((List<?>)o); + params = paramList.toArray(); + } + else + { + params = new Object[]{o}; + } + + Endpoint ep = EndpointAssociation.getEndpoint(); + InvocationHandler invHandler = ep.getInvocationHandler(); + + Invocation inv = invHandler.createInvocation(); + InvocationContext invContext = inv.getInvocationContext(); + inv.getInvocationContext().addAttachment(WebServiceContext.class, getWebServiceContext(msgCtx)); + invContext.addAttachment(MessageContext.class, msgCtx); + inv.setJavaMethod(m); + inv.setArgs(params); + + Object retObj = null; + try + { + invContext.setTargetBean(getTargetBean(ep)); + invHandler.invoke(ep, inv); + retObj = inv.getReturnValue(); + } + catch (Exception ex) + { + handleException(ex); + } + + for (Map.Entry<String, Object> key : handlerScopedStuff.entrySet()) + { + msgCtx.put(key.getKey(), key.getValue()); + msgCtx.setScope(key.getKey(), Scope.HANDLER); + } + + //update the webservice response context + ContextPropertiesMapping.updateWebServiceContext(exchange, msgCtx); + //clear the WebServiceContextImpl's ThreadLocal variable + WebServiceContextImpl.clear(); + + return new MessageContentsList(retObj); + } + + protected abstract WebServiceContext getWebServiceContext(MessageContext msgCtx); + + protected Object getTargetBean(Endpoint ep) throws InstantiationException, IllegalAccessException + { + Class beanClass = ep.getTargetBeanClass(); + return beanClass.newInstance(); + } + + protected void handleException(Exception ex) + { + Throwable th = ex; + if (ex instanceof InvocationTargetException) + th = ((InvocationTargetException)ex).getTargetException(); + + throw new RuntimeException(th); + } + +} \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; - -//$Id$ - -import org.jboss.logging.Logger; -import org.jboss.wsf.common.management.AbstractServerConfig; - -/** - * Basic implementation of a ServerConfig - * - * @author Thomas.Diesler(a)jboss.org - * @since 08-May-2006 - */ -public class CXFServerConfig extends AbstractServerConfig implements CXFServerConfigMBean -{ - private static final Logger log = Logger.getLogger(CXFServerConfig.class); - - public String getImplementationTitle() - { - return getClass().getPackage().getImplementationTitle(); - } - - public String getImplementationVersion() - { - return getClass().getPackage().getImplementationVersion(); - } - - public void create() throws Exception - { - log.info(getImplementationTitle()); - log.info(getImplementationVersion()); - super.create(); - } -} Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; + +//$Id$ + +import org.jboss.logging.Logger; +import org.jboss.wsf.common.management.AbstractServerConfig; + +/** + * Basic implementation of a ServerConfig + * + * @author Thomas.Diesler(a)jboss.org + * @since 08-May-2006 + */ +public class CXFServerConfig extends AbstractServerConfig implements CXFServerConfigMBean +{ + private static final Logger log = Logger.getLogger(CXFServerConfig.class); + + public String getImplementationTitle() + { + return getClass().getPackage().getImplementationTitle(); + } + + public String getImplementationVersion() + { + return getClass().getPackage().getImplementationVersion(); + } + + public void create() throws Exception + { + log.info(getImplementationTitle()); + log.info(getImplementationVersion()); + super.create(); + } +} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; - -//$Id$ - -import org.jboss.wsf.common.management.AbstractServerConfigMBean; - -/** - * Basic implementation of a ServerConfig - * - * @author Thomas.Diesler(a)jboss.org - * @since 08-May-2006 - */ -public interface CXFServerConfigMBean extends AbstractServerConfigMBean -{ - String getImplementationTitle(); - - String getImplementationVersion(); -} Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; + +//$Id$ + +import org.jboss.wsf.common.management.AbstractServerConfigMBean; + +/** + * Basic implementation of a ServerConfig + * + * @author Thomas.Diesler(a)jboss.org + * @since 08-May-2006 + */ +public interface CXFServerConfigMBean extends AbstractServerConfigMBean +{ + String getImplementationTitle(); + + String getImplementationVersion(); +} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,182 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; - -//$Id$ - -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; - -import javax.management.ObjectName; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.ws.WebServiceException; - -import org.apache.cxf.transport.servlet.CXFServlet; -import org.apache.cxf.transport.servlet.ServletController; -import org.apache.cxf.transport.servlet.ServletTransportFactory; -import org.jboss.logging.Logger; -import org.jboss.wsf.common.ObjectNameFactory; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.EndpointAssociation; -import org.jboss.wsf.spi.invocation.RequestHandler; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.GenericApplicationContext; -import org.springframework.core.io.InputStreamResource; - -/** - * An extension to the CXF servlet - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Apr-2007 - */ -public class CXFServletExt extends CXFServlet -{ - public static final String PARAM_CXF_BEANS_URL = "jbossws.cxf.beans.url"; - - private static Logger log = Logger.getLogger(CXFServletExt.class); - - protected Endpoint endpoint; - protected EndpointRegistry epRegistry; - protected GenericApplicationContext childCtx; - - @Override - public void init(ServletConfig servletConfig) throws ServletException - { - super.init(servletConfig); - - // Init the Endpoint - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - - ServletContext context = servletConfig.getServletContext(); - String contextPath = context.getContextPath(); - endpoint = initServiceEndpoint(contextPath); - - context.setAttribute(ServletController.class.getName(), getController()); - } - - @Override - public ServletController createServletController(ServletConfig servletConfig) - { - ServletTransportFactory stf = (ServletTransportFactory)createServletTransportFactory(); - return new ServletControllerExt(stf, this); - } - - @Override - public void loadBus(ServletConfig servletConfig) throws ServletException - { - super.loadBus(servletConfig); - - ServletContext svCtx = getServletContext(); - ApplicationContext appCtx = (ApplicationContext)svCtx.getAttribute("org.springframework.web.context.WebApplicationContext.ROOT"); - - loadAdditionalConfigExt(appCtx, servletConfig); - } - - private void loadAdditionalConfigExt(ApplicationContext ctx, ServletConfig servletConfig) throws ServletException - { - String location = servletConfig.getServletContext().getInitParameter(PARAM_CXF_BEANS_URL); - if (location != null) - { - InputStream is; - try - { - is = new URL(location).openStream(); - } - catch (IOException e) - { - throw new ServletException(e); - } - - childCtx = new GenericApplicationContext(ctx); - XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(childCtx); - reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD); - reader.loadBeanDefinitions(new InputStreamResource(is, location)); - - childCtx.refresh(); - } - } - - @Override - public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - try - { - EndpointAssociation.setEndpoint(endpoint); - RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); - requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); - } - finally - { - EndpointAssociation.removeEndpoint(); - } - } - - @Override - public void destroy() - { - if (childCtx != null) - childCtx.destroy(); - - super.destroy(); - } - - /** Initialize the service endpoint - */ - private Endpoint initServiceEndpoint(String contextPath) - { - if (contextPath.startsWith("/")) - contextPath = contextPath.substring(1); - - Endpoint endpoint = null; - String servletName = getServletName(); - for (ObjectName sepId : epRegistry.getEndpoints()) - { - String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); - String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) - { - endpoint = epRegistry.getEndpoint(sepId); - break; - } - } - - if (endpoint == null) - { - ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," - + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName); - throw new WebServiceException("Cannot obtain endpoint for: " + oname); - } - - return endpoint; - } -} Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,182 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; + +//$Id$ + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; + +import javax.management.ObjectName; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.xml.ws.WebServiceException; + +import org.apache.cxf.transport.servlet.CXFServlet; +import org.apache.cxf.transport.servlet.ServletController; +import org.apache.cxf.transport.servlet.ServletTransportFactory; +import org.jboss.logging.Logger; +import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.EndpointAssociation; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.GenericApplicationContext; +import org.springframework.core.io.InputStreamResource; + +/** + * An extension to the CXF servlet + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Apr-2007 + */ +public class CXFServletExt extends CXFServlet +{ + public static final String PARAM_CXF_BEANS_URL = "jbossws.cxf.beans.url"; + + private static Logger log = Logger.getLogger(CXFServletExt.class); + + protected Endpoint endpoint; + protected EndpointRegistry epRegistry; + protected GenericApplicationContext childCtx; + + @Override + public void init(ServletConfig servletConfig) throws ServletException + { + super.init(servletConfig); + + // Init the Endpoint + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); + + ServletContext context = servletConfig.getServletContext(); + String contextPath = context.getContextPath(); + endpoint = initServiceEndpoint(contextPath); + + context.setAttribute(ServletController.class.getName(), getController()); + } + + @Override + public ServletController createServletController(ServletConfig servletConfig) + { + ServletTransportFactory stf = (ServletTransportFactory)createServletTransportFactory(); + return new ServletControllerExt(stf, this); + } + + @Override + public void loadBus(ServletConfig servletConfig) throws ServletException + { + super.loadBus(servletConfig); + + ServletContext svCtx = getServletContext(); + ApplicationContext appCtx = (ApplicationContext)svCtx.getAttribute("org.springframework.web.context.WebApplicationContext.ROOT"); + + loadAdditionalConfigExt(appCtx, servletConfig); + } + + private void loadAdditionalConfigExt(ApplicationContext ctx, ServletConfig servletConfig) throws ServletException + { + String location = servletConfig.getServletContext().getInitParameter(PARAM_CXF_BEANS_URL); + if (location != null) + { + InputStream is; + try + { + is = new URL(location).openStream(); + } + catch (IOException e) + { + throw new ServletException(e); + } + + childCtx = new GenericApplicationContext(ctx); + XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(childCtx); + reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD); + reader.loadBeanDefinitions(new InputStreamResource(is, location)); + + childCtx.refresh(); + } + } + + @Override + public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + try + { + EndpointAssociation.setEndpoint(endpoint); + RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); + requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); + } + finally + { + EndpointAssociation.removeEndpoint(); + } + } + + @Override + public void destroy() + { + if (childCtx != null) + childCtx.destroy(); + + super.destroy(); + } + + /** Initialize the service endpoint + */ + private Endpoint initServiceEndpoint(String contextPath) + { + if (contextPath.startsWith("/")) + contextPath = contextPath.substring(1); + + Endpoint endpoint = null; + String servletName = getServletName(); + for (ObjectName sepId : epRegistry.getEndpoints()) + { + String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); + String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) + { + endpoint = epRegistry.getEndpoint(sepId); + break; + } + } + + if (endpoint == null) + { + ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," + + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName); + throw new WebServiceException("Cannot obtain endpoint for: " + oname); + } + + return endpoint; + } +} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,213 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; - -//$Id$ - -import java.io.IOException; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.WSFRuntime; -import org.jboss.wsf.stack.cxf.metadata.services.DDBeans; -import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint; - -/** - * A deployer that locates or generates cxf.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-May-2007 - */ -public class DescriptorDeploymentAspect extends DeploymentAspect -{ - // provide logging - private static final Logger log = Logger.getLogger(DescriptorDeploymentAspect.class); - - private String invokerEJB3; - private String invokerJSE; - - public void setInvokerEJB3(String invokerEJB3) - { - this.invokerEJB3 = invokerEJB3; - } - - public void setInvokerJSE(String invokerJSE) - { - this.invokerJSE = invokerJSE; - } - - @Override - public void create(Deployment dep, WSFRuntime runtime) - { - URL cxfURL = getCXFConfigFromClassLoader(dep); - if (cxfURL == null) - { - cxfURL = getCXFConfigFromDeployment(dep); - if (cxfURL == null) - { - cxfURL = generateCXFConfigFromDeployment(dep); - } - putCXFConfigToDeployment(dep, cxfURL); - } - } - - @Override - public void destroy(Deployment dep, WSFRuntime runtime) - { - DDBeans dd = dep.getAttachment(DDBeans.class); - if (dd != null) - { - dd.destroyFileURL(); - } - } - - /** - * Looks for <b>cxf.xml</b> in classloader - * @param dep deployment which initial classloader will be used - * @return <b>cxf.xml URL</b> or <b>null</b> if not found - */ - private static URL getCXFConfigFromClassLoader(Deployment dep) - { - ClassLoader initCL = dep.getInitialClassLoader(); - URL cxfURL = initCL.getResource("cxf.xml"); - if (cxfURL != null) - { - log.info("CXF configuration found: " + cxfURL); - } - return cxfURL; - } - - /** - * Looks for <b>jbossws-cxf.xml</b> in: - * <ul> - * <li><b>META-INF</b> resource directory for EJB3 deployment</li> - * <li><b>WEB-INF</b> resource directory for POJO deployment</li> - * </ul> - * @param dep deployment where to look for resources - * @return <b>jbossws-cxf.xml URL</b> or <b>null</b> if not found - */ - private static URL getCXFConfigFromDeployment(Deployment dep) - { - DeploymentType depType = dep.getType(); - - String metadir; - if (depType == DeploymentType.JAXWS_EJB3) - { - // expected resource location for EJB3 deployments - metadir = "META-INF"; - } - else if (depType == DeploymentType.JAXWS_JSE) - { - // expected resource location for POJO deployments - metadir = "WEB-INF"; - } - else - { - // only POJO and EJB3 deployments are supported - throw new IllegalStateException("Unsupported deployment type: " + depType); - } - - URL cxfURL = null; - try - { - // get resource URL - ArchiveDeployment archDep = (ArchiveDeployment)dep; - cxfURL = archDep.getMetaDataFileURL(metadir + "/jbossws-cxf.xml"); - log.info("JBossWS-CXF configuration found: " + cxfURL); - } - catch (IOException ignore) - { - // resource not found - } - - return cxfURL; - } - - /** - * Generated CXF descriptor from deployment - * @param dep deployment - * @return CXF descriptor URL - */ - private URL generateCXFConfigFromDeployment(Deployment dep) - { - // Generate the jbossws-cxf.xml descriptor - DeploymentType depType = dep.getType(); - - DDBeans dd = new DDBeans(); - for (Endpoint ep : dep.getService().getEndpoints()) - { - String id = ep.getShortName(); - String address = ep.getAddress(); - String implementor = ep.getTargetBeanName(); - - DDEndpoint ddep = new DDEndpoint(id, address, implementor); - - if (depType == DeploymentType.JAXWS_EJB3) - { - ddep.setInvoker(invokerEJB3); - } - - if (depType == DeploymentType.JAXWS_JSE) - { - ddep.setInvoker(invokerJSE); - } - - log.info("Add " + ddep); - dd.addEndpoint(ddep); - } - - URL cxfURL = dd.createFileURL(); - log.info("JBossWS-CXF configuration generated: " + cxfURL); - - dep.addAttachment(DDBeans.class, dd); - - return cxfURL; - } - - /** - * Puts CXF config file to deployment property <b>org.jboss.ws.webapp.ContextParameterMap</b> map - * @param dep deployment where to put - * @param cxfURL to be put - */ - private static void putCXFConfigToDeployment(Deployment dep, URL cxfURL) - { - // get property map - String propKey = "org.jboss.ws.webapp.ContextParameterMap"; - Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); - if (contextParams == null) - { - // if there's no associated map with the property create it now - contextParams = new HashMap<String, String>(); - dep.setProperty(propKey, contextParams); - } - // put cxf config URL to the property map - contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm()); - } - -} Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,213 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; + +//$Id$ + +import java.io.IOException; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.WSFRuntime; +import org.jboss.wsf.stack.cxf.metadata.services.DDBeans; +import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint; + +/** + * A deployer that locates or generates cxf.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-May-2007 + */ +public class DescriptorDeploymentAspect extends DeploymentAspect +{ + // provide logging + private static final Logger log = Logger.getLogger(DescriptorDeploymentAspect.class); + + private String invokerEJB3; + private String invokerJSE; + + public void setInvokerEJB3(String invokerEJB3) + { + this.invokerEJB3 = invokerEJB3; + } + + public void setInvokerJSE(String invokerJSE) + { + this.invokerJSE = invokerJSE; + } + + @Override + public void create(Deployment dep, WSFRuntime runtime) + { + URL cxfURL = getCXFConfigFromClassLoader(dep); + if (cxfURL == null) + { + cxfURL = getCXFConfigFromDeployment(dep); + if (cxfURL == null) + { + cxfURL = generateCXFConfigFromDeployment(dep); + } + putCXFConfigToDeployment(dep, cxfURL); + } + } + + @Override + public void destroy(Deployment dep, WSFRuntime runtime) + { + DDBeans dd = dep.getAttachment(DDBeans.class); + if (dd != null) + { + dd.destroyFileURL(); + } + } + + /** + * Looks for <b>cxf.xml</b> in classloader + * @param dep deployment which initial classloader will be used + * @return <b>cxf.xml URL</b> or <b>null</b> if not found + */ + private static URL getCXFConfigFromClassLoader(Deployment dep) + { + ClassLoader initCL = dep.getInitialClassLoader(); + URL cxfURL = initCL.getResource("cxf.xml"); + if (cxfURL != null) + { + log.info("CXF configuration found: " + cxfURL); + } + return cxfURL; + } + + /** + * Looks for <b>jbossws-cxf.xml</b> in: + * <ul> + * <li><b>META-INF</b> resource directory for EJB3 deployment</li> + * <li><b>WEB-INF</b> resource directory for POJO deployment</li> + * </ul> + * @param dep deployment where to look for resources + * @return <b>jbossws-cxf.xml URL</b> or <b>null</b> if not found + */ + private static URL getCXFConfigFromDeployment(Deployment dep) + { + DeploymentType depType = dep.getType(); + + String metadir; + if (depType == DeploymentType.JAXWS_EJB3) + { + // expected resource location for EJB3 deployments + metadir = "META-INF"; + } + else if (depType == DeploymentType.JAXWS_JSE) + { + // expected resource location for POJO deployments + metadir = "WEB-INF"; + } + else + { + // only POJO and EJB3 deployments are supported + throw new IllegalStateException("Unsupported deployment type: " + depType); + } + + URL cxfURL = null; + try + { + // get resource URL + ArchiveDeployment archDep = (ArchiveDeployment)dep; + cxfURL = archDep.getMetaDataFileURL(metadir + "/jbossws-cxf.xml"); + log.info("JBossWS-CXF configuration found: " + cxfURL); + } + catch (IOException ignore) + { + // resource not found + } + + return cxfURL; + } + + /** + * Generated CXF descriptor from deployment + * @param dep deployment + * @return CXF descriptor URL + */ + private URL generateCXFConfigFromDeployment(Deployment dep) + { + // Generate the jbossws-cxf.xml descriptor + DeploymentType depType = dep.getType(); + + DDBeans dd = new DDBeans(); + for (Endpoint ep : dep.getService().getEndpoints()) + { + String id = ep.getShortName(); + String address = ep.getAddress(); + String implementor = ep.getTargetBeanName(); + + DDEndpoint ddep = new DDEndpoint(id, address, implementor); + + if (depType == DeploymentType.JAXWS_EJB3) + { + ddep.setInvoker(invokerEJB3); + } + + if (depType == DeploymentType.JAXWS_JSE) + { + ddep.setInvoker(invokerJSE); + } + + log.info("Add " + ddep); + dd.addEndpoint(ddep); + } + + URL cxfURL = dd.createFileURL(); + log.info("JBossWS-CXF configuration generated: " + cxfURL); + + dep.addAttachment(DDBeans.class, dd); + + return cxfURL; + } + + /** + * Puts CXF config file to deployment property <b>org.jboss.ws.webapp.ContextParameterMap</b> map + * @param dep deployment where to put + * @param cxfURL to be put + */ + private static void putCXFConfigToDeployment(Deployment dep, URL cxfURL) + { + // get property map + String propKey = "org.jboss.ws.webapp.ContextParameterMap"; + Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); + if (contextParams == null) + { + // if there's no associated map with the property create it now + contextParams = new HashMap<String, String>(); + dep.setProperty(propKey, contextParams); + } + // put cxf config URL to the property map + contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm()); + } + +} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; - -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.common.KernelAwareSPIFactory; - -/** - * An EndpointRegistryFactory implementation that retrieves - * the registry from MC kernel. - * - * @see EndpointRegistry.BEAN_NAME - * - * @author Heiko.Braun(a)jboss.com - * Created: Jul 23, 2007 - */ -public class EndpointRegistryFactoryImpl extends EndpointRegistryFactory -{ - public EndpointRegistry getEndpointRegistry() - { - return new KernelAwareSPIFactory().getKernelProvidedSPI( - EndpointRegistry.BEAN_NAME, EndpointRegistry.class - ); - } -} Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; + +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.common.KernelAwareSPIFactory; + +/** + * An EndpointRegistryFactory implementation that retrieves + * the registry from MC kernel. + * + * @see EndpointRegistry.BEAN_NAME + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 23, 2007 + */ +public class EndpointRegistryFactoryImpl extends EndpointRegistryFactory +{ + public EndpointRegistry getEndpointRegistry() + { + return new KernelAwareSPIFactory().getKernelProvidedSPI( + EndpointRegistry.BEAN_NAME, EndpointRegistry.class + ); + } +} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,103 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; - -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.invocation.RequestHandler; -import org.jboss.wsf.spi.invocation.EndpointAssociation; -import org.jboss.wsf.common.ObjectNameFactory; - -import javax.management.ObjectName; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.xml.ws.WebServiceException; -import java.io.IOException; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 24, 2007 - */ -public class EndpointServlet extends HttpServlet -{ - protected Endpoint endpoint; - protected EndpointRegistry epRegistry; - - public void init(ServletConfig servletConfig) throws ServletException - { - super.init(servletConfig); - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - } - - public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - if (endpoint == null) - { - String contextPath = req.getContextPath(); - initServiceEndpoint(contextPath); - } - - try - { - EndpointAssociation.setEndpoint(endpoint); - RequestHandler requestHandler = endpoint.getRequestHandler(); - requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); - } - finally - { - EndpointAssociation.removeEndpoint(); - } - } - - /** Initialize the service endpoint - */ - protected void initServiceEndpoint(String contextPath) - { - WebAppResolver resolver = new WebAppResolver(contextPath, getServletName()); - this.endpoint = epRegistry.resolve(resolver); - - if (this.endpoint == null) - { - ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + - Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," + - Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName() - ); - throw new WebServiceException("Cannot obtain endpoint for: " + oname); - } - - // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader - Deployment dep = endpoint.getService().getDeployment(); - if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE) - { - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - dep.setRuntimeClassLoader(classLoader); - } - } -} Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,103 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; + +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.invocation.EndpointAssociation; +import org.jboss.wsf.common.ObjectNameFactory; + +import javax.management.ObjectName; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.xml.ws.WebServiceException; +import java.io.IOException; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 24, 2007 + */ +public class EndpointServlet extends HttpServlet +{ + protected Endpoint endpoint; + protected EndpointRegistry epRegistry; + + public void init(ServletConfig servletConfig) throws ServletException + { + super.init(servletConfig); + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); + } + + public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException + { + if (endpoint == null) + { + String contextPath = req.getContextPath(); + initServiceEndpoint(contextPath); + } + + try + { + EndpointAssociation.setEndpoint(endpoint); + RequestHandler requestHandler = endpoint.getRequestHandler(); + requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); + } + finally + { + EndpointAssociation.removeEndpoint(); + } + } + + /** Initialize the service endpoint + */ + protected void initServiceEndpoint(String contextPath) + { + WebAppResolver resolver = new WebAppResolver(contextPath, getServletName()); + this.endpoint = epRegistry.resolve(resolver); + + if (this.endpoint == null) + { + ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," + + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName() + ); + throw new WebServiceException("Cannot obtain endpoint for: " + oname); + } + + // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader + Deployment dep = endpoint.getService().getDeployment(); + if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE) + { + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); + dep.setRuntimeClassLoader(classLoader); + } + } +} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; - -//$Id$ - -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; - -import org.jboss.wsf.spi.invocation.WebServiceContextEJB; - -/** - * An XFire invoker for EJB3 - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2007 - */ -public class InvokerEJB3 extends AbstractInvoker -{ - protected WebServiceContext getWebServiceContext(MessageContext msgCtx) - { - return new WebServiceContextEJB(msgCtx); - } -} Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; + +//$Id$ + +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.handler.MessageContext; + +import org.jboss.wsf.spi.invocation.WebServiceContextEJB; + +/** + * An XFire invoker for EJB3 + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class InvokerEJB3 extends AbstractInvoker +{ + protected WebServiceContext getWebServiceContext(MessageContext msgCtx) + { + return new WebServiceContextEJB(msgCtx); + } +} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; - -//$Id$ - -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; - -import org.jboss.wsf.spi.invocation.WebServiceContextJSE; - -/** - * An CXF invoker for JSE - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2007 - */ -public class InvokerJSE extends AbstractInvoker -{ - protected WebServiceContext getWebServiceContext(MessageContext msgCtx) - { - return new WebServiceContextJSE(msgCtx); - } -} \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; + +//$Id$ + +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.handler.MessageContext; + +import org.jboss.wsf.spi.invocation.WebServiceContextJSE; + +/** + * An CXF invoker for JSE + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class InvokerJSE extends AbstractInvoker +{ + protected WebServiceContext getWebServiceContext(MessageContext msgCtx) + { + return new WebServiceContextJSE(msgCtx); + } +} \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; - -import org.jboss.wsf.spi.invocation.RequestHandlerFactory; -import org.jboss.wsf.spi.invocation.RequestHandler; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 24, 2007 - */ -public class RequestHandlerFactoryImpl extends RequestHandlerFactory -{ - public RequestHandler newRequestHandler() - { - return new RequestHandlerImpl(); - } -} Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; + +import org.jboss.wsf.spi.invocation.RequestHandlerFactory; +import org.jboss.wsf.spi.invocation.RequestHandler; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 24, 2007 + */ +public class RequestHandlerFactoryImpl extends RequestHandlerFactory +{ + public RequestHandler newRequestHandler() + { + return new RequestHandlerImpl(); + } +} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; - -//$Id$ - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.cxf.transport.servlet.ServletController; -import org.jboss.logging.Logger; -import org.jboss.util.NotImplementedException; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.InvocationContext; -import org.jboss.wsf.spi.invocation.RequestHandler; - -/** - * A request handler - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2007 - */ -public class RequestHandlerImpl implements RequestHandler -{ - // provide logging - private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); - - RequestHandlerImpl() - { - } - - public void handleHttpRequest(Endpoint ep, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException - { - ServletController controller = (ServletController)context.getAttribute(ServletController.class.getName()); - if (controller == null) - throw new IllegalStateException("Cannot obtain servlet controller"); - - controller.invoke(req, res); - } - - public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) - { - throw new NotImplementedException(); - } - - public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext context) - { - throw new NotImplementedException(); - } -} Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; + +//$Id$ + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.cxf.transport.servlet.ServletController; +import org.jboss.logging.Logger; +import org.jboss.util.NotImplementedException; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.InvocationContext; +import org.jboss.wsf.spi.invocation.RequestHandler; + +/** + * A request handler + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class RequestHandlerImpl implements RequestHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(RequestHandlerImpl.class); + + RequestHandlerImpl() + { + } + + public void handleHttpRequest(Endpoint ep, HttpServletRequest req, HttpServletResponse res, ServletContext context) throws ServletException, IOException + { + ServletController controller = (ServletController)context.getAttribute(ServletController.class.getName()); + if (controller == null) + throw new IllegalStateException("Cannot obtain servlet controller"); + + controller.invoke(req, res); + } + + public void handleRequest(Endpoint endpoint, InputStream inStream, OutputStream outStream, InvocationContext context) + { + throw new NotImplementedException(); + } + + public void handleWSDLRequest(Endpoint endpoint, OutputStream outStream, InvocationContext context) + { + throw new NotImplementedException(); + } +} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,162 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; - -//$Id$ - -import java.io.IOException; -import java.io.OutputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Collection; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.cxf.Bus; -import org.apache.cxf.service.model.EndpointInfo; -import org.apache.cxf.transport.servlet.CXFServlet; -import org.apache.cxf.transport.servlet.ServletController; -import org.apache.cxf.transport.servlet.ServletDestination; -import org.apache.cxf.transport.servlet.ServletTransportFactory; -import org.apache.cxf.transports.http.QueryHandler; -import org.apache.cxf.transports.http.QueryHandlerRegistry; -import org.jboss.logging.Logger; - -/** - * An extension to the CXF servlet controller - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Apr-2007 - */ -public class ServletControllerExt extends ServletController -{ - private static Logger log = Logger.getLogger(ServletControllerExt.class); - - private ServletTransportFactory cxfTransport; - private CXFServlet cxfServlet; - - public ServletControllerExt(ServletTransportFactory cxfTransport, CXFServlet cxfServlet) - { - super(cxfTransport, cxfServlet); - this.cxfTransport = cxfTransport; - this.cxfServlet = cxfServlet; - } - - /** - * Finds destination based on request URI - * @param requestURI to be recognized - * @return destination associated with the request URI - * @throws ServletException when destination wasn't found - */ - private ServletDestination findDestination(HttpServletRequest req) throws ServletException - { - // Find destination based on request URI - String requestURI = req.getRequestURI(); - Collection<ServletDestination> destinations = cxfTransport.getDestinations(); - for (ServletDestination destination : destinations) - { - EndpointInfo endpointInfo = destination.getEndpointInfo(); - String address = endpointInfo.getAddress(); - - // Fix invalid leading slash - if (address.startsWith("/http://")) - { - address = address.substring(1); - endpointInfo.setAddress(address); - } - - String path = address; - try - { - path = new URL(address).getPath(); - } - catch (MalformedURLException ex) - { - // ignore - } - - if (requestURI.startsWith(path)) - { - return destination; - } - } - - throw new ServletException("Cannot obtain destination for: " + requestURI); - } - - /** - * When request includes query it tries to lookup the query handler and tries to handle the request message - * @param req request - * @param res response - * @param dest destination - * @return true if there was a query handler that successfully handled the request, false otherwise - * @throws ServletException if some problem occurs - */ - private boolean handleQuery(HttpServletRequest req, HttpServletResponse res, ServletDestination dest) - throws ServletException - { - Bus bus = cxfServlet.getBus(); - boolean hasQuery = (null != req.getQueryString()) && (req.getQueryString().length() > 0); - boolean queryHandlerRegistryExists = bus.getExtension(QueryHandlerRegistry.class) != null; - - if (hasQuery && queryHandlerRegistryExists) - { - String ctxUri = req.getRequestURI(); - String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString(); - EndpointInfo endpointInfo = dest.getEndpointInfo(); - - for (QueryHandler queryHandler : bus.getExtension(QueryHandlerRegistry.class).getHandlers()) - { - if (queryHandler.isRecognizedQuery(baseUri, ctxUri, endpointInfo)) - { - res.setContentType(queryHandler.getResponseContentType(baseUri, ctxUri)); - try - { - OutputStream out = res.getOutputStream(); - queryHandler.writeResponse(baseUri, ctxUri, endpointInfo, out); - out.flush(); - return true; - } - catch (Exception e) - { - throw new ServletException(e); - } - } - } - } - - return false; - } - - public void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException - { - ServletDestination dest = findDestination(req); - boolean requestHandled = handleQuery(req, res, dest); - - if (false == requestHandled) - { - invokeDestination(req, res, dest); - } - } -} Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,162 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; + +//$Id$ + +import java.io.IOException; +import java.io.OutputStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Collection; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.cxf.Bus; +import org.apache.cxf.service.model.EndpointInfo; +import org.apache.cxf.transport.servlet.CXFServlet; +import org.apache.cxf.transport.servlet.ServletController; +import org.apache.cxf.transport.servlet.ServletDestination; +import org.apache.cxf.transport.servlet.ServletTransportFactory; +import org.apache.cxf.transports.http.QueryHandler; +import org.apache.cxf.transports.http.QueryHandlerRegistry; +import org.jboss.logging.Logger; + +/** + * An extension to the CXF servlet controller + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Apr-2007 + */ +public class ServletControllerExt extends ServletController +{ + private static Logger log = Logger.getLogger(ServletControllerExt.class); + + private ServletTransportFactory cxfTransport; + private CXFServlet cxfServlet; + + public ServletControllerExt(ServletTransportFactory cxfTransport, CXFServlet cxfServlet) + { + super(cxfTransport, cxfServlet); + this.cxfTransport = cxfTransport; + this.cxfServlet = cxfServlet; + } + + /** + * Finds destination based on request URI + * @param requestURI to be recognized + * @return destination associated with the request URI + * @throws ServletException when destination wasn't found + */ + private ServletDestination findDestination(HttpServletRequest req) throws ServletException + { + // Find destination based on request URI + String requestURI = req.getRequestURI(); + Collection<ServletDestination> destinations = cxfTransport.getDestinations(); + for (ServletDestination destination : destinations) + { + EndpointInfo endpointInfo = destination.getEndpointInfo(); + String address = endpointInfo.getAddress(); + + // Fix invalid leading slash + if (address.startsWith("/http://")) + { + address = address.substring(1); + endpointInfo.setAddress(address); + } + + String path = address; + try + { + path = new URL(address).getPath(); + } + catch (MalformedURLException ex) + { + // ignore + } + + if (requestURI.startsWith(path)) + { + return destination; + } + } + + throw new ServletException("Cannot obtain destination for: " + requestURI); + } + + /** + * When request includes query it tries to lookup the query handler and tries to handle the request message + * @param req request + * @param res response + * @param dest destination + * @return true if there was a query handler that successfully handled the request, false otherwise + * @throws ServletException if some problem occurs + */ + private boolean handleQuery(HttpServletRequest req, HttpServletResponse res, ServletDestination dest) + throws ServletException + { + Bus bus = cxfServlet.getBus(); + boolean hasQuery = (null != req.getQueryString()) && (req.getQueryString().length() > 0); + boolean queryHandlerRegistryExists = bus.getExtension(QueryHandlerRegistry.class) != null; + + if (hasQuery && queryHandlerRegistryExists) + { + String ctxUri = req.getRequestURI(); + String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString(); + EndpointInfo endpointInfo = dest.getEndpointInfo(); + + for (QueryHandler queryHandler : bus.getExtension(QueryHandlerRegistry.class).getHandlers()) + { + if (queryHandler.isRecognizedQuery(baseUri, ctxUri, endpointInfo)) + { + res.setContentType(queryHandler.getResponseContentType(baseUri, ctxUri)); + try + { + OutputStream out = res.getOutputStream(); + queryHandler.writeResponse(baseUri, ctxUri, endpointInfo, out); + out.flush(); + return true; + } + catch (Exception e) + { + throw new ServletException(e); + } + } + } + } + + return false; + } + + public void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException + { + ServletDestination dest = findDestination(req); + boolean requestHandled = handleQuery(req, res, dest); + + if (false == requestHandled) + { + invokeDestination(req, res, dest); + } + } +} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; - -import org.jboss.wsf.spi.management.EndpointResolver; -import org.jboss.wsf.spi.deployment.Endpoint; - -import javax.management.ObjectName; -import java.util.Iterator; - -/** - * Resolves Endpoints by Servlet name and web context path. - * - * @author Heiko.Braun(a)jboss.com - * Created: Jul 24, 2007 - */ -public class WebAppResolver implements EndpointResolver -{ - private String contextPath; - private String servletName; - - public WebAppResolver(String contextPath, String servletName) - { - this.contextPath = contextPath; - this.servletName = servletName; - } - - public Endpoint query(Iterator<Endpoint> endpoints) - { - Endpoint endpoint = null; - - if (contextPath.startsWith("/")) - contextPath = contextPath.substring(1); - - while(endpoints.hasNext()) - { - Endpoint auxEndpoint = endpoints.next(); - ObjectName sepId = auxEndpoint.getName(); - String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); - String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) - { - endpoint = auxEndpoint; - break; - } - } - - return endpoint; - } -} Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf; + +import org.jboss.wsf.spi.management.EndpointResolver; +import org.jboss.wsf.spi.deployment.Endpoint; + +import javax.management.ObjectName; +import java.util.Iterator; + +/** + * Resolves Endpoints by Servlet name and web context path. + * + * @author Heiko.Braun(a)jboss.com + * Created: Jul 24, 2007 + */ +public class WebAppResolver implements EndpointResolver +{ + private String contextPath; + private String servletName; + + public WebAppResolver(String contextPath, String servletName) + { + this.contextPath = contextPath; + this.servletName = servletName; + } + + public Endpoint query(Iterator<Endpoint> endpoints) + { + Endpoint endpoint = null; + + if (contextPath.startsWith("/")) + contextPath = contextPath.substring(1); + + while(endpoints.hasNext()) + { + Endpoint auxEndpoint = endpoints.next(); + ObjectName sepId = auxEndpoint.getName(); + String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); + String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) + { + endpoint = auxEndpoint; + break; + } + } + + return endpoint; + } +} Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata) Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services) Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.metadata.services; - -//$Id$ - -import java.io.IOException; -import java.io.Writer; - -/** - * Metadata model for cxf.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2007 - */ -public class DDBean -{ - private String beanName; - private String beanClass; - - public DDBean(String beanName, String beanClass) - { - this.beanName = beanName; - this.beanClass = beanClass; - } - - public void writeTo(Writer writer) throws IOException - { - writer.write("<bean"); - if (beanName != null) - writer.write(" name='" + beanName + "'"); - writer.write(" class='" + beanClass + "'"); - writer.write("></bean>"); - } - - public String toString() - { - StringBuilder str = new StringBuilder("Bean"); - str.append("\n name=" + beanName); - str.append("\n class=" + beanClass); - return str.toString(); - } -} \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.metadata.services; + +//$Id$ + +import java.io.IOException; +import java.io.Writer; + +/** + * Metadata model for cxf.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class DDBean +{ + private String beanName; + private String beanClass; + + public DDBean(String beanName, String beanClass) + { + this.beanName = beanName; + this.beanClass = beanClass; + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<bean"); + if (beanName != null) + writer.write(" name='" + beanName + "'"); + writer.write(" class='" + beanClass + "'"); + writer.write("></bean>"); + } + + public String toString() + { + StringBuilder str = new StringBuilder("Bean"); + str.append("\n name=" + beanName); + str.append("\n class=" + beanClass); + return str.toString(); + } +} \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,127 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.metadata.services; - -//$Id$ - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import org.jboss.wsf.common.IOUtils; - -//$Id$ - -/** - * Metadata model for cxf.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2007 - */ -public class DDBeans -{ - // The Required services. - private List<DDEndpoint> endpoints = new ArrayList<DDEndpoint>(); - // Optional additional beans. - private List<DDBean> beans = new ArrayList<DDBean>(); - // The derived temp file - private File tmpFile; - - public List<DDEndpoint> getEndpoints() - { - return endpoints; - } - - public void addEndpoint(DDEndpoint service) - { - endpoints.add(service); - } - - public List<DDBean> getBeans() - { - return beans; - } - - public void addBean(DDBean bean) - { - beans.add(bean); - } - - public URL createFileURL() - { - destroyFileURL(); - - try - { - File tmpDir = IOUtils.createTempDirectory(); - tmpFile = File.createTempFile("jbossws-cxf", ".xml", tmpDir); - Writer writer = new OutputStreamWriter(new FileOutputStream(tmpFile)); - writeTo(writer); - writer.close(); - - return tmpFile.toURL(); - } - catch (IOException ex) - { - throw new WSFDeploymentException(ex); - } - } - - public void destroyFileURL() - { - if (tmpFile != null) - { - tmpFile.delete(); - tmpFile = null; - } - } - - public void writeTo(Writer writer) throws IOException - { - writer.write("<beans " + - "xmlns='http://www.springframework.org/schema/beans' " + - "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' " + - "xmlns:beans='http://www.springframework.org/schema/beans' " + - "xmlns:jaxws='http://cxf.apache.org/jaxws' " + - "xsi:schemaLocation='http://www.springframework.org/schema/beans " + - "http://www.springframework.org/schema/beans/spring-beans.xsd " + - "http://cxf.apache.org/jaxws " + - "http://cxf.apache.org/schemas/jaxws.xsd'>"); - - for (DDEndpoint endpoint : endpoints) - { - endpoint.writeTo(writer); - } - for (DDBean bean : beans) - { - bean.writeTo(writer); - } - writer.write("</beans>"); - } - -} \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,127 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.metadata.services; + +//$Id$ + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import org.jboss.wsf.spi.deployment.WSFDeploymentException; +import org.jboss.wsf.common.IOUtils; + +//$Id$ + +/** + * Metadata model for cxf.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class DDBeans +{ + // The Required services. + private List<DDEndpoint> endpoints = new ArrayList<DDEndpoint>(); + // Optional additional beans. + private List<DDBean> beans = new ArrayList<DDBean>(); + // The derived temp file + private File tmpFile; + + public List<DDEndpoint> getEndpoints() + { + return endpoints; + } + + public void addEndpoint(DDEndpoint service) + { + endpoints.add(service); + } + + public List<DDBean> getBeans() + { + return beans; + } + + public void addBean(DDBean bean) + { + beans.add(bean); + } + + public URL createFileURL() + { + destroyFileURL(); + + try + { + File tmpDir = IOUtils.createTempDirectory(); + tmpFile = File.createTempFile("jbossws-cxf", ".xml", tmpDir); + Writer writer = new OutputStreamWriter(new FileOutputStream(tmpFile)); + writeTo(writer); + writer.close(); + + return tmpFile.toURL(); + } + catch (IOException ex) + { + throw new WSFDeploymentException(ex); + } + } + + public void destroyFileURL() + { + if (tmpFile != null) + { + tmpFile.delete(); + tmpFile = null; + } + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<beans " + + "xmlns='http://www.springframework.org/schema/beans' " + + "xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' " + + "xmlns:beans='http://www.springframework.org/schema/beans' " + + "xmlns:jaxws='http://cxf.apache.org/jaxws' " + + "xsi:schemaLocation='http://www.springframework.org/schema/beans " + + "http://www.springframework.org/schema/beans/spring-beans.xsd " + + "http://cxf.apache.org/jaxws " + + "http://cxf.apache.org/schemas/jaxws.xsd'>"); + + for (DDEndpoint endpoint : endpoints) + { + endpoint.writeTo(writer); + } + for (DDBean bean : beans) + { + bean.writeTo(writer); + } + writer.write("</beans>"); + } + +} \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,77 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.metadata.services; - -//$Id$ - -import java.io.IOException; -import java.io.Writer; - -/** - * Metadata model for cxf.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-May-2007 - */ -public class DDEndpoint -{ - private String id; - private String address; - private String implementor; - private String invoker; - - public DDEndpoint(String id, String address, String implementor) - { - this.id = id; - this.address = address; - this.implementor = implementor; - } - - public void setInvoker(String invoker) - { - this.invoker = invoker; - } - - public void writeTo(Writer writer) throws IOException - { - writer.write("<jaxws:endpoint id='" + id + "'"); - writer.write(" address='" + address + "'"); - writer.write(" implementor='" + implementor + "'"); - writer.write(">"); - - // [JBWS-1746] Add support for configurable invoker in cxf.xml - if (invoker != null) - writer.write("<jaxws:invoker><bean class='" + invoker + "'/></jaxws:invoker>"); - - writer.write("</jaxws:endpoint>"); - } - - public String toString() - { - StringBuilder str = new StringBuilder("Service"); - str.append("\n id=" + id); - str.append("\n address=" + address); - str.append("\n implementor=" + implementor); - str.append("\n invoker=" + invoker); - return str.toString(); - } -} \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.metadata.services; + +//$Id$ + +import java.io.IOException; +import java.io.Writer; + +/** + * Metadata model for cxf.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-May-2007 + */ +public class DDEndpoint +{ + private String id; + private String address; + private String implementor; + private String invoker; + + public DDEndpoint(String id, String address, String implementor) + { + this.id = id; + this.address = address; + this.implementor = implementor; + } + + public void setInvoker(String invoker) + { + this.invoker = invoker; + } + + public void writeTo(Writer writer) throws IOException + { + writer.write("<jaxws:endpoint id='" + id + "'"); + writer.write(" address='" + address + "'"); + writer.write(" implementor='" + implementor + "'"); + writer.write(">"); + + // [JBWS-1746] Add support for configurable invoker in cxf.xml + if (invoker != null) + writer.write("<jaxws:invoker><bean class='" + invoker + "'/></jaxws:invoker>"); + + writer.write("</jaxws:endpoint>"); + } + + public String toString() + { + StringBuilder str = new StringBuilder("Service"); + str.append("\n id=" + id); + str.append("\n address=" + address); + str.append("\n implementor=" + implementor); + str.append("\n invoker=" + invoker); + return str.toString(); + } +} \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport) Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.transport; - -// $Id$ - -import java.io.IOException; -import java.util.logging.Logger; - -import org.apache.cxf.Bus; -import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.service.model.EndpointInfo; -import org.apache.cxf.transport.http.AbstractHTTPDestination; - -public class TomcatHTTPDestination extends AbstractHTTPDestination -{ - private static final Logger LOG = LogUtils.getL7dLogger(TomcatHTTPDestination.class); - - private TomcatHTTPTransportFactory transportFactory; - - public TomcatHTTPDestination(Bus b, TomcatHTTPTransportFactory ci, EndpointInfo ei, boolean dp) throws IOException - { - super(b, ci, ei, dp); - this.transportFactory = ci; - } - - @Override - protected Logger getLogger() - { - return LOG; - } - - @Override - public void shutdown() { - transportFactory.removeDestination(endpointInfo); - super.shutdown(); - } -} Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.transport; + +// $Id$ + +import java.io.IOException; +import java.util.logging.Logger; + +import org.apache.cxf.Bus; +import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.service.model.EndpointInfo; +import org.apache.cxf.transport.http.AbstractHTTPDestination; + +public class TomcatHTTPDestination extends AbstractHTTPDestination +{ + private static final Logger LOG = LogUtils.getL7dLogger(TomcatHTTPDestination.class); + + private TomcatHTTPTransportFactory transportFactory; + + public TomcatHTTPDestination(Bus b, TomcatHTTPTransportFactory ci, EndpointInfo ei, boolean dp) throws IOException + { + super(b, ci, ei, dp); + this.transportFactory = ci; + } + + @Override + protected Logger getLogger() + { + return LOG; + } + + @Override + public void shutdown() { + transportFactory.removeDestination(endpointInfo); + super.shutdown(); + } +} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,78 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.transport; - -// $Id$ - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import org.apache.cxf.service.model.EndpointInfo; -import org.apache.cxf.transport.Destination; -import org.apache.cxf.transport.DestinationFactory; -import org.apache.cxf.transport.http.AbstractHTTPTransportFactory; - -public class TomcatHTTPTransportFactory extends AbstractHTTPTransportFactory implements DestinationFactory -{ - private Map<String, TomcatHTTPDestination> destinations = new HashMap<String, TomcatHTTPDestination>(); - - public TomcatHTTPTransportFactory() - { - super(); - } - - public Destination getDestination(EndpointInfo endpointInfo) throws IOException - { - String addr = endpointInfo.getAddress(); - TomcatHTTPDestination destination = destinations.get(addr); - if (destination == null) - { - destination = createDestination(endpointInfo); - } - - return destination; - } - - private synchronized TomcatHTTPDestination createDestination(EndpointInfo endpointInfo) throws IOException - { - - TomcatHTTPDestination destination = destinations.get(endpointInfo.getAddress()); - if (destination == null) - { - destination = new TomcatHTTPDestination(getBus(), this, endpointInfo, true); - - destinations.put(endpointInfo.getAddress(), destination); - - configure(destination); - } - return destination; - } - - /** - * This function removes the destination for a particular endpoint. - */ - void removeDestination(EndpointInfo ei) - { - destinations.remove(ei.getAddress()); - } -} Copied: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java) =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java (rev 0) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,78 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.stack.cxf.transport; + +// $Id$ + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import org.apache.cxf.service.model.EndpointInfo; +import org.apache.cxf.transport.Destination; +import org.apache.cxf.transport.DestinationFactory; +import org.apache.cxf.transport.http.AbstractHTTPTransportFactory; + +public class TomcatHTTPTransportFactory extends AbstractHTTPTransportFactory implements DestinationFactory +{ + private Map<String, TomcatHTTPDestination> destinations = new HashMap<String, TomcatHTTPDestination>(); + + public TomcatHTTPTransportFactory() + { + super(); + } + + public Destination getDestination(EndpointInfo endpointInfo) throws IOException + { + String addr = endpointInfo.getAddress(); + TomcatHTTPDestination destination = destinations.get(addr); + if (destination == null) + { + destination = createDestination(endpointInfo); + } + + return destination; + } + + private synchronized TomcatHTTPDestination createDestination(EndpointInfo endpointInfo) throws IOException + { + + TomcatHTTPDestination destination = destinations.get(endpointInfo.getAddress()); + if (destination == null) + { + destination = new TomcatHTTPDestination(getBus(), this, endpointInfo, true); + + destinations.put(endpointInfo.getAddress(), destination); + + configure(destination); + } + return destination; + } + + /** + * This function removes the destination for a particular endpoint. + */ + void removeDestination(EndpointInfo ei) + { + destinations.remove(ei.getAddress()); + } +} Copied: stack/cxf/trunk/modules/server/src/main/resources (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources) Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,113 +0,0 @@ - -  - <bean name="WSServerConfig" class="org.jboss.wsf.stack.cxf.CXFServerConfig"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - -  - <property name="webServiceHost">${jboss.bind.address}</property> - <property name="modifySOAPAddress">true</property> - -  - </bean> - -  - <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> - <property name="namespaces"> - <list class="java.util.LinkedList" elementClass="java.lang.String"> - <value>org.apache.cxf</value> - </list> - </property> - </bean> - -  - <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder"> - <property name="recording">false</property> - </bean> - <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder"> - <property name="recording">false</property> - </bean> - - <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.cxf.RequestHandlerFactoryImpl"/> - -  - <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties</property> - <property name="contextProperties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.cxf.CXFServletExt</value></entry> - </map> - </property> - </bean> - - <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect"> - <property name="requires">EndpointAddress</property> - <property name="provides">StackDescriptor</property> - <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property> - <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property> - </bean> - - <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerEndpointHandler</property> - <property name="provides">StackEndpointHandler</property> - </bean> - - <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - <property name="requires">RegisteredEndpoint</property> - <property name="provides">EndpointRecordProcessors</property> - <property name="processors"> - <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor"> - <inject bean="WSMemoryBufferRecorder"/> - <inject bean="WSLogRecorder"/> - </list> - </property> - </bean> - -  - -  - <bean name="WSCXFDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSCXFContextPropertiesDeploymentAspect"/> - <inject bean="WSCXFDescriptorDeploymentAspect"/> -  - <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> - <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerJSE</depends> - </bean> - - <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSCXFContextPropertiesDeploymentAspect"/> - <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> - <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/> - <inject bean="WSCXFDescriptorDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerEJB</depends> - </bean> - Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,113 @@ + +  + <bean name="WSServerConfig" class="org.jboss.wsf.stack.cxf.CXFServerConfig"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + +  + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="modifySOAPAddress">true</property> + +  + </bean> + +  + <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> + <property name="namespaces"> + <list class="java.util.LinkedList" elementClass="java.lang.String"> + <value>org.apache.cxf</value> + </list> + </property> + </bean> + +  + <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder"> + <property name="recording">false</property> + </bean> + <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder"> + <property name="recording">false</property> + </bean> + + <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.cxf.RequestHandlerFactoryImpl"/> + +  + <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> + <property name="provides">ContextProperties</property> + <property name="contextProperties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.cxf.CXFServletExt</value></entry> + </map> + </property> + </bean> + + <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.DescriptorDeploymentAspect"> + <property name="requires">EndpointAddress</property> + <property name="provides">StackDescriptor</property> + <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property> + <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property> + </bean> + + <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerEndpointHandler</property> + <property name="provides">StackEndpointHandler</property> + </bean> + + <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + <property name="requires">RegisteredEndpoint</property> + <property name="provides">EndpointRecordProcessors</property> + <property name="processors"> + <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor"> + <inject bean="WSMemoryBufferRecorder"/> + <inject bean="WSLogRecorder"/> + </list> + </property> + </bean> + +  + +  + <bean name="WSCXFDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSCXFContextPropertiesDeploymentAspect"/> + <inject bean="WSCXFDescriptorDeploymentAspect"/> +  + <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> + <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerJSE</depends> + </bean> + + <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSCXFContextPropertiesDeploymentAspect"/> + <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> + <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/> + <inject bean="WSCXFDescriptorDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerEJB</depends> + </bean> + Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar) Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF) Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services) Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2008-04-23 20:09:00 UTC (rev 6640) @@ -1 +0,0 @@ -org.jboss.wsf.stack.cxf.RequestHandlerFactoryImpl \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1 @@ +org.jboss.wsf.stack.cxf.RequestHandlerFactoryImpl \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2008-04-23 20:09:00 UTC (rev 6640) @@ -1 +0,0 @@ -org.jboss.wsf.stack.cxf.EndpointRegistryFactoryImpl \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1 @@ +org.jboss.wsf.stack.cxf.EndpointRegistryFactoryImpl \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2008-04-23 20:09:00 UTC (rev 6640) @@ -1 +0,0 @@ -org.jboss.wsf.stack.cxf.client.ServiceRefBinderFactoryImpl \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1 @@ +org.jboss.wsf.stack.cxf.client.ServiceRefBinderFactoryImpl \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar) Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF) Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,10 +0,0 @@ -Apache CXF is an effort undergoing incubation at the Apache Software -Foundation (ASF), sponsored by the Apache Incubator PMC. - -Incubation is required of all newly accepted projects until a further review -indicates that the infrastructure, communications, and decision making process -have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness -or stability of the code, it does indicate that the project has yet to be -fully endorsed by the ASF. Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/DISCLAIMER 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,10 @@ +Apache CXF is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness +or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<extensions xmlns="http://cxf.apache.org/bus/extension"> - <extension class="org.apache.cxf.binding.object.ObjectBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> - <namespace>http://cxf.apache.org/binding/object/</namespace> - </extension> - <extension class="org.jboss.wsf.stack.cxf.transport.TomcatHTTPTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true"> - <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace> - <namespace>http://schemas.xmlsoap.org/soap/http</namespace> - <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace> - <namespace>http://cxf.apache.org/transports/http/configuration</namespace> - <namespace>http://cxf.apache.org/bindings/xformat</namespace> - </extension> - <extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> - <namespace>http://apache.org/cxf/binding/http</namespace> - </extension> - <extension class="org.apache.cxf.binding.xml.XMLBindingFactory" deferred="true"> - <namespace>http://cxf.apache.org/bindings/xformat</namespace> - <namespace>http://www.w3.org/2004/08/wsdl/http</namespace> - </extension> - <extension class="org.apache.cxf.wsdl11.WSDLManagerImpl" interface="org.apache.cxf.wsdl.WSDLManager"/> - <extension class="org.apache.cxf.phase.PhaseManagerImpl" interface="org.apache.cxf.phase.PhaseManager"/> - <extension class="org.apache.cxf.workqueue.WorkQueueManagerImpl" interface="org.apache.cxf.workqueue.WorkQueueManager"/> - <extension class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager" interface="org.apache.cxf.buslifecycle.BusLifeCycleManager"/> - <extension class="org.apache.cxf.endpoint.ServerRegistryImpl" interface="org.apache.cxf.endpoint.ServerRegistry"/> - <extension class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl" interface="org.apache.cxf.transports.http.QueryHandlerRegistry"/> - <extension class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl" interface="org.apache.cxf.endpoint.EndpointResolverRegistry"/> - <extension class="org.apache.cxf.headers.HeaderManagerImpl" interface="org.apache.cxf.headers.HeaderManager"/> - <extension class="org.apache.cxf.catalog.OASISCatalogManager" interface="org.apache.cxf.catalog.OASISCatalogManager"/> - <extension class="org.apache.cxf.transport.jms.JMSTransportFactory" deferred="true"> - <namespace>http://cxf.apache.org/transports/jms</namespace> - <namespace>http://cxf.apache.org/transports/jms/configuration</namespace> - </extension> - <extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager"/> - <extension class="org.apache.cxf.binding.soap.SoapBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> - <namespace>http://schemas.xmlsoap.org/soap/</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace> - <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace> - </extension> - <extension class="org.apache.cxf.binding.soap.SoapTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true"> - <namespace>http://schemas.xmlsoap.org/soap/</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace> - <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace> - </extension> -</extensions> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/bus-extensions.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<extensions xmlns="http://cxf.apache.org/bus/extension"> + <extension class="org.apache.cxf.binding.object.ObjectBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> + <namespace>http://cxf.apache.org/binding/object/</namespace> + </extension> + <extension class="org.jboss.wsf.stack.cxf.transport.TomcatHTTPTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true"> + <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace> + <namespace>http://schemas.xmlsoap.org/soap/http</namespace> + <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace> + <namespace>http://cxf.apache.org/transports/http/configuration</namespace> + <namespace>http://cxf.apache.org/bindings/xformat</namespace> + </extension> + <extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> + <namespace>http://apache.org/cxf/binding/http</namespace> + </extension> + <extension class="org.apache.cxf.binding.xml.XMLBindingFactory" deferred="true"> + <namespace>http://cxf.apache.org/bindings/xformat</namespace> + <namespace>http://www.w3.org/2004/08/wsdl/http</namespace> + </extension> + <extension class="org.apache.cxf.wsdl11.WSDLManagerImpl" interface="org.apache.cxf.wsdl.WSDLManager"/> + <extension class="org.apache.cxf.phase.PhaseManagerImpl" interface="org.apache.cxf.phase.PhaseManager"/> + <extension class="org.apache.cxf.workqueue.WorkQueueManagerImpl" interface="org.apache.cxf.workqueue.WorkQueueManager"/> + <extension class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager" interface="org.apache.cxf.buslifecycle.BusLifeCycleManager"/> + <extension class="org.apache.cxf.endpoint.ServerRegistryImpl" interface="org.apache.cxf.endpoint.ServerRegistry"/> + <extension class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl" interface="org.apache.cxf.transports.http.QueryHandlerRegistry"/> + <extension class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl" interface="org.apache.cxf.endpoint.EndpointResolverRegistry"/> + <extension class="org.apache.cxf.headers.HeaderManagerImpl" interface="org.apache.cxf.headers.HeaderManager"/> + <extension class="org.apache.cxf.catalog.OASISCatalogManager" interface="org.apache.cxf.catalog.OASISCatalogManager"/> + <extension class="org.apache.cxf.transport.jms.JMSTransportFactory" deferred="true"> + <namespace>http://cxf.apache.org/transports/jms</namespace> + <namespace>http://cxf.apache.org/transports/jms/configuration</namespace> + </extension> + <extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager"/> + <extension class="org.apache.cxf.binding.soap.SoapBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true"> + <namespace>http://schemas.xmlsoap.org/soap/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace> + <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace> + </extension> + <extension class="org.apache.cxf.binding.soap.SoapTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true"> + <namespace>http://schemas.xmlsoap.org/soap/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace> + <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace> + </extension> +</extensions> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf) Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/aegis.xsd =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/aegis.xsd 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/aegis.xsd 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,96 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - elementFormDefault="unqualified" attributeFormDefault="unqualified" -> - - <xsd:element name="mappings"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="mapping" type="mappingType" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:complexType name="mappingType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="property" type="propertyType" /> - <xsd:element name="method" type="methodType" /> - <xsd:element name="component" type="componentTypeType" /> - </xsd:choice> - <xsd:attribute name="uri" type="xsd:string" /> - <xsd:attribute name="name" type="xsd:string" /> - </xsd:complexType> - - <xsd:complexType name="propertyType"> - <xsd:attributeGroup ref="mappedType" /> - <xsd:anyAttribute namespace='##other' processContents='lax' /> - </xsd:complexType> - - <xsd:complexType name="methodType"> - <xsd:choice minOccurs="0" maxOccurs="unbounded"> - <xsd:element name="return-type" type="return-typeType" /> - <xsd:element name="parameter" type="parameterType" /> - </xsd:choice> - <xsd:attribute name="name" type="xsd:string" /> - </xsd:complexType> - - <xsd:complexType name="return-typeType"> - <xsd:attributeGroup ref="mappedType" /> - <xsd:anyAttribute namespace='##other' processContents='lax' /> - </xsd:complexType> - - <xsd:complexType name="parameterType"> - <xsd:attribute name="index" type="xsd:int" /> - <xsd:attribute name="class" type="xsd:string" /> - <xsd:attributeGroup ref="mappedType" /> - <xsd:anyAttribute namespace='##other' processContents='lax' /> - </xsd:complexType> - - <xsd:complexType name="componentTypeType"> - <xsd:attribute name="class" type="xsd:string" /> - <xsd:attributeGroup ref="mappedType" /> - <xsd:anyAttribute namespace='##other' processContents='lax' /> - </xsd:complexType> - - <xsd:attributeGroup name="mappedType"> - <xsd:attribute name="name" type="xsd:string" /> - <xsd:attribute name="type" type="xsd:string" /> - <xsd:attribute name="typeName" type="xsd:string" /> - <xsd:attribute name="mappedName" type="xsd:string" /> - <xsd:attribute name="nillable" type="xsd:boolean" /> - <xsd:attribute name="flag" type="xsd:boolean" /> - <xsd:attribute name="ignore" type="xsd:boolean" /> - <xsd:attribute name="componentType" type="xsd:string" /> - <xsd:attribute name="keyType" type="xsd:string" /> - <xsd:attribute name="valueType" type="xsd:string" /> - <xsd:attribute name="minOccurs" type="xsd:int" /> - <xsd:attribute name="maxOccurs" type="xsd:string" /> - <xsd:attribute name="style"> - <xsd:simpleType> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="attribute" /> - <xsd:enumeration value="element" /> - </xsd:restriction> - </xsd:simpleType> - </xsd:attribute> - <xsd:anyAttribute namespace='##other' processContents='lax' /> - </xsd:attributeGroup> -</xsd:schema> \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/aegis.xsd (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/aegis.xsd) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/aegis.xsd (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/aegis.xsd 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" + elementFormDefault="unqualified" attributeFormDefault="unqualified" +> + + <xsd:element name="mappings"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="mapping" type="mappingType" minOccurs="0" maxOccurs="unbounded" /> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + <xsd:complexType name="mappingType"> + <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="property" type="propertyType" /> + <xsd:element name="method" type="methodType" /> + <xsd:element name="component" type="componentTypeType" /> + </xsd:choice> + <xsd:attribute name="uri" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + + <xsd:complexType name="propertyType"> + <xsd:attributeGroup ref="mappedType" /> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:complexType> + + <xsd:complexType name="methodType"> + <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="return-type" type="return-typeType" /> + <xsd:element name="parameter" type="parameterType" /> + </xsd:choice> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + + <xsd:complexType name="return-typeType"> + <xsd:attributeGroup ref="mappedType" /> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:complexType> + + <xsd:complexType name="parameterType"> + <xsd:attribute name="index" type="xsd:int" /> + <xsd:attribute name="class" type="xsd:string" /> + <xsd:attributeGroup ref="mappedType" /> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:complexType> + + <xsd:complexType name="componentTypeType"> + <xsd:attribute name="class" type="xsd:string" /> + <xsd:attributeGroup ref="mappedType" /> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:complexType> + + <xsd:attributeGroup name="mappedType"> + <xsd:attribute name="name" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="typeName" type="xsd:string" /> + <xsd:attribute name="mappedName" type="xsd:string" /> + <xsd:attribute name="nillable" type="xsd:boolean" /> + <xsd:attribute name="flag" type="xsd:boolean" /> + <xsd:attribute name="ignore" type="xsd:boolean" /> + <xsd:attribute name="componentType" type="xsd:string" /> + <xsd:attribute name="keyType" type="xsd:string" /> + <xsd:attribute name="valueType" type="xsd:string" /> + <xsd:attribute name="minOccurs" type="xsd:int" /> + <xsd:attribute name="maxOccurs" type="xsd:string" /> + <xsd:attribute name="style"> + <xsd:simpleType> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="attribute" /> + <xsd:enumeration value="element" /> + </xsd:restriction> + </xsd:simpleType> + </xsd:attribute> + <xsd:anyAttribute namespace='##other' processContents='lax' /> + </xsd:attributeGroup> +</xsd:schema> \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder"> - <constructor-arg ref="cxf"/> - </bean> - - <bean class="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"/> - - <bean id="org.apache.cxf.ws.addressing.policy.UsingAddressingAssertionBuilder" - class="org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder"> - <property name="knownElements"> - <set> - <bean class="javax.xml.namespace.QName"> - <constructor-arg value="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy"/> - <constructor-arg value="UsingAddressing"/> - </bean> - <bean class="javax.xml.namespace.QName"> - <constructor-arg value="http://www.w3.org/2005/02/addressing/wsdl"/> - <constructor-arg value="UsingAddressing"/> - </bean> - <bean class="javax.xml.namespace.QName"> - <constructor-arg value="http://www.w3.org/2006/05/addressing/wsdl"/> - <constructor-arg value="UsingAddressing"/> - </bean> - </set> - </property> - </bean> - -</beans> \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-addr.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.ws.addressing.policy.AddressingAssertionBuilder"> + <constructor-arg ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.ws.addressing.policy.AddressingPolicyInterceptorProvider"/> + + <bean id="org.apache.cxf.ws.addressing.policy.UsingAddressingAssertionBuilder" + class="org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertionBuilder"> + <property name="knownElements"> + <set> + <bean class="javax.xml.namespace.QName"> + <constructor-arg value="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy"/> + <constructor-arg value="UsingAddressing"/> + </bean> + <bean class="javax.xml.namespace.QName"> + <constructor-arg value="http://www.w3.org/2005/02/addressing/wsdl"/> + <constructor-arg value="UsingAddressing"/> + </bean> + <bean class="javax.xml.namespace.QName"> + <constructor-arg value="http://www.w3.org/2006/05/addressing/wsdl"/> + <constructor-arg value="UsingAddressing"/> + </bean> + </set> + </property> + </bean> + +</beans> \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.binding.http.HttpBindingFactory" lazy-init="true"> - <property name="activationNamespaces"> - <set> - <value>http://apache.org/cxf/binding/http</value> - </set> - </property> - <property name="bus" ref="cxf"/> - </bean> -</beans> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.binding.http.HttpBindingFactory" lazy-init="true"> + <property name="activationNamespaces"> + <set> + <value>http://apache.org/cxf/binding/http</value> + </set> + </property> + <property name="bus" ref="cxf"/> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <import resource="classpath:META-INF/cxf/cxf-extension-http.xml"/> - - <bean class="org.jboss.wsf.stack.cxf.transport.TomcatHTTPTransportFactory" lazy-init="false" depends-on="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"> - <property name="bus" ref="cxf"/> - <property name="transportIds"> - <list> - <value>http://schemas.xmlsoap.org/soap/http</value> - <value>http://schemas.xmlsoap.org/wsdl/http/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> - <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> - <value>http://cxf.apache.org/transports/http/configuration</value> - <value>http://cxf.apache.org/bindings/xformat</value> - </list> - </property> - </bean> - -</beans> \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http-tomcat.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <import resource="classpath:META-INF/cxf/cxf-extension-http.xml"/> + + <bean class="org.jboss.wsf.stack.cxf.transport.TomcatHTTPTransportFactory" lazy-init="false" depends-on="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <list> + <value>http://schemas.xmlsoap.org/soap/http</value> + <value>http://schemas.xmlsoap.org/wsdl/http/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> + <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> + <value>http://cxf.apache.org/transports/http/configuration</value> + <value>http://cxf.apache.org/bindings/xformat</value> + </list> + </property> + </bean> + +</beans> \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"/> - <bean class="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"/> - - - <bean class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" - id="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" - lazy-init="true"> - <property name="bus" ref="cxf"/> - <property name="transportIds"> - <list> - <value>http://schemas.xmlsoap.org/soap/http</value> - <value>http://schemas.xmlsoap.org/wsdl/http/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> - <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> - <value>http://cxf.apache.org/transports/http/configuration</value> - <value>http://cxf.apache.org/bindings/xformat</value> - </list> - </property> - </bean> -</beans> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-http.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.transport.http.policy.HTTPClientAssertionBuilder"/> + <bean class="org.apache.cxf.transport.http.policy.HTTPServerAssertionBuilder"/> + + + <bean class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" + id="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" + lazy-init="true"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <list> + <value>http://schemas.xmlsoap.org/soap/http</value> + <value>http://schemas.xmlsoap.org/wsdl/http/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> + <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> + <value>http://cxf.apache.org/transports/http/configuration</value> + <value>http://cxf.apache.org/bindings/xformat</value> + </list> + </property> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" lazy-init="false"/> -</beans> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.jaxws.context.WebServiceContextResourceResolver" lazy-init="false"/> +</beans> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,18 +0,0 @@ -<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" - xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> - - <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/> - <bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/> - - <cxf:bus> - <cxf:inInterceptors> - <ref bean="logInbound"/> - </cxf:inInterceptors> - <cxf:outInterceptors> - <ref bean="logOutbound"/> - </cxf:outInterceptors> - <cxf:inFaultInterceptors> - <ref bean="logOutbound"/> - </cxf:inFaultInterceptors> - </cxf:bus> -</beans> \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jbossws.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,18 @@ +<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cxf="http://cxf.apache.org/core" + xsi:schemaLocation="http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> + + <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/> + <bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/> + + <cxf:bus> + <cxf:inInterceptors> + <ref bean="logInbound"/> + </cxf:inInterceptors> + <cxf:outInterceptors> + <ref bean="logOutbound"/> + </cxf:outInterceptors> + <cxf:inFaultInterceptors> + <ref bean="logOutbound"/> + </cxf:inFaultInterceptors> + </cxf:bus> +</beans> \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.transport.jms.JMSTransportFactory" lazy-init="true"> - <property name="bus" ref="cxf"/> - <property name="transportIds"> - <list> - <value>http://cxf.apache.org/transports/jms</value> - <value>http://cxf.apache.org/transports/jms/configuration</value> - </list> - </property> - </bean> -</beans> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-jms.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.transport.jms.JMSTransportFactory" lazy-init="true"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <list> + <value>http://cxf.apache.org/transports/jms</value> + <value>http://cxf.apache.org/transports/jms/configuration</value> + </list> + </property> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="true"> - <property name="bus" ref="cxf"/> - <property name="transportIds"> - <list> - <value>http://cxf.apache.org/transports/local</value> - </list> - </property> - </bean> -</beans> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-local.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.transport.local.LocalTransportFactory" lazy-init="true"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <list> + <value>http://cxf.apache.org/transports/local</value> + </list> + </property> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean id="org.apache.cxf.management.jmx.InstrumentationManagerImpl" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl"> - <property name="bus" ref="cxf"/> - <property name="enabled" value="false"/> - <property name="threaded" value="false"/> - <property name="daemon" value="false"/> - </bean> - -</beans> \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-management.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean id="org.apache.cxf.management.jmx.InstrumentationManagerImpl" class="org.apache.cxf.management.jmx.InstrumentationManagerImpl"> + <property name="bus" ref="cxf"/> + <property name="enabled" value="false"/> + <property name="threaded" value="false"/> + <property name="daemon" value="false"/> + </bean> + +</beans> \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.binding.object.ObjectBindingFactory" - lazy-init="true" depends-on="org.apache.cxf.endpoint.ServerLifeCycleManager" > - <property name="bus" ref="cxf"/> - <property name="activationNamespaces"> - <set> - <value>http://cxf.apache.org/binding/object</value> - </set> - </property> - </bean> -</beans> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.binding.object.ObjectBindingFactory" + lazy-init="true" depends-on="org.apache.cxf.endpoint.ServerLifeCycleManager" > + <property name="bus" ref="cxf"/> + <property name="activationNamespaces"> + <set> + <value>http://cxf.apache.org/binding/object</value> + </set> + </property> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean id="org.apache.cxf.ws.policy.AssertionBuilderRegistry" class="org.apache.cxf.ws.policy.AssertionBuilderRegistryImpl"> - <constructor-arg> - <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> - <property name="type" value="org.apache.cxf.ws.policy.AssertionBuilder"/> - <property name="idsProperty" value="knownElements"/> - </bean> - </constructor-arg> - </bean> - - <bean class="org.apache.cxf.ws.policy.PolicyConstants"/> - - <bean id="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry" class="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl"> - <constructor-arg> - <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> - <property name="type" value="org.apache.cxf.ws.policy.PolicyInterceptorProvider"/> - <property name="idsProperty" value="assertionTypes"/> - </bean> - </constructor-arg> - </bean> - - <bean id="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry" - class="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry"> - <constructor-arg> - <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> - <property name="type" value="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilder"/> - <property name="idsProperty" value="domainExpressionTypes"/> - </bean> - </constructor-arg> - </bean> - - <bean class="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"/> - - <bean id="org.apache.cxf.ws.policy.PolicyBuilder" class="org.apache.cxf.ws.policy.PolicyBuilderImpl"> - <property name="assertionBuilderRegistry" ref="org.apache.cxf.ws.policy.AssertionBuilderRegistry"/> - </bean> - - <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine"> - <property name="bus" ref="cxf"/> - </bean> - - <bean class="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider"> - <constructor-arg ref="cxf"/> - </bean> - - <bean class="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider"> - <constructor-arg ref="cxf"/> - </bean> - -  - <bean class="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder"> - <property name="bus" ref="cxf"/> - </bean> - <bean class="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"/> -</beans> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-policy.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean id="org.apache.cxf.ws.policy.AssertionBuilderRegistry" class="org.apache.cxf.ws.policy.AssertionBuilderRegistryImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> + <property name="type" value="org.apache.cxf.ws.policy.AssertionBuilder"/> + <property name="idsProperty" value="knownElements"/> + </bean> + </constructor-arg> + </bean> + + <bean class="org.apache.cxf.ws.policy.PolicyConstants"/> + + <bean id="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistry" class="org.apache.cxf.ws.policy.PolicyInterceptorProviderRegistryImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> + <property name="type" value="org.apache.cxf.ws.policy.PolicyInterceptorProvider"/> + <property name="idsProperty" value="assertionTypes"/> + </bean> + </constructor-arg> + </bean> + + <bean id="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry" + class="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilderRegistry"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanQNameMap"> + <property name="type" value="org.apache.cxf.ws.policy.attachment.external.DomainExpressionBuilder"/> + <property name="idsProperty" value="domainExpressionTypes"/> + </bean> + </constructor-arg> + </bean> + + <bean class="org.apache.cxf.ws.policy.attachment.external.EndpointReferenceDomainExpressionBuilder"/> + + <bean id="org.apache.cxf.ws.policy.PolicyBuilder" class="org.apache.cxf.ws.policy.PolicyBuilderImpl"> + <property name="assertionBuilderRegistry" ref="org.apache.cxf.ws.policy.AssertionBuilderRegistry"/> + </bean> + + <bean id="org.apache.cxf.ws.policy.PolicyEngine" class="org.apache.cxf.ws.policy.spring.InitializingPolicyEngine"> + <property name="bus" ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.ws.policy.attachment.wsdl11.Wsdl11AttachmentPolicyProvider"> + <constructor-arg ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.ws.policy.attachment.ServiceModelPolicyProvider"> + <constructor-arg ref="cxf"/> + </bean> + +  + <bean class="org.apache.cxf.ws.policy.mtom.MTOMAssertionBuilder"> + <property name="bus" ref="cxf"/> + </bean> + <bean class="org.apache.cxf.ws.policy.mtom.MTOMPolicyInterceptorProvider"/> +</beans> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean id="org.apache.cxf.ws.rm.RMManager" class="org.apache.cxf.ws.rm.RMManager"> - <property name="bus" ref="cxf"/> - </bean> - - <bean class="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider"> - <constructor-arg><ref bean="cxf"/></constructor-arg> - </bean> - - <bean id="org.apache.cxf.ws.rm.RMAssertionBuilder" class="org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertionBuilder"> - <constructor-arg value="org.apache.cxf.ws.rm.policy.RMAssertion"/> - <constructor-arg> - <bean class="javax.xml.namespace.QName"> - <constructor-arg value="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> - <constructor-arg value="RMAssertion"/> - </bean> - </constructor-arg> - </bean> - -</beans> \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-rm.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean id="org.apache.cxf.ws.rm.RMManager" class="org.apache.cxf.ws.rm.RMManager"> + <property name="bus" ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.ws.rm.policy.RMPolicyInterceptorProvider"> + <constructor-arg><ref bean="cxf"/></constructor-arg> + </bean> + + <bean id="org.apache.cxf.ws.rm.RMAssertionBuilder" class="org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertionBuilder"> + <constructor-arg value="org.apache.cxf.ws.rm.policy.RMAssertion"/> + <constructor-arg> + <bean class="javax.xml.namespace.QName"> + <constructor-arg value="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> + <constructor-arg value="RMAssertion"/> + </bean> + </constructor-arg> + </bean> + +</beans> \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.binding.soap.SoapBindingFactory" lazy-init="true"> - <property name="activationNamespaces"> - <set> - <value>http://schemas.xmlsoap.org/soap/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap12/</value> - <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> - </set> - </property> - <property name="bus" ref="cxf"/> - </bean> - - <bean class="org.apache.cxf.binding.soap.SoapTransportFactory" lazy-init="true"> - <property name="transportIds"> - <list> - <value>http://schemas.xmlsoap.org/soap/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap12/</value> - </list> - </property> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.binding.soap.customEditorConfigurer" - class="org.springframework.beans.factory.config.CustomEditorConfigurer"> - <property name="customEditors"> - <map> - <entry key="org.apache.cxf.binding.soap.SoapVersion"> - <bean class="org.apache.cxf.binding.soap.SoapVersionPropertyEditor"/> - </entry> - </map> - </property> - </bean> -</beans> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-soap.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.binding.soap.SoapBindingFactory" lazy-init="true"> + <property name="activationNamespaces"> + <set> + <value>http://schemas.xmlsoap.org/soap/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap12/</value> + <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> + </set> + </property> + <property name="bus" ref="cxf"/> + </bean> + + <bean class="org.apache.cxf.binding.soap.SoapTransportFactory" lazy-init="true"> + <property name="transportIds"> + <list> + <value>http://schemas.xmlsoap.org/soap/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap12/</value> + </list> + </property> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.binding.soap.customEditorConfigurer" + class="org.springframework.beans.factory.config.CustomEditorConfigurer"> + <property name="customEditors"> + <map> + <entry key="org.apache.cxf.binding.soap.SoapVersion"> + <bean class="org.apache.cxf.binding.soap.SoapVersionPropertyEditor"/> + </entry> + </map> + </property> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.binding.xml.XMLBindingFactory" lazy-init="true"> - <property name="activationNamespaces"> - <set> - <value>http://cxf.apache.org/bindings/xformat</value> - <value>http://www.w3.org/2004/08/wsdl/http</value> - </set> - </property> - <property name="bus" ref="cxf"/> - </bean> - -</beans> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-extension-xml.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.binding.xml.XMLBindingFactory" lazy-init="true"> + <property name="activationNamespaces"> + <set> + <value>http://cxf.apache.org/bindings/xformat</value> + <value>http://www.w3.org/2004/08/wsdl/http</value> + </set> + </property> + <property name="bus" ref="cxf"/> + </bean> + +</beans> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean class="org.apache.cxf.transport.servlet.ServletTransportFactory"> - <property name="bus" ref="cxf"/> - <property name="transportIds"> - <set> - <value>http://cxf.apache.org/bindings/xformat</value> - <value>http://schemas.xmlsoap.org/soap/http</value> - <value>http://schemas.xmlsoap.org/wsdl/http/</value> - <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> - <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> - <value>http://cxf.apache.org/transports/http/configuration</value> - </set> - </property> - </bean> -</beans> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf-servlet.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean class="org.apache.cxf.transport.servlet.ServletTransportFactory"> + <property name="bus" ref="cxf"/> + <property name="transportIds"> + <set> + <value>http://cxf.apache.org/bindings/xformat</value> + <value>http://schemas.xmlsoap.org/soap/http</value> + <value>http://schemas.xmlsoap.org/wsdl/http/</value> + <value>http://schemas.xmlsoap.org/wsdl/soap/http</value> + <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value> + <value>http://cxf.apache.org/transports/http/configuration</value> + </set> + </property> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,14 +0,0 @@ -META-INF/cxf/cxf-extension-jaxws.xml -META-INF/cxf/cxf-extension-rm.xml -META-INF/cxf/cxf-extension-addr.xml -META-INF/cxf/cxf-extension-http-tomcat.xml -META-INF/cxf/cxf-extension-object-binding.xml -META-INF/cxf/cxf-extension-http.xml -META-INF/cxf/cxf-extension-http-binding.xml -META-INF/cxf/cxf-extension-xml.xml -META-INF/cxf/cxf-extension-policy.xml -META-INF/cxf/cxf-extension-jms.xml -META-INF/cxf/cxf-extension-local.xml -META-INF/cxf/cxf-extension-management.xml -META-INF/cxf/cxf-extension-soap.xml -META-INF/cxf/cxf-extension-jbossws.xml \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.extension 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,14 @@ +META-INF/cxf/cxf-extension-jaxws.xml +META-INF/cxf/cxf-extension-rm.xml +META-INF/cxf/cxf-extension-addr.xml +META-INF/cxf/cxf-extension-http-tomcat.xml +META-INF/cxf/cxf-extension-object-binding.xml +META-INF/cxf/cxf-extension-http.xml +META-INF/cxf/cxf-extension-http-binding.xml +META-INF/cxf/cxf-extension-xml.xml +META-INF/cxf/cxf-extension-policy.xml +META-INF/cxf/cxf-extension-jms.xml +META-INF/cxf/cxf-extension-local.xml +META-INF/cxf/cxf-extension-management.xml +META-INF/cxf/cxf-extension-soap.xml +META-INF/cxf/cxf-extension-jbossws.xml \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:foo="http://cxf.apache.org/configuration/foo" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/> - <bean class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/> - <bean class="org.apache.cxf.bus.spring.BusExtensionPostProcessor" id="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/> - - <bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.cxf.bus.resource.ResourceManagerImpl"> - <constructor-arg> - <list> - <bean class="org.apache.cxf.resource.ClasspathResolver"/> - <bean class="org.apache.cxf.resource.ClassLoaderResolver"/> - <bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/> - </list> - </constructor-arg> - <property name="bus" ref="cxf"/> - </bean> - <bean id="org.apache.cxf.configuration.Configurer" - class="org.apache.cxf.configuration.spring.ConfigurerImpl"> - </bean> - - <bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl"> - <constructor-arg> - <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> - <property name="type" value="org.apache.cxf.binding.BindingFactory"/> - <property name="idsProperty" value="activationNamespaces"/> - </bean> - </constructor-arg> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.transport.DestinationFactoryManager" class="org.apache.cxf.transport.DestinationFactoryManagerImpl"> - <constructor-arg> - <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> - <property name="type" value="org.apache.cxf.transport.DestinationFactory"/> - <property name="idsProperty" value="transportIds"/> - </bean> - </constructor-arg> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.transport.ConduitInitiatorManager" class="org.apache.cxf.transport.ConduitInitiatorManagerImpl"> - <constructor-arg> - <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> - <property name="type" value="org.apache.cxf.transport.ConduitInitiator"/> - <property name="idsProperty" value="transportIds"/> - </bean> - </constructor-arg> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.wsdl.WSDLManager" class="org.apache.cxf.wsdl11.WSDLManagerImpl"> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.phase.PhaseManager" class="org.apache.cxf.phase.PhaseManagerImpl"> - - </bean> - - <bean id="org.apache.cxf.workqueue.WorkQueueManager" class="org.apache.cxf.workqueue.WorkQueueManagerImpl"> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.buslifecycle.BusLifeCycleManager" class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager"> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.endpoint.ServerRegistry" class="org.apache.cxf.endpoint.ServerRegistryImpl"> - <property name="bus" ref="cxf"/> - </bean> - - <bean id="org.apache.cxf.endpoint.ServerLifeCycleManager" class="org.apache.cxf.endpoint.ServerLifeCycleManagerImpl"/> - <bean id="org.apache.cxf.endpoint.ClientLifeCycleManager" class="org.apache.cxf.endpoint.ClientLifeCycleManagerImpl"/> - - - <bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl"> - <constructor-arg ref="cxf"/> - <constructor-arg> - <list> - <bean class="org.apache.cxf.transport.http.WSDLQueryHandler"> - <constructor-arg ref="cxf"/> - </bean> - </list> - </constructor-arg> - </bean> - - <bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl"> - <property name="bus" ref="cxf"/> - </bean> - <bean id="org.apache.cxf.headers.HeaderManager" class="org.apache.cxf.headers.HeaderManagerImpl"> - <property name="bus" ref="cxf"/> - </bean> - <bean id="org.apache.cxf.catalog.OASISCatalogManager" class="org.apache.cxf.catalog.OASISCatalogManager"> - <property name="bus" ref="cxf"/> - </bean> -</beans> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/cxf/cxf.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:foo="http://cxf.apache.org/configuration/foo" + xsi:schemaLocation=" +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean id="cxf" class="org.apache.cxf.bus.CXFBusImpl"/> + <bean class="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor" id="org.apache.cxf.bus.spring.Jsr250BeanPostProcessor"/> + <bean class="org.apache.cxf.bus.spring.BusExtensionPostProcessor" id="org.apache.cxf.bus.spring.BusExtensionPostProcessor"/> + + <bean id="org.apache.cxf.resource.ResourceManager" class="org.apache.cxf.bus.resource.ResourceManagerImpl"> + <constructor-arg> + <list> + <bean class="org.apache.cxf.resource.ClasspathResolver"/> + <bean class="org.apache.cxf.resource.ClassLoaderResolver"/> + <bean class="org.apache.cxf.bus.spring.BusApplicationContextResourceResolver"/> + </list> + </constructor-arg> + <property name="bus" ref="cxf"/> + </bean> + <bean id="org.apache.cxf.configuration.Configurer" + class="org.apache.cxf.configuration.spring.ConfigurerImpl"> + </bean> + + <bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> + <property name="type" value="org.apache.cxf.binding.BindingFactory"/> + <property name="idsProperty" value="activationNamespaces"/> + </bean> + </constructor-arg> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.transport.DestinationFactoryManager" class="org.apache.cxf.transport.DestinationFactoryManagerImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> + <property name="type" value="org.apache.cxf.transport.DestinationFactory"/> + <property name="idsProperty" value="transportIds"/> + </bean> + </constructor-arg> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.transport.ConduitInitiatorManager" class="org.apache.cxf.transport.ConduitInitiatorManagerImpl"> + <constructor-arg> + <bean class="org.apache.cxf.configuration.spring.SpringBeanMap"> + <property name="type" value="org.apache.cxf.transport.ConduitInitiator"/> + <property name="idsProperty" value="transportIds"/> + </bean> + </constructor-arg> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.wsdl.WSDLManager" class="org.apache.cxf.wsdl11.WSDLManagerImpl"> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.phase.PhaseManager" class="org.apache.cxf.phase.PhaseManagerImpl"> + + </bean> + + <bean id="org.apache.cxf.workqueue.WorkQueueManager" class="org.apache.cxf.workqueue.WorkQueueManagerImpl"> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.buslifecycle.BusLifeCycleManager" class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager"> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.endpoint.ServerRegistry" class="org.apache.cxf.endpoint.ServerRegistryImpl"> + <property name="bus" ref="cxf"/> + </bean> + + <bean id="org.apache.cxf.endpoint.ServerLifeCycleManager" class="org.apache.cxf.endpoint.ServerLifeCycleManagerImpl"/> + <bean id="org.apache.cxf.endpoint.ClientLifeCycleManager" class="org.apache.cxf.endpoint.ClientLifeCycleManagerImpl"/> + + + <bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl"> + <constructor-arg ref="cxf"/> + <constructor-arg> + <list> + <bean class="org.apache.cxf.transport.http.WSDLQueryHandler"> + <constructor-arg ref="cxf"/> + </bean> + </list> + </constructor-arg> + </bean> + + <bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl"> + <property name="bus" ref="cxf"/> + </bean> + <bean id="org.apache.cxf.headers.HeaderManager" class="org.apache.cxf.headers.HeaderManagerImpl"> + <property name="bus" ref="cxf"/> + </bean> + <bean id="org.apache.cxf.catalog.OASISCatalogManager" class="org.apache.cxf.catalog.OASISCatalogManager"> + <property name="bus" ref="cxf"/> + </bean> +</beans> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> - -<properties version="1.0"> - <entry key="org.apache.cxf.transports.http-1">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPClientPolicy</entry> - <entry key="org.apache.cxf.transports.http-2">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPServerPolicy</entry> - <entry key="org.apache.cxf.transports.http-3">javax.wsdl.Port=org.xmlsoap.schemas.wsdl.http.AddressType</entry> - <entry key="org.apache.cxf.bindings.xml-1">javax.wsdl.BindingInput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry> - <entry key="org.apache.cxf.bindings.xml-2">javax.wsdl.BindingOutput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry> - <entry key="org.apache.cxf.bindings.xml-3">javax.wsdl.Binding=org.apache.cxf.bindings.xformat.XMLFormatBinding</entry> - <entry key="org.apache.cxf.transport.jms-1">javax.wsdl.Port=org.apache.cxf.transport.jms.AddressType</entry> - <entry key="org.apache.cxf.transport.jms-2">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientBehaviorPolicyType</entry> - <entry key="org.apache.cxf.transport.jms-3">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerBehaviorPolicyType</entry> -</properties> - Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/extensions.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> + +<properties version="1.0"> + <entry key="org.apache.cxf.transports.http-1">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPClientPolicy</entry> + <entry key="org.apache.cxf.transports.http-2">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPServerPolicy</entry> + <entry key="org.apache.cxf.transports.http-3">javax.wsdl.Port=org.xmlsoap.schemas.wsdl.http.AddressType</entry> + <entry key="org.apache.cxf.bindings.xml-1">javax.wsdl.BindingInput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry> + <entry key="org.apache.cxf.bindings.xml-2">javax.wsdl.BindingOutput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry> + <entry key="org.apache.cxf.bindings.xml-3">javax.wsdl.Binding=org.apache.cxf.bindings.xformat.XMLFormatBinding</entry> + <entry key="org.apache.cxf.transport.jms-1">javax.wsdl.Port=org.apache.cxf.transport.jms.AddressType</entry> + <entry key="org.apache.cxf.transport.jms-2">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientBehaviorPolicyType</entry> + <entry key="org.apache.cxf.transport.jms-3">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerBehaviorPolicyType</entry> +</properties> + Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/jax-ws-catalog.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/jax-ws-catalog.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/jax-ws-catalog.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> - <rewriteSystem systemIdStartString="http://www.w3.org/2005/08/addressing" rewritePrefix="classpath:/schemas/wsdl"/> -</catalog> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/jax-ws-catalog.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/jax-ws-catalog.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/jax-ws-catalog.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/jax-ws-catalog.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> + <rewriteSystem systemIdStartString="http://www.w3.org/2005/08/addressing" rewritePrefix="classpath:/schemas/wsdl"/> +</catalog> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> -<properties> - <entry key="XMLFormatValidator">org.apache.cxf.binding.xml.XMLFormatValidator</entry> -</properties> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/service.validator.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> + <entry key="XMLFormatValidator">org.apache.cxf.binding.xml.XMLFormatValidator</entry> +</properties> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services) Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,2 +0,0 @@ -org.apache.cxf.xjc.ts.ToStringPlugin -org.apache.cxf.xjc.dv.DefaultValuePlugin Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/com.sun.tools.xjc.Plugin 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,2 @@ +org.apache.cxf.xjc.ts.ToStringPlugin +org.apache.cxf.xjc.dv.DefaultValuePlugin Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/javax.xml.ws.spi.Provider =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/javax.xml.ws.spi.Provider 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/javax.xml.ws.spi.Provider 2008-04-23 20:09:00 UTC (rev 6640) @@ -1 +0,0 @@ -org.apache.cxf.jaxws.spi.ProviderImpl Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/javax.xml.ws.spi.Provider (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/javax.xml.ws.spi.Provider) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/javax.xml.ws.spi.Provider (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/javax.xml.ws.spi.Provider 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1 @@ +org.apache.cxf.jaxws.spi.ProviderImpl Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/org.apache.cxf.bus.factory =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/org.apache.cxf.bus.factory 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/org.apache.cxf.bus.factory 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,2 +0,0 @@ -org.apache.cxf.bus.spring.SpringBusFactory -org.springframework.context.ApplicationContext \ No newline at end of file Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/org.apache.cxf.bus.factory (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/org.apache.cxf.bus.factory) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/org.apache.cxf.bus.factory (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/services/org.apache.cxf.bus.factory 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,2 @@ +org.apache.cxf.bus.spring.SpringBusFactory +org.springframework.context.ApplicationContext \ No newline at end of file Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,259 +0,0 @@ -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/jaxws=org.apache.cxf.jaxws.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/ws/rm/manager=org.apache.cxf.ws.rm.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/ws/addressing=org.apache.cxf.ws.addressing.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/bindings/object=org.apache.cxf.binding.object.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/transports/http-jetty/configuration=org.apache.cxf.transport.http_jetty.spring.NamespaceHandler - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/transports/http/configuration=org.apache.cxf.transport.http.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/simple=org.apache.cxf.frontend.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/policy=org.apache.cxf.ws.policy.spring.NamespaceHandler -http\://www.w3.org/ns/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler -http\://www.w3.org/2006/07/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler -http\://schemas.xmlsoap.org/ws/2004/09/policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/clustering=org.apache.cxf.clustering.spring.NamespaceHandler -http\://cxf.apache.org/core=org.apache.cxf.bus.spring.NamespaceHandler - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/transports/jms=org.apache.cxf.transport.jms.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/bindings/soap=org.apache.cxf.binding.soap.spring.NamespaceHandler -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/binding/coloc=org.apache.cxf.binding.coloc.spring.NamespaceHandler Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.handlers 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,259 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/jaxws=org.apache.cxf.jaxws.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/ws/rm/manager=org.apache.cxf.ws.rm.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/ws/addressing=org.apache.cxf.ws.addressing.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/bindings/object=org.apache.cxf.binding.object.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/transports/http-jetty/configuration=org.apache.cxf.transport.http_jetty.spring.NamespaceHandler + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/transports/http/configuration=org.apache.cxf.transport.http.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/simple=org.apache.cxf.frontend.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/policy=org.apache.cxf.ws.policy.spring.NamespaceHandler +http\://www.w3.org/ns/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler +http\://www.w3.org/2006/07/ws-policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler +http\://schemas.xmlsoap.org/ws/2004/09/policy=org.apache.cxf.ws.policy.spring.PolicyNamespaceHandler + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/clustering=org.apache.cxf.clustering.spring.NamespaceHandler +http\://cxf.apache.org/core=org.apache.cxf.bus.spring.NamespaceHandler + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/transports/jms=org.apache.cxf.transport.jms.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/bindings/soap=org.apache.cxf.binding.soap.spring.NamespaceHandler +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/binding/coloc=org.apache.cxf.binding.coloc.spring.NamespaceHandler Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,293 +0,0 @@ -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/jaxws.xsd=schemas/jaxws.xsd -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/configuration/wsrm-manager-types.xsd=schemas/configuration/wsrm-manager-types.xsd -http\://cxf.apache.org/schemas/configuration/wsrm-manager.xsd=schemas/configuration/wsrm-manager.xsd -http\://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd=schemas/configuration/wsrm-policy.xsd -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/ws/addressing.xsd=schemas/ws-addr-conf.xsd -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schema/bindings/object.xsd=org/apache/cxf/binding/soap/spring/object.xsd -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/configuration/http-jetty.xsd=schemas/configuration/http-jetty.xsd - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/wsdl/http-conf.xsd=schemas/wsdl/http-conf.xsd -http\://cxf.apache.org/schemas/configuration/http-conf.xsd=schemas/configuration/http-conf.xsd - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/simple.xsd=schemas/simple.xsd -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://www.w3.org/2007/02/ws-policy.xsd=schemas/ws-policy-200702.xsd -http\://www.w3.org/2006/07/ws-policy.xsd=schemas/ws-policy-200607.xsd -http\://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd=schemas/ws-policy-200409.xsd -http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd -http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd -http\://www.w3.org/2001/xml.xsd=schemas/xml.xsd -http\://cxf.apache.org/schemas/policy.xsd=schemas/policy.xsd - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/wsdl/jms.xsd=schemas/wsdl/jms.xsd -http\://cxf.apache.org/schemas/configuration/jms.xsd=schemas/configuration/jms.xsd - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd -http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd -http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd - -http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd - - -# -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -# -http\://cxf.apache.org/schemas/configuration/soap.xsd=schemas/configuration/soap.xsd Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/spring.schemas 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,293 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/jaxws.xsd=schemas/jaxws.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/configuration/wsrm-manager-types.xsd=schemas/configuration/wsrm-manager-types.xsd +http\://cxf.apache.org/schemas/configuration/wsrm-manager.xsd=schemas/configuration/wsrm-manager.xsd +http\://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd=schemas/configuration/wsrm-policy.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/ws/addressing.xsd=schemas/ws-addr-conf.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schema/bindings/object.xsd=org/apache/cxf/binding/soap/spring/object.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/configuration/http-jetty.xsd=schemas/configuration/http-jetty.xsd + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/wsdl/http-conf.xsd=schemas/wsdl/http-conf.xsd +http\://cxf.apache.org/schemas/configuration/http-conf.xsd=schemas/configuration/http-conf.xsd + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/configuration/cxf-beans.xsd=schemas/configuration/cxf-beans.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/simple.xsd=schemas/simple.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://www.w3.org/2007/02/ws-policy.xsd=schemas/ws-policy-200702.xsd +http\://www.w3.org/2006/07/ws-policy.xsd=schemas/ws-policy-200607.xsd +http\://schemas.xmlsoap.org/ws/2004/09/policy/ws-policy.xsd=schemas/ws-policy-200409.xsd +http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd +http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd +http\://www.w3.org/2001/xml.xsd=schemas/xml.xsd +http\://cxf.apache.org/schemas/policy.xsd=schemas/policy.xsd + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/core.xsd=schemas/core.xsd +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/wsdl/jms.xsd=schemas/wsdl/jms.xsd +http\://cxf.apache.org/schemas/configuration/jms.xsd=schemas/configuration/jms.xsd + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://schemas.xmlsoap.org/wsdl/=schemas/wsdl/wsdl.xsd +http\://schemas.xmlsoap.org/wsdl/http/=schemas/wsdl/http.xsd +http\://schemas.xmlsoap.org/ws/2004/08/addressing=schemas/wsdl/addressing.xsd + +http\://cxf.apache.org/schemas/configuration/security.xsd=schemas/configuration/security.xsd + + +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/schemas/configuration/soap.xsd=schemas/configuration/soap.xsd Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<plugin xmlns="http://cxf.apache.org/tools/plugin" name="default" version="" provider="cxf.apache.org"> - <databinding name="jaxb" package="org.apache.cxf.tools.wsdlto.databinding.jaxb" profile="JAXBDataBinding"/> - <frontend name="jaxws" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile"> - <container name="JAXWSContainer" toolspec="jaxws-toolspec.xml"/> - <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/> - <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11"/> - <generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators"> - <generator name="AntGenerator"/> - <generator name="ClientGenerator"/> - <generator name="FaultGenerator"/> - <generator name="ImplGenerator"/> - <generator name="SEIGenerator"/> - <generator name="ServerGenerator"/> - <generator name="ServiceGenerator"/> - </generators> - </frontend> -</plugin> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/tools-plugin.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<plugin xmlns="http://cxf.apache.org/tools/plugin" name="default" version="" provider="cxf.apache.org"> + <databinding name="jaxb" package="org.apache.cxf.tools.wsdlto.databinding.jaxb" profile="JAXBDataBinding"/> + <frontend name="jaxws" package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile"> + <container name="JAXWSContainer" toolspec="jaxws-toolspec.xml"/> + <processor name="WSDLToJavaProcessor" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/> + <builder name="JAXWSDefinitionBuilder" package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11"/> + <generators package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators"> + <generator name="AntGenerator"/> + <generator name="ClientGenerator"/> + <generator name="FaultGenerator"/> + <generator name="ImplGenerator"/> + <generator name="SEIGenerator"/> + <generator name="ServerGenerator"/> + <generator name="ServiceGenerator"/> + </generators> + </frontend> +</plugin> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> -<properties> - <entry key="xml-javax.wsdl.Port">org.apache.cxf.binding.xml.wsdl11.HttpAddressPlugin</entry> - <entry key="xml-javax.wsdl.Binding">org.apache.cxf.binding.xml.wsdl11.XmlBindingPlugin</entry> - <entry key="xml-javax.wsdl.BindingInput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry> - <entry key="xml-javax.wsdl.BindingOutput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry> -</properties> Copied: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf.sar/META-INF/wsdl.plugin.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> +<properties> + <entry key="xml-javax.wsdl.Port">org.apache.cxf.binding.xml.wsdl11.HttpAddressPlugin</entry> + <entry key="xml-javax.wsdl.Binding">org.apache.cxf.binding.xml.wsdl11.XmlBindingPlugin</entry> + <entry key="xml-javax.wsdl.BindingInput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry> + <entry key="xml-javax.wsdl.BindingOutput">org.apache.cxf.binding.xml.wsdl11.XmlIoPlugin</entry> +</properties> Copied: stack/cxf/trunk/modules/server/src/main/scripts (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts) Deleted: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project default="main"> - - <property name="project.resources.directory" value="${basedir}/src/main/resources"/> - <property name="project.build.directory" value="${basedir}/target"/> - <property name="project.build.resources.directory" value="${project.build.directory}/resources"/> - - <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/> - -  -  -  - - <target name="init"> - </target> - -  - <target name="main" depends="init"> - -  - <echo message="Concat jbossws-cxf50-beans.xml"/> - <concat destfile="${project.build.resources.directory}/jbossws-beans50/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header> - <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> - <footer trimleading="yes"> - </deployment> </footer> - </concat> - -  - <echo message="Concat jbossws-cxf42-beans.xml"/> - <concat destfile="${project.build.resources.directory}/jbossws-beans42/META-INF/jboss-beans.xml"> - <header trimleading="yes"> - <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" - xmlns="urn:jboss:bean-deployer"> </header> - <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> - <fileset file="${project.build.resources.directory}/jbossws-jboss42-config.xml"/> - <footer trimleading="yes"> - </deployment> </footer> - </concat> - - </target> - -</project> Copied: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/server/src/main/scripts/antrun-beans-config.xml) =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main"> + + <property name="project.resources.directory" value="${basedir}/src/main/resources"/> + <property name="project.build.directory" value="${basedir}/target"/> + <property name="project.build.resources.directory" value="${project.build.directory}/resources"/> + + <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/> + +  +  +  + + <target name="init"> + </target> + +  + <target name="main" depends="init"> + +  + <echo message="Concat jbossws-cxf50-beans.xml"/> + <concat destfile="${project.build.resources.directory}/jbossws-beans50/META-INF/jboss-beans.xml"> + <header trimleading="yes"> + <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header> + <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> + <footer trimleading="yes"> + </deployment> </footer> + </concat> + +  + <echo message="Concat jbossws-cxf42-beans.xml"/> + <concat destfile="${project.build.resources.directory}/jbossws-beans42/META-INF/jboss-beans.xml"> + <header trimleading="yes"> + <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"> </header> + <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> + <fileset file="${project.build.resources.directory}/jbossws-jboss42-config.xml"/> + <footer trimleading="yes"> + </deployment> </footer> + </concat> + + </target> + +</project> Copied: stack/cxf/trunk/modules/testsuite (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite) Property changes on: stack/cxf/trunk/modules/testsuite ___________________________________________________________________ Name: svn:ignore + target Copied: stack/cxf/trunk/modules/testsuite/cxf-tests (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests ___________________________________________________________________ Name: svn:ignore + target Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/pom.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,68 +0,0 @@ -<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>JBoss Web Services - Stack CXF Specific Tests</name> - <artifactId>jbossws-cxf-specific-tests</artifactId> - <packaging>jar</packaging> - -  - <parent> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf-testsuite</artifactId> - <version>3.0.2-SNAPSHOT</version> - </parent> - - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="src/scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="src/scripts/cxf-samples-jaxws.xml" target="build-samples-jaxws"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> -  - <profile> - <id>jboss422-cxf-tests-profile</id> - <activation> - <property> - <name>env</name> - <value>jboss422</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <testExcludes> -  - <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/**</exclude> - </testExcludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/pom.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,68 @@ +<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>JBoss Web Services - Stack CXF Specific Tests</name> + <artifactId>jbossws-cxf-specific-tests</artifactId> + <packaging>jar</packaging> + +  + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf-testsuite</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="src/scripts/cxf-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="src/scripts/cxf-samples-jaxws.xml" target="build-samples-jaxws"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> +  + <profile> + <id>jboss422-cxf-tests-profile</id> + <activation> + <property> + <name>env</name> + <value>jboss422</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <testExcludes> +  + <exclude>org/jboss/test/ws/jaxws/samples/wsrm/**</exclude> + <exclude>org/jboss/test/ws/jaxws/cxf/wsrm/**</exclude> + </testExcludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project> - - <description>JBossWS test archive builder</description> - -  -  -  -  -  -  -  - - <target name="build-jars-jaxws" description="Build the deployments."> - - <mkdir dir="${tests.output.dir}/test-libs"/> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - -  - - </target> - -</project> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + + <description>JBossWS test archive builder</description> + +  +  +  +  +  +  +  + + <target name="build-jars-jaxws" description="Build the deployments."> + + <mkdir dir="${tests.output.dir}/test-libs"/> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + +  + + </target> + +</project> Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project> - -  -  -  - - <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> - - <mkdir dir="${tests.output.dir}/test-libs"/> - -  - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl" - prefix="WEB-INF/wsdl"/> - </war> - -  - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" - prefix="WEB-INF/wsdl"/> - </war> - -  - - </target> - -</project> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + +  +  +  + + <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> + + <mkdir dir="${tests.output.dir}/test-libs"/> + +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + +  + + </target> + +</project> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/etc) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jndi.properties =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/etc/jndi.properties 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jndi.properties 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,3 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -java.naming.provider.url=jnp://@jboss.bind.address@:1099 \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jndi.properties (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/etc/jndi.properties) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jndi.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jndi.properties 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,3 @@ +java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory +java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces +java.naming.provider.url=jnp://@jboss.bind.address@:1099 \ No newline at end of file Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - -  -  -  - -  - <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <param name="File" value="${jbossws.test.log}/test.log"/> - <param name="Append" value="true"/> - -  - <param name="DatePattern" value="'.'yyyy-MM-dd"/> - - <layout class="org.apache.log4j.PatternLayout"> -  - <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/> - </layout> - </appender> - -  -  -  - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Threshold" value="INFO"/> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> -  - <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  -  -  - - <category name="org.jboss.ws"> - <priority value="DEBUG"/> - </category> - - <category name="org.jboss.test.ws"> - <priority value="TRACE"/> - </category> - - <category name="org.apache.cxf"> - <priority value="TRACE"/> - </category> - -  - <category name="org.apache.xml.security"> - <priority value="INFO"/> - </category> - -  -  -  - - <root> -  - <appender-ref ref="FILE"/> - </root> - -</log4j:configuration> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + + + + + + + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + +  +  +  + +  + <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> + <param name="File" value="${jbossws.test.log}/test.log"/> + <param name="Append" value="true"/> + +  + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + + <layout class="org.apache.log4j.PatternLayout"> +  + <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/> + </layout> + </appender> + +  +  +  + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Threshold" value="INFO"/> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> +  + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + +  +  +  + + <category name="org.jboss.ws"> + <priority value="DEBUG"/> + </category> + + <category name="org.jboss.test.ws"> + <priority value="TRACE"/> + </category> + + <category name="org.apache.cxf"> + <priority value="TRACE"/> + </category> + +  + <category name="org.apache.xml.security"> + <priority value="INFO"/> + </category> + +  +  +  + + <root> +  + <appender-ref ref="FILE"/> + </root> + +</log4j:configuration> Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/tst.policy =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/etc/tst.policy 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/tst.policy 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,4 +0,0 @@ -grant { - permission java.security.AllPermission; -}; - Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/tst.policy (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/etc/tst.policy) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/tst.policy (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/tst.policy 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,4 @@ +grant { + permission java.security.AllPermission; +}; + Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.cxf.descriptor; - -// $Id$ - -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(name = "DescriptorEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/descriptor", serviceName = "DescriptorService") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface DescriptorEndpoint -{ - String echo(String input); -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpoint.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.cxf.descriptor; + +// $Id$ + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "DescriptorEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/descriptor", serviceName = "DescriptorService") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface DescriptorEndpoint +{ + String echo(String input); +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.cxf.descriptor; - -// $Id$ - -import java.util.logging.Logger; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(name = "DescriptorEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/descriptor", serviceName = "DescriptorService") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class DescriptorEndpointImpl -{ - private Logger jdklog = Logger.getLogger("org.apache.cxf.foo"); - - @WebMethod - public String echo(String input) - { - // Test jdk logging redirection to jboss logging - jdklog.severe("SEVERE: " + input); - jdklog.warning("WARNING: " + input); - jdklog.info("INFO: " + input); - jdklog.fine("FINE: " + input); - jdklog.finer("FINER: " + input); - jdklog.finest("FINEST: " + input); - - return input; - } -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.cxf.descriptor; + +// $Id$ + +import java.util.logging.Logger; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "DescriptorEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/descriptor", serviceName = "DescriptorService") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class DescriptorEndpointImpl +{ + private Logger jdklog = Logger.getLogger("org.apache.cxf.foo"); + + @WebMethod + public String echo(String input) + { + // Test jdk logging redirection to jboss logging + jdklog.severe("SEVERE: " + input); + jdklog.warning("WARNING: " + input); + jdklog.info("INFO: " + input); + jdklog.fine("FINE: " + input); + jdklog.finer("FINER: " + input); + jdklog.finest("FINEST: " + input); + + return input; + } +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.cxf.descriptor; - -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; - -/** - * Test a CXF endpoint with provided jbossws-cxf.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-Dec-2007 - */ -public class DescriptorJSETestCase extends JBossWSTest -{ - private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-descriptor/TestService"; - private String targetNS = "http://org.jboss.ws.jaxws.cxf/descriptor"; - - public static Test suite() - { - return new JBossWSTestSetup(DescriptorJSETestCase.class, "jaxws-cxf-descriptor.war"); - } - - public void testLegalAccess() throws Exception - { - URL wsdlURL = new URL(endpointURL + "?wsdl"); - QName serviceName = new QName(targetNS, "DescriptorService"); - - Service service = Service.create(wsdlURL, serviceName); - DescriptorEndpoint port = (DescriptorEndpoint)service.getPort(DescriptorEndpoint.class); - - Object retObj = port.echo("Hello"); - assertEquals("Hello", retObj); - } -} \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorJSETestCase.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.cxf.descriptor; + +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; + +/** + * Test a CXF endpoint with provided jbossws-cxf.xml + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Dec-2007 + */ +public class DescriptorJSETestCase extends JBossWSTest +{ + private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-descriptor/TestService"; + private String targetNS = "http://org.jboss.ws.jaxws.cxf/descriptor"; + + public static Test suite() + { + return new JBossWSTestSetup(DescriptorJSETestCase.class, "jaxws-cxf-descriptor.war"); + } + + public void testLegalAccess() throws Exception + { + URL wsdlURL = new URL(endpointURL + "?wsdl"); + QName serviceName = new QName(targetNS, "DescriptorService"); + + Service service = Service.create(wsdlURL, serviceName); + DescriptorEndpoint port = (DescriptorEndpoint)service.getPort(DescriptorEndpoint.class); + + Object retObj = port.echo("Hello"); + assertEquals("Hello", retObj); + } +} \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,60 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.cxf.logging; - -import java.util.logging.Handler; -import java.util.logging.Logger; - -import org.apache.cxf.common.logging.LogUtils; -import org.jboss.wsf.common.logging.JDKLogHandler; -import org.jboss.wsf.test.JBossWSTest; - -/** - * Test redirection of CXF logging on the client side - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2007 - */ -public class CXFLoggingTestCase extends JBossWSTest -{ - public void testLogging() throws Exception - { - Logger log = LogUtils.getL7dLogger(CXFLoggingTestCase.class); - assertHandlers(log); - - log = LogUtils.getL7dLogger(CXFLoggingTestCase.class); - assertHandlers(log); - - log.finest("test message"); - } - - private void assertHandlers(Logger log) - { - int found = 0; - for (Handler handler : log.getHandlers()) - { - if (handler instanceof JDKLogHandler) - found++; - } - assertEquals("Expected one jboss handler", 1, found); - } -} \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/CXFLoggingTestCase.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.cxf.logging; + +import java.util.logging.Handler; +import java.util.logging.Logger; + +import org.apache.cxf.common.logging.LogUtils; +import org.jboss.wsf.common.logging.JDKLogHandler; +import org.jboss.wsf.test.JBossWSTest; + +/** + * Test redirection of CXF logging on the client side + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2007 + */ +public class CXFLoggingTestCase extends JBossWSTest +{ + public void testLogging() throws Exception + { + Logger log = LogUtils.getL7dLogger(CXFLoggingTestCase.class); + assertHandlers(log); + + log = LogUtils.getL7dLogger(CXFLoggingTestCase.class); + assertHandlers(log); + + log.finest("test message"); + } + + private void assertHandlers(Logger log) + { + int found = 0; + for (Handler handler : log.getHandlers()) + { + if (handler instanceof JDKLogHandler) + found++; + } + assertEquals("Expected one jboss handler", 1, found); + } +} \ No newline at end of file Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,59 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.cxf.logging; - -import java.util.logging.Handler; -import java.util.logging.Logger; - -import org.jboss.wsf.common.logging.JDKLogHandler; -import org.jboss.wsf.test.JBossWSTest; - -/** - * Test redirection of JDK logging on the client side - * - * @author Thomas.Diesler(a)jboss.org - * @since 18-Dec-2007 - */ -public class JDKLoggingTestCase extends JBossWSTest -{ - public void testLogging() throws Exception - { - Logger log = Logger.getLogger(JDKLoggingTestCase.class.getName()); - assertHandlers(log); - - log = Logger.getLogger(JDKLoggingTestCase.class.getName()); - assertHandlers(log); - - log.info("test message"); - } - - private void assertHandlers(Logger log) - { - int found = 0; - for (Handler handler : log.getHandlers()) - { - if (handler instanceof JDKLogHandler) - found++; - } - assertEquals("Expected one jboss handler", 1, found); - } -} \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/logging/JDKLoggingTestCase.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.cxf.logging; + +import java.util.logging.Handler; +import java.util.logging.Logger; + +import org.jboss.wsf.common.logging.JDKLogHandler; +import org.jboss.wsf.test.JBossWSTest; + +/** + * Test redirection of JDK logging on the client side + * + * @author Thomas.Diesler(a)jboss.org + * @since 18-Dec-2007 + */ +public class JDKLoggingTestCase extends JBossWSTest +{ + public void testLogging() throws Exception + { + Logger log = Logger.getLogger(JDKLoggingTestCase.class.getName()); + assertHandlers(log); + + log = Logger.getLogger(JDKLoggingTestCase.class.getName()); + assertHandlers(log); + + log.info("test message"); + } + + private void assertHandlers(Logger log) + { + int found = 0; + for (Handler handler : log.getHandlers()) + { + if (handler instanceof JDKLogHandler) + found++; + } + assertEquals("Expected one jboss handler", 1, found); + } +} \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.cxf.wsrm; - -import javax.jws.WebMethod; -import javax.jws.WebService; - -@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/wsrm") -public interface BasicDocEndpoint -{ - @WebMethod - public String echo(String arg0); - -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.cxf.wsrm; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/wsrm") +public interface BasicDocEndpoint +{ + @WebMethod + public String echo(String arg0); + +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.cxf.wsrm; - -// $Id$ - -import javax.jws.WebMethod; -import javax.jws.WebService; - -@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/wsrm", serviceName = "RMService") -public class BasicDocEndpointImpl implements BasicDocEndpoint -{ - @WebMethod - public String echo(String input) - { - return input; - } -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.cxf.wsrm; + +// $Id$ + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/wsrm", serviceName = "RMService") +public class BasicDocEndpointImpl implements BasicDocEndpoint +{ + @WebMethod + public String echo(String input) + { + return input; + } +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,99 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.cxf.wsrm; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; -import org.apache.cxf.bus.spring.SpringBusFactory; -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; -import org.w3c.dom.Element; - -/** - * Test the CXF WS-ReliableMessaging - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-Dec-2007 - */ -public class BasicDocTestCase extends JBossWSTest -{ - private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-wsrm-basic-doc"; - private String targetNS = "http://org.jboss.ws.jaxws.cxf/wsrm"; - - public static Test suite() - { - return new JBossWSTestSetup(BasicDocTestCase.class, "jaxws-cxf-wsrm-basic-doc.war"); - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL(endpointURL + "?wsdl"); - Element wsdl = DOMUtils.parse(wsdlURL.openStream()); - assertNotNull(wsdl); - - System.out.println("FIXME: [CXF-1310] Generated WSDL for an WS-RM endpoint does not contain RM policies"); - } - - public void _testStandardClient() throws Exception - { - URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl"); - QName serviceName = new QName(targetNS, "RMService"); - - Service service = Service.create(wsdlURL, serviceName); - BasicDocEndpoint port = (BasicDocEndpoint)service.getPort(BasicDocEndpoint.class); - - System.out.println("FIXME: [CXF-1320] Configure WS-RM client from WSDL only"); - - //Object retObj = port.echo("Hello"); - //assertEquals("Hello", retObj); - } - - public void testSpringClient() throws Exception - { - SpringBusFactory bf = new SpringBusFactory(); - URL cxfConfig = getResourceURL("jaxws/cxf/wsrm/wsrm-client-config.xml"); - Bus bus = bf.createBus(cxfConfig); - BusFactory.setDefaultBus(bus); - - URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl"); - QName serviceName = new QName(targetNS, "RMService"); - - Service service = Service.create(wsdlURL, serviceName); - BasicDocEndpoint port = (BasicDocEndpoint)service.getPort(BasicDocEndpoint.class); - - // Enable addressing - BindingProvider bp = (BindingProvider)port; - bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE); - - Object retObj = port.echo("Hello"); - assertEquals("Hello", retObj); - } -} \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,99 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.cxf.wsrm; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.apache.cxf.bus.spring.SpringBusFactory; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.w3c.dom.Element; + +/** + * Test the CXF WS-ReliableMessaging + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Dec-2007 + */ +public class BasicDocTestCase extends JBossWSTest +{ + private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-wsrm-basic-doc"; + private String targetNS = "http://org.jboss.ws.jaxws.cxf/wsrm"; + + public static Test suite() + { + return new JBossWSTestSetup(BasicDocTestCase.class, "jaxws-cxf-wsrm-basic-doc.war"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL(endpointURL + "?wsdl"); + Element wsdl = DOMUtils.parse(wsdlURL.openStream()); + assertNotNull(wsdl); + + System.out.println("FIXME: [CXF-1310] Generated WSDL for an WS-RM endpoint does not contain RM policies"); + } + + public void _testStandardClient() throws Exception + { + URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl"); + QName serviceName = new QName(targetNS, "RMService"); + + Service service = Service.create(wsdlURL, serviceName); + BasicDocEndpoint port = (BasicDocEndpoint)service.getPort(BasicDocEndpoint.class); + + System.out.println("FIXME: [CXF-1320] Configure WS-RM client from WSDL only"); + + //Object retObj = port.echo("Hello"); + //assertEquals("Hello", retObj); + } + + public void testSpringClient() throws Exception + { + SpringBusFactory bf = new SpringBusFactory(); + URL cxfConfig = getResourceURL("jaxws/cxf/wsrm/wsrm-client-config.xml"); + Bus bus = bf.createBus(cxfConfig); + BusFactory.setDefaultBus(bus); + + URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl"); + QName serviceName = new QName(targetNS, "RMService"); + + Service service = Service.create(wsdlURL, serviceName); + BasicDocEndpoint port = (BasicDocEndpoint)service.getPort(BasicDocEndpoint.class); + + // Enable addressing + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE); + + Object retObj = port.echo("Hello"); + assertEquals("Hello", retObj); + } +} \ No newline at end of file Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,44 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.cxf.wsrm; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * This class was generated by the JAX-WS RI. - * JAX-WS RI 2.1.1-b03- - * Generated source version: 2.0 - * - */ -@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/wsrm") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface BasicRPCEndpoint -{ - @WebMethod - @WebResult(partName = "return") - public String echo(@WebParam(name = "arg0", partName = "arg0") String arg0); - -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.cxf.wsrm; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * This class was generated by the JAX-WS RI. + * JAX-WS RI 2.1.1-b03- + * Generated source version: 2.0 + * + */ +@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/wsrm") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface BasicRPCEndpoint +{ + @WebMethod + @WebResult(partName = "return") + public String echo(@WebParam(name = "arg0", partName = "arg0") String arg0); + +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.cxf.wsrm; - -// $Id$ - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/wsrm", serviceName = "RMService") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class BasicRPCEndpointImpl implements BasicRPCEndpoint -{ - @WebMethod - public String echo(String input) - { - return input; - } -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.cxf.wsrm; + +// $Id$ + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "RMEndpoint", targetNamespace = "http://org.jboss.ws.jaxws.cxf/wsrm", serviceName = "RMService") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class BasicRPCEndpointImpl implements BasicRPCEndpoint +{ + @WebMethod + public String echo(String input) + { + return input; + } +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,99 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.cxf.wsrm; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; -import org.apache.cxf.bus.spring.SpringBusFactory; -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; -import org.w3c.dom.Element; - -/** - * Test the CXF WS-ReliableMessaging - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-Dec-2007 - */ -public class BasicRPCTestCase extends JBossWSTest -{ - private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-wsrm-basic-rpc"; - private String targetNS = "http://org.jboss.ws.jaxws.cxf/wsrm"; - - public static Test suite() - { - return new JBossWSTestSetup(BasicRPCTestCase.class, "jaxws-cxf-wsrm-basic-rpc.war"); - } - - public void testWSDLAccess() throws Exception - { - URL wsdlURL = new URL(endpointURL + "?wsdl"); - Element wsdl = DOMUtils.parse(wsdlURL.openStream()); - assertNotNull(wsdl); - - System.out.println("FIXME: [CXF-1310] Generated WSDL for an WS-RM endpoint does not contain RM policies"); - } - - public void _testStandardClient() throws Exception - { - URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl"); - QName serviceName = new QName(targetNS, "RMService"); - - Service service = Service.create(wsdlURL, serviceName); - BasicRPCEndpoint port = (BasicRPCEndpoint)service.getPort(BasicRPCEndpoint.class); - - System.out.println("FIXME: [CXF-1320] Configure WS-RM client from WSDL only"); - - Object retObj = port.echo("Hello"); - assertEquals("Hello", retObj); - } - - public void testSpringClient() throws Exception - { - SpringBusFactory bf = new SpringBusFactory(); - URL cxfConfig = getResourceURL("jaxws/cxf/wsrm/wsrm-client-config.xml"); - Bus bus = bf.createBus(cxfConfig); - BusFactory.setDefaultBus(bus); - - URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl"); - QName serviceName = new QName(targetNS, "RMService"); - - Service service = Service.create(wsdlURL, serviceName); - BasicRPCEndpoint port = (BasicRPCEndpoint)service.getPort(BasicRPCEndpoint.class); - - // Enable addressing - BindingProvider bp = (BindingProvider)port; - bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE); - - Object retObj = port.echo("Hello"); - assertEquals("Hello", retObj); - } -} \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,99 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.cxf.wsrm; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.apache.cxf.bus.spring.SpringBusFactory; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.w3c.dom.Element; + +/** + * Test the CXF WS-ReliableMessaging + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Dec-2007 + */ +public class BasicRPCTestCase extends JBossWSTest +{ + private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-cxf-wsrm-basic-rpc"; + private String targetNS = "http://org.jboss.ws.jaxws.cxf/wsrm"; + + public static Test suite() + { + return new JBossWSTestSetup(BasicRPCTestCase.class, "jaxws-cxf-wsrm-basic-rpc.war"); + } + + public void testWSDLAccess() throws Exception + { + URL wsdlURL = new URL(endpointURL + "?wsdl"); + Element wsdl = DOMUtils.parse(wsdlURL.openStream()); + assertNotNull(wsdl); + + System.out.println("FIXME: [CXF-1310] Generated WSDL for an WS-RM endpoint does not contain RM policies"); + } + + public void _testStandardClient() throws Exception + { + URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl"); + QName serviceName = new QName(targetNS, "RMService"); + + Service service = Service.create(wsdlURL, serviceName); + BasicRPCEndpoint port = (BasicRPCEndpoint)service.getPort(BasicRPCEndpoint.class); + + System.out.println("FIXME: [CXF-1320] Configure WS-RM client from WSDL only"); + + Object retObj = port.echo("Hello"); + assertEquals("Hello", retObj); + } + + public void testSpringClient() throws Exception + { + SpringBusFactory bf = new SpringBusFactory(); + URL cxfConfig = getResourceURL("jaxws/cxf/wsrm/wsrm-client-config.xml"); + Bus bus = bf.createBus(cxfConfig); + BusFactory.setDefaultBus(bus); + + URL wsdlURL = getResourceURL("jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl"); + QName serviceName = new QName(targetNS, "RMService"); + + Service service = Service.create(wsdlURL, serviceName); + BasicRPCEndpoint port = (BasicRPCEndpoint)service.getPort(BasicRPCEndpoint.class); + + // Enable addressing + BindingProvider bp = (BindingProvider)port; + bp.getRequestContext().put("org.apache.cxf.ws.addressing.using", Boolean.TRUE); + + Object retObj = port.echo("Hello"); + assertEquals("Hello", retObj); + } +} \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa (from rev 6639, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,79 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.samples.wsa; - -import java.io.File; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import junit.framework.Test; -import org.apache.cxf.Bus; -import org.apache.cxf.bus.spring.SpringBusFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Client invoking web service using WS-Addressing - * - * @author richard.opalka(a)jboss.com - */ -public final class AddressingTestCase extends JBossWSTest -{ - private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsa/AddressingService"; - private ServiceIface proxy; - private Bus bus; - - public static Test suite() - { - return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-samples-wsa.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - SpringBusFactory busFactory = new SpringBusFactory(); - URL cxfConfig = new File("test-resources/jaxws/samples/wsa/cxf-client-config.xml").toURL(); - bus = busFactory.createBus(cxfConfig); - busFactory.setDefaultBus(bus); - - QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsaddressing", "AddressingService"); - URL wsdlURL = new URL(serviceURL + "?wsdl"); - Service service = Service.create(wsdlURL, serviceName); - proxy = (ServiceIface)service.getPort(ServiceIface.class); - } - - @Override - protected void tearDown() throws Exception - { - bus.shutdown(true); - - super.tearDown(); - } - - public void test() throws Exception - { - assertEquals("Hello World!", proxy.sayHello()); - } - -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java (from rev 6639, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.samples.wsa; + +import java.io.File; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import junit.framework.Test; +import org.apache.cxf.Bus; +import org.apache.cxf.bus.spring.SpringBusFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Client invoking web service using WS-Addressing + * + * @author richard.opalka(a)jboss.com + */ +public final class AddressingTestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsa/AddressingService"; + private ServiceIface proxy; + private Bus bus; + + public static Test suite() + { + return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-samples-wsa.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + SpringBusFactory busFactory = new SpringBusFactory(); + URL cxfConfig = new File("test-resources/jaxws/samples/wsa/cxf-client-config.xml").toURL(); + bus = busFactory.createBus(cxfConfig); + busFactory.setDefaultBus(bus); + + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsaddressing", "AddressingService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + proxy = (ServiceIface)service.getPort(ServiceIface.class); + } + + @Override + protected void tearDown() throws Exception + { + bus.shutdown(true); + + super.tearDown(); + } + + public void test() throws Exception + { + assertEquals("Hello World!", proxy.sayHello()); + } + +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,35 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.samples.wsa; - -import javax.jws.WebMethod; -import javax.jws.WebService; - -@WebService -( - targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing" -) -public interface ServiceIface -{ - @WebMethod - String sayHello(); -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java (from rev 6639, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.samples.wsa; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService +( + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing" +) +public interface ServiceIface +{ + @WebMethod + String sayHello(); +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.samples.wsa; - -import javax.jws.WebService; - -@WebService -( - portName = "AddressingServicePort", - serviceName = "AddressingService", - wsdlLocation = "WEB-INF/wsdl/AddressingService.wsdl", - targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing", - endpointInterface = "org.jboss.test.ws.jaxws.samples.wsa.ServiceIface" -) -public class ServiceImpl implements ServiceIface -{ - public String sayHello() - { - return "Hello World!"; - } -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java (from rev 6639, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.samples.wsa; + +import javax.jws.WebService; + +@WebService +( + portName = "AddressingServicePort", + serviceName = "AddressingService", + wsdlLocation = "WEB-INF/wsdl/AddressingService.wsdl", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing", + endpointInterface = "org.jboss.test.ws.jaxws.samples.wsa.ServiceIface" +) +public class ServiceImpl implements ServiceIface +{ + public String sayHello() + { + return "Hello World!"; + } +} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws (from rev 6639, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,24 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.wsa.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * This class was generated by the CXF 2.0.5-incubator - * Mon Apr 21 16:36:02 CEST 2008 - * Generated source version: 2.0.5-incubator - * - */ - -@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") - -public class SayHello { - - -} - Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java (from rev 6639, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,24 @@ + +package org.jboss.test.ws.jaxws.samples.wsa.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +/** + * This class was generated by the CXF 2.0.5-incubator + * Mon Apr 21 16:36:02 CEST 2008 + * Generated source version: 2.0.5-incubator + * + */ + +@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") + +public class SayHello { + + +} + Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,35 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.wsa.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * This class was generated by the CXF 2.0.5-incubator - * Mon Apr 21 16:36:02 CEST 2008 - * Generated source version: 2.0.5-incubator - * - */ - -@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") - -public class SayHelloResponse { - - @XmlElement(name = "return") - private java.lang.String _return; - - public java.lang.String get_return() { - return this._return; - } - - public void set_return( java.lang.String new_return ) { - this._return = new_return; - } - -} - Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java (from rev 6639, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,35 @@ + +package org.jboss.test.ws.jaxws.samples.wsa.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +/** + * This class was generated by the CXF 2.0.5-incubator + * Mon Apr 21 16:36:02 CEST 2008 + * Generated source version: 2.0.5-incubator + * + */ + +@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") + +public class SayHelloResponse { + + @XmlElement(name = "return") + private java.lang.String _return; + + public java.lang.String get_return() { + return this._return; + } + + public void set_return( java.lang.String new_return ) { + this._return = new_return; + } + +} + Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,82 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.samples.wsrm.client; - -import java.io.File; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import junit.framework.Test; -import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; -import org.apache.cxf.bus.spring.SpringBusFactory; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; -import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService; - -/** - * Client invoking web service using WS-RM - * - * @author richard.opalka(a)jboss.com - */ -public final class SimpleServiceTestCase extends JBossWSTest -{ - private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsrm/SimpleService"; - private SimpleService proxy; - private Bus bus; - - public static Test suite() - { - return new JBossWSTestSetup(SimpleServiceTestCase.class, "jaxws-samples-wsrm.war"); - } - - @Override - protected void setUp() throws Exception - { - super.setUp(); - - SpringBusFactory busFactory = new SpringBusFactory(); - URL cxfConfig = getResourceURL("jaxws/samples/wsrm/wsrm-client-config.xml"); - bus = busFactory.createBus(cxfConfig); - busFactory.setDefaultBus(bus); - - QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService"); - URL wsdlURL = new URL(serviceURL + "?wsdl"); - Service service = Service.create(wsdlURL, serviceName); - proxy = (SimpleService)service.getPort(SimpleService.class); - } - - @Override - protected void tearDown() throws Exception - { - bus.shutdown(true); - - super.tearDown(); - } - - public void test() throws Exception - { - proxy.ping(); // one way call - assertEquals("Hello World!", proxy.echo("Hello World!")); // request responce call - } - -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.samples.wsrm.client; + +import java.io.File; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import junit.framework.Test; +import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; +import org.apache.cxf.bus.spring.SpringBusFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService; + +/** + * Client invoking web service using WS-RM + * + * @author richard.opalka(a)jboss.com + */ +public final class SimpleServiceTestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsrm/SimpleService"; + private SimpleService proxy; + private Bus bus; + + public static Test suite() + { + return new JBossWSTestSetup(SimpleServiceTestCase.class, "jaxws-samples-wsrm.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + SpringBusFactory busFactory = new SpringBusFactory(); + URL cxfConfig = getResourceURL("jaxws/samples/wsrm/wsrm-client-config.xml"); + bus = busFactory.createBus(cxfConfig); + busFactory.setDefaultBus(bus); + + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + proxy = (SimpleService)service.getPort(SimpleService.class); + } + + @Override + protected void tearDown() throws Exception + { + bus.shutdown(true); + + super.tearDown(); + } + + public void test() throws Exception + { + proxy.ping(); // one way call + assertEquals("Hello World!", proxy.echo("Hello World!")); // request responce call + } + +} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,60 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.wsrm.generated; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for echo complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="echo"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "echo", propOrder = { - "arg0" -}) -public class Echo { - - protected String arg0; - - /** - * Gets the value of the arg0 property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getArg0() { - return arg0; - } - - /** - * Sets the value of the arg0 property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setArg0(String value) { - this.arg0 = value; - } - -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Echo.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,60 @@ + +package org.jboss.test.ws.jaxws.samples.wsrm.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for echo complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="echo"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "echo", propOrder = { + "arg0" +}) +public class Echo { + + protected String arg0; + + /** + * Gets the value of the arg0 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArg0() { + return arg0; + } + + /** + * Sets the value of the arg0 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArg0(String value) { + this.arg0 = value; + } + +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,62 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.wsrm.generated; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for echoResponse complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="echoResponse"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "echoResponse", propOrder = { - "_return" -}) -public class EchoResponse { - - @XmlElement(name = "return") - protected String _return; - - /** - * Gets the value of the return property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getReturn() { - return _return; - } - - /** - * Sets the value of the return property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setReturn(String value) { - this._return = value; - } - -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/EchoResponse.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,62 @@ + +package org.jboss.test.ws.jaxws.samples.wsrm.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for echoResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="echoResponse"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "echoResponse", propOrder = { + "_return" +}) +public class EchoResponse { + + @XmlElement(name = "return") + protected String _return; + + /** + * Gets the value of the return property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * Sets the value of the return property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,89 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.wsrm.generated; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.jboss.test.ws.jaxws.samples.wsrm.generated package. - * <p>An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _EchoResponse_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "echoResponse"); - private final static QName _Echo_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "echo"); - private final static QName _Ping_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "ping"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.samples.wsrm.generated - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link Ping } - * - */ - public Ping createPing() { - return new Ping(); - } - - /** - * Create an instance of {@link Echo } - * - */ - public Echo createEcho() { - return new Echo(); - } - - /** - * Create an instance of {@link EchoResponse } - * - */ - public EchoResponse createEchoResponse() { - return new EchoResponse(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link EchoResponse }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echoResponse") - public JAXBElement<EchoResponse> createEchoResponse(EchoResponse value) { - return new JAXBElement<EchoResponse>(_EchoResponse_QNAME, EchoResponse.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Echo }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echo") - public JAXBElement<Echo> createEcho(Echo value) { - return new JAXBElement<Echo>(_Echo_QNAME, Echo.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Ping }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "ping") - public JAXBElement<Ping> createPing(Ping value) { - return new JAXBElement<Ping>(_Ping_QNAME, Ping.class, null, value); - } - -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/ObjectFactory.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,89 @@ + +package org.jboss.test.ws.jaxws.samples.wsrm.generated; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.samples.wsrm.generated package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _EchoResponse_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "echoResponse"); + private final static QName _Echo_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "echo"); + private final static QName _Ping_QNAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "ping"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.samples.wsrm.generated + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link Ping } + * + */ + public Ping createPing() { + return new Ping(); + } + + /** + * Create an instance of {@link Echo } + * + */ + public Echo createEcho() { + return new Echo(); + } + + /** + * Create an instance of {@link EchoResponse } + * + */ + public EchoResponse createEchoResponse() { + return new EchoResponse(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link EchoResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echoResponse") + public JAXBElement<EchoResponse> createEchoResponse(EchoResponse value) { + return new JAXBElement<EchoResponse>(_EchoResponse_QNAME, EchoResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Echo }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "echo") + public JAXBElement<Echo> createEcho(Echo value) { + return new JAXBElement<Echo>(_Echo_QNAME, Echo.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Ping }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "ping") + public JAXBElement<Ping> createPing(Ping value) { + return new JAXBElement<Ping>(_Ping_QNAME, Ping.class, null, value); + } + +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,32 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.wsrm.generated; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * <p>Java class for ping complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="ping"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ping") -public class Ping { - - -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/Ping.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,32 @@ + +package org.jboss.test.ws.jaxws.samples.wsrm.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for ping complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ping"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ping") +public class Ping { + + +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,36 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.wsrm.generated; - -import javax.jws.Oneway; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; - -/** - * This class was generated by Apache CXF (incubator) 2.0.5-incubator - * Wed Apr 16 14:19:06 CEST 2008 - * Generated source version: 2.0.5-incubator - * - */ - -@WebService(targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "SimpleService") - -public interface SimpleService { - - @Oneway - @RequestWrapper(localName = "ping", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Ping") - @WebMethod - public void ping(); - - @ResponseWrapper(localName = "echoResponse", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.EchoResponse") - @RequestWrapper(localName = "echo", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Echo") - @WebResult(name = "return", targetNamespace = "") - @WebMethod - public java.lang.String echo( - @WebParam(name = "arg0", targetNamespace = "") - java.lang.String arg0 - ); -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,36 @@ + +package org.jboss.test.ws.jaxws.samples.wsrm.generated; + +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF (incubator) 2.0.5-incubator + * Wed Apr 16 14:19:06 CEST 2008 + * Generated source version: 2.0.5-incubator + * + */ + +@WebService(targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", name = "SimpleService") + +public interface SimpleService { + + @Oneway + @RequestWrapper(localName = "ping", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Ping") + @WebMethod + public void ping(); + + @ResponseWrapper(localName = "echoResponse", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.EchoResponse") + @RequestWrapper(localName = "echo", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", className = "org.jboss.test.ws.jaxws.samples.wsrm.generated.Echo") + @WebResult(name = "return", targetNamespace = "") + @WebMethod + public java.lang.String echo( + @WebParam(name = "arg0", targetNamespace = "") + java.lang.String arg0 + ); +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,58 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.wsrm.generated; - -import java.net.MalformedURLException; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebEndpoint; -import javax.xml.ws.WebServiceClient; -import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService; - -/** - * This class was generated by Apache CXF (incubator) 2.0.5-incubator - * Wed Apr 16 14:19:06 CEST 2008 - * Generated source version: 2.0.5-incubator - * - */ - -@WebServiceClient(name = "SimpleService", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", wsdlLocation = "file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl") -public class SimpleService_Service extends Service { - - public final static URL WSDL_LOCATION; - public final static QName SERVICE = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService"); - public final static QName SimpleServicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleServicePort"); - static { - URL url = null; - try { - url = new URL("file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl"); - } catch (MalformedURLException e) { - System.err.println("Can not initialize the default wsdl from file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl"); - // e.printStackTrace(); - } - WSDL_LOCATION = url; - } - - public SimpleService_Service(URL wsdlLocation) { - super(wsdlLocation, SERVICE); - } - - public SimpleService_Service(URL wsdlLocation, QName serviceName) { - super(wsdlLocation, serviceName); - } - - public SimpleService_Service() { - super(WSDL_LOCATION, SERVICE); - } - - /** - * - * @return - * returns SimpleServicePort - */ - @WebEndpoint(name = "SimpleServicePort") - public SimpleService getSimpleServicePort() { - return super.getPort(SimpleServicePort, SimpleService.class); - } - -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_Service.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,58 @@ + +package org.jboss.test.ws.jaxws.samples.wsrm.generated; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; +import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService; + +/** + * This class was generated by Apache CXF (incubator) 2.0.5-incubator + * Wed Apr 16 14:19:06 CEST 2008 + * Generated source version: 2.0.5-incubator + * + */ + +@WebServiceClient(name = "SimpleService", targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm", wsdlLocation = "file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl") +public class SimpleService_Service extends Service { + + public final static URL WSDL_LOCATION; + public final static QName SERVICE = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService"); + public final static QName SimpleServicePort = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleServicePort"); + static { + URL url = null; + try { + url = new URL("file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl"); + } catch (MalformedURLException e) { + System.err.println("Can not initialize the default wsdl from file:/home/opalka/TODO/TUTORIAL/cxf/step1/java2wsdl/generated/wsdl/SimpleService.wsdl"); + // e.printStackTrace(); + } + WSDL_LOCATION = url; + } + + public SimpleService_Service(URL wsdlLocation) { + super(wsdlLocation, SERVICE); + } + + public SimpleService_Service(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public SimpleService_Service() { + super(WSDL_LOCATION, SERVICE); + } + + /** + * + * @return + * returns SimpleServicePort + */ + @WebEndpoint(name = "SimpleServicePort") + public SimpleService getSimpleServicePort() { + return super.getPort(SimpleServicePort, SimpleService.class); + } + +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_SimpleServicePort_Client.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_SimpleServicePort_Client.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_SimpleServicePort_Client.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,71 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.wsrm.generated; - -/** - * Please modify this class to meet your needs - * This class is not complete - */ - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.jws.Oneway; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; - -/** - * This class was generated by Apache CXF (incubator) 2.0.5-incubator - * Wed Apr 16 14:19:05 CEST 2008 - * Generated source version: 2.0.5-incubator - * - */ - -public final class SimpleService_SimpleServicePort_Client { - - private static final QName SERVICE_NAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService"); - - private SimpleService_SimpleServicePort_Client() { - } - - public static void main(String args[]) throws Exception { - URL wsdlURL = SimpleService_Service.WSDL_LOCATION; - if (args.length > 0) { - File wsdlFile = new File(args[0]); - try { - if (wsdlFile.exists()) { - wsdlURL = wsdlFile.toURI().toURL(); - } else { - wsdlURL = new URL(args[0]); - } - } catch (MalformedURLException e) { - e.printStackTrace(); - } - } - - SimpleService_Service ss = new SimpleService_Service(wsdlURL, SERVICE_NAME); - SimpleService port = ss.getSimpleServicePort(); - - { - System.out.println("Invoking ping..."); - port.ping(); - - - } - { - System.out.println("Invoking echo..."); - java.lang.String _echo_arg0 = ""; - java.lang.String _echo__return = port.echo(_echo_arg0); - System.out.println("echo.result=" + _echo__return); - - - } - - System.exit(0); - } - -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_SimpleServicePort_Client.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_SimpleServicePort_Client.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_SimpleServicePort_Client.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/SimpleService_SimpleServicePort_Client.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,71 @@ + +package org.jboss.test.ws.jaxws.samples.wsrm.generated; + +/** + * Please modify this class to meet your needs + * This class is not complete + */ + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + +/** + * This class was generated by Apache CXF (incubator) 2.0.5-incubator + * Wed Apr 16 14:19:05 CEST 2008 + * Generated source version: 2.0.5-incubator + * + */ + +public final class SimpleService_SimpleServicePort_Client { + + private static final QName SERVICE_NAME = new QName("http://www.jboss.org/jbossws/ws-extensions/wsrm", "SimpleService"); + + private SimpleService_SimpleServicePort_Client() { + } + + public static void main(String args[]) throws Exception { + URL wsdlURL = SimpleService_Service.WSDL_LOCATION; + if (args.length > 0) { + File wsdlFile = new File(args[0]); + try { + if (wsdlFile.exists()) { + wsdlURL = wsdlFile.toURI().toURL(); + } else { + wsdlURL = new URL(args[0]); + } + } catch (MalformedURLException e) { + e.printStackTrace(); + } + } + + SimpleService_Service ss = new SimpleService_Service(wsdlURL, SERVICE_NAME); + SimpleService port = ss.getSimpleServicePort(); + + { + System.out.println("Invoking ping..."); + port.ping(); + + + } + { + System.out.println("Invoking echo..."); + java.lang.String _echo_arg0 = ""; + java.lang.String _echo__return = port.echo(_echo_arg0); + System.out.println("echo.result=" + _echo__return); + + + } + + System.exit(0); + } + +} Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,2 +0,0 @@ -(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") -package org.jboss.test.ws.jaxws.samples.wsrm.generated; Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/generated/package-info.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") +package org.jboss.test.ws.jaxws.samples.wsrm.generated; Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.samples.wsrm.service; - -import javax.jws.Oneway; -import javax.jws.WebMethod; -import javax.jws.WebService; - -@WebService -( - name = "SimpleService", - serviceName = "SimpleService", - wsdlLocation = "WEB-INF/wsdl/SimpleService.wsdl", - targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm" -) -public class SimpleServiceImpl -{ - @Oneway - @WebMethod - public void ping() - { - System.out.println("ping()"); - } - - @WebMethod - public String echo(String s) - { - System.out.println("echo(" + s + ")"); - return s; - } -} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/SimpleServiceImpl.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.samples.wsrm.service; + +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService +( + name = "SimpleService", + serviceName = "SimpleService", + wsdlLocation = "WEB-INF/wsdl/SimpleService.wsdl", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm" +) +public class SimpleServiceImpl +{ + @Oneway + @WebMethod + public void ping() + { + System.out.println("ping()"); + } + + @WebMethod + public String echo(String s) + { + System.out.println("echo(" + s + ")"); + return s; + } +} Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,35 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * This class was generated by the CXF 2.0.5-incubator - * Wed Apr 16 13:57:06 CEST 2008 - * Generated source version: 2.0.5-incubator - * - */ - -@XmlRootElement(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") - -public class Echo { - - @XmlElement(name = "arg0") - private java.lang.String arg0; - - public java.lang.String getArg0() { - return this.arg0; - } - - public void setArg0( java.lang.String newArg0 ) { - this.arg0 = newArg0; - } - -} - Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Echo.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,35 @@ + +package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +/** + * This class was generated by the CXF 2.0.5-incubator + * Wed Apr 16 13:57:06 CEST 2008 + * Generated source version: 2.0.5-incubator + * + */ + +@XmlRootElement(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "echo", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") + +public class Echo { + + @XmlElement(name = "arg0") + private java.lang.String arg0; + + public java.lang.String getArg0() { + return this.arg0; + } + + public void setArg0( java.lang.String newArg0 ) { + this.arg0 = newArg0; + } + +} + Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,35 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * This class was generated by the CXF 2.0.5-incubator - * Wed Apr 16 13:57:06 CEST 2008 - * Generated source version: 2.0.5-incubator - * - */ - -@XmlRootElement(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") - -public class EchoResponse { - - @XmlElement(name = "return") - private java.lang.String _return; - - public java.lang.String get_return() { - return this._return; - } - - public void set_return( java.lang.String new_return ) { - this._return = new_return; - } - -} - Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/EchoResponse.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,35 @@ + +package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +/** + * This class was generated by the CXF 2.0.5-incubator + * Wed Apr 16 13:57:06 CEST 2008 + * Generated source version: 2.0.5-incubator + * + */ + +@XmlRootElement(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "echoResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") + +public class EchoResponse { + + @XmlElement(name = "return") + private java.lang.String _return; + + public java.lang.String get_return() { + return this._return; + } + + public void set_return( java.lang.String new_return ) { + this._return = new_return; + } + +} + Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,24 +0,0 @@ - -package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; - -/** - * This class was generated by the CXF 2.0.5-incubator - * Wed Apr 16 13:57:06 CEST 2008 - * Generated source version: 2.0.5-incubator - * - */ - -@XmlRootElement(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") - -public class Ping { - - -} - Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/service/jaxws/Ping.java 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,24 @@ + +package org.jboss.test.ws.jaxws.samples.wsrm.service.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +/** + * This class was generated by the CXF 2.0.5-incubator + * Wed Apr 16 13:57:06 CEST 2008 + * Generated source version: 2.0.5-incubator + * + */ + +@XmlRootElement(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ping", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsrm") + +public class Ping { + + +} + Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,16 +0,0 @@ -<beans xmlns='http://www.springframework.org/schema/beans' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans' - xmlns:jaxws='http://cxf.apache.org/jaxws' - xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.xsd - http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> - - <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-descriptor' - implementor='org.jboss.test.ws.jaxws.cxf.descriptor.DescriptorEndpointImpl'> - - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> - </jaxws:invoker> - - </jaxws:endpoint> - -</beans> \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/jbossws-cxf.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,16 @@ +<beans xmlns='http://www.springframework.org/schema/beans' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' + xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> + + <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-descriptor' + implementor='org.jboss.test.ws.jaxws.cxf.descriptor.DescriptorEndpointImpl'> + + <jaxws:invoker> + <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> + </jaxws:invoker> + + </jaxws:endpoint> + +</beans> \ No newline at end of file Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,19 +0,0 @@ -<?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.cxf.descriptor.DescriptorEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> - Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/descriptor/WEB-INF/web.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -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.cxf.descriptor.DescriptorEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,28 +0,0 @@ -<beans xmlns='http://www.springframework.org/schema/beans' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans' - xmlns:jaxws='http://cxf.apache.org/jaxws' xmlns:p="http://cxf.apache.org/policy" - xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd - http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.xsd - http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> - - <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> - <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> - <wsp:Policy/> - </wsam:Addressing> - <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> - <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/> - </wsrmp:RMAssertion> - </wsp:Policy> - - <jaxws:endpoint id='RMService' address='http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-doc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpointImpl'> - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> - </jaxws:invoker> - <jaxws:features> - <p:policies namespace="http://www.w3.org/2006/07/ws-policy"> - <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - -</beans> \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/jbossws-cxf.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,28 @@ +<beans xmlns='http://www.springframework.org/schema/beans' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' xmlns:p="http://cxf.apache.org/policy" + xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd + http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> + + <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> + <wsp:Policy/> + </wsam:Addressing> + <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> + <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/> + </wsrmp:RMAssertion> + </wsp:Policy> + + <jaxws:endpoint id='RMService' address='http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-doc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpointImpl'> + <jaxws:invoker> + <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> + </jaxws:invoker> + <jaxws:features> + <p:policies namespace="http://www.w3.org/2006/07/ws-policy"> + <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> + </p:policies> + </jaxws:features> + </jaxws:endpoint> + +</beans> \ No newline at end of file Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,19 +0,0 @@ -<?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>RMService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>RMService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> - Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -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>RMService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.cxf.wsrm.BasicDocEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>RMService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,68 +0,0 @@ -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:tns="http://org.jboss.ws.jaxws.cxf/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="RMService" targetNamespace="http://org.jboss.ws.jaxws.cxf/wsrm"> - - <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> - <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> - <wsp:Policy/> - </wsam:Addressing> - <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> - <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/> - </wsrmp:RMAssertion> - </wsp:Policy> - - <wsdl:types> - <xsd:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://org.jboss.ws.jaxws.cxf/wsrm" - xmlns:tns="http://org.jboss.ws.jaxws.cxf/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:element name="echo" type="tns:echo"/> - <xsd:complexType name="echo"> - <xsd:sequence> - <xsd:element minOccurs="0" name="arg0" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - <xsd:element name="echoResponse" type="tns:echoResponse"/> - <xsd:complexType name="echoResponse"> - <xsd:sequence> - <xsd:element minOccurs="0" name="return" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - </xsd:schema> - </wsdl:types> - - <wsdl:message name="echo"> - <wsdl:part element="tns:echo" name="parameters"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="echoResponse"> - <wsdl:part element="tns:echoResponse" name="parameters"> - </wsdl:part> - </wsdl:message> - - <wsdl:portType name="RMEndpoint"> - <wsdl:operation name="echo"> - <wsdl:input message="tns:echo" name="echo"> - </wsdl:input> - <wsdl:output message="tns:echoResponse" name="echoResponse"> - </wsdl:output> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="RMServiceSoapBinding" type="tns:RMEndpoint"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="echo"> - <soap:operation soapAction="" style="document"/> - <wsdl:input name="echo"> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output name="echoResponse"> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="RMService"> - <wsdl:port binding="tns:RMServiceSoapBinding" name="RMEndpointPort"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-doc"/> - <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-doc/wsrm-basic-doc.wsdl 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,68 @@ +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:tns="http://org.jboss.ws.jaxws.cxf/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="RMService" targetNamespace="http://org.jboss.ws.jaxws.cxf/wsrm"> + + <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> + <wsp:Policy/> + </wsam:Addressing> + <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> + <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/> + </wsrmp:RMAssertion> + </wsp:Policy> + + <wsdl:types> + <xsd:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://org.jboss.ws.jaxws.cxf/wsrm" + xmlns:tns="http://org.jboss.ws.jaxws.cxf/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <xsd:element name="echo" type="tns:echo"/> + <xsd:complexType name="echo"> + <xsd:sequence> + <xsd:element minOccurs="0" name="arg0" type="xsd:string"/> + </xsd:sequence> + </xsd:complexType> + <xsd:element name="echoResponse" type="tns:echoResponse"/> + <xsd:complexType name="echoResponse"> + <xsd:sequence> + <xsd:element minOccurs="0" name="return" type="xsd:string"/> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + </wsdl:types> + + <wsdl:message name="echo"> + <wsdl:part element="tns:echo" name="parameters"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="echoResponse"> + <wsdl:part element="tns:echoResponse" name="parameters"> + </wsdl:part> + </wsdl:message> + + <wsdl:portType name="RMEndpoint"> + <wsdl:operation name="echo"> + <wsdl:input message="tns:echo" name="echo"> + </wsdl:input> + <wsdl:output message="tns:echoResponse" name="echoResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="RMServiceSoapBinding" type="tns:RMEndpoint"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="echo"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="echo"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="echoResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + + <wsdl:service name="RMService"> + <wsdl:port binding="tns:RMServiceSoapBinding" name="RMEndpointPort"> + <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-doc"/> + <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,28 +0,0 @@ -<beans xmlns='http://www.springframework.org/schema/beans' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans' - xmlns:jaxws='http://cxf.apache.org/jaxws' xmlns:p="http://cxf.apache.org/policy" - xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd - http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.xsd - http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> - - <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> - <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> - <wsp:Policy/> - </wsam:Addressing> - <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> - <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/> - </wsrmp:RMAssertion> - </wsp:Policy> - - <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-rpc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl'> - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> - </jaxws:invoker> - <jaxws:features> - <p:policies namespace="http://www.w3.org/2006/07/ws-policy"> - <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - -</beans> \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/jbossws-cxf.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,28 @@ +<beans xmlns='http://www.springframework.org/schema/beans' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' xmlns:p="http://cxf.apache.org/policy" + xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd + http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/11/ws-policy.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd'> + + <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> + <wsp:Policy/> + </wsam:Addressing> + <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> + <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/> + </wsrmp:RMAssertion> + </wsp:Policy> + + <jaxws:endpoint id='TestService' address='http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-rpc' implementor='org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl'> + <jaxws:invoker> + <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> + </jaxws:invoker> + <jaxws:features> + <p:policies namespace="http://www.w3.org/2006/07/ws-policy"> + <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> + </p:policies> + </jaxws:features> + </jaxws:endpoint> + +</beans> \ No newline at end of file Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,19 +0,0 @@ -<?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>RMService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>RMService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> - Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -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>RMService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.cxf.wsrm.BasicRPCEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>RMService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:tns="http://org.jboss.ws.jaxws.cxf/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="RMService" - targetNamespace="http://org.jboss.ws.jaxws.cxf/wsrm"> - - <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> - <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> - <wsp:Policy/> - </wsam:Addressing> - <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> - <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/> - </wsrmp:RMAssertion> - </wsp:Policy> - - <wsdl:message name="echoResponse"> - <wsdl:part name="return" type="xsd:string"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="echo"> - <wsdl:part name="arg0" type="xsd:string"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="RMEndpoint"> - <wsdl:operation name="echo"> - <wsdl:input message="tns:echo" name="echo"> - </wsdl:input> - <wsdl:output message="tns:echoResponse" name="echoResponse"> - </wsdl:output> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="RMServiceSoapBinding" type="tns:RMEndpoint"> - <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="echo"> - <soap:operation soapAction="" style="rpc"/> - <wsdl:input name="echo"> - <soap:body namespace="http://org.jboss.ws.jaxws.cxf/wsrm" use="literal"/> - </wsdl:input> - <wsdl:output name="echoResponse"> - <soap:body namespace="http://org.jboss.ws.jaxws.cxf/wsrm" use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="RMService"> - <wsdl:port binding="tns:RMServiceSoapBinding" name="RMEndpointPort"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-rpc"/> - <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/basic-rpc/wsrm-basic-rpc.wsdl 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:tns="http://org.jboss.ws.jaxws.cxf/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="RMService" + targetNamespace="http://org.jboss.ws.jaxws.cxf/wsrm"> + + <wsp:Policy wsu:Id="RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wsam:Addressing xmlns:wsam="http://www.w3.org/2007/02/addressing/metadata"> + <wsp:Policy/> + </wsam:Addressing> + <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"> + <wsrmp:BaseRetransmissionInterval Milliseconds="10000"/> + </wsrmp:RMAssertion> + </wsp:Policy> + + <wsdl:message name="echoResponse"> + <wsdl:part name="return" type="xsd:string"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="echo"> + <wsdl:part name="arg0" type="xsd:string"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="RMEndpoint"> + <wsdl:operation name="echo"> + <wsdl:input message="tns:echo" name="echo"> + </wsdl:input> + <wsdl:output message="tns:echoResponse" name="echoResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="RMServiceSoapBinding" type="tns:RMEndpoint"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="echo"> + <soap:operation soapAction="" style="rpc"/> + <wsdl:input name="echo"> + <soap:body namespace="http://org.jboss.ws.jaxws.cxf/wsrm" use="literal"/> + </wsdl:input> + <wsdl:output name="echoResponse"> + <soap:body namespace="http://org.jboss.ws.jaxws.cxf/wsrm" use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="RMService"> + <wsdl:port binding="tns:RMServiceSoapBinding" name="RMEndpointPort"> + <soap:address location="http://@jboss.bind.address@:8080/jaxws-cxf-wsrm-basic-rpc"/> + <wsp:PolicyReference URI="#RM" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,51 +0,0 @@ -<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" - xmlns:p="http://cxf.apache.org/policy" xmlns:cxf="http://cxf.apache.org/core" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd - http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd - http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> - - <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/> - <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/> - <bean id="rmLogicalOut" class="org.apache.cxf.ws.rm.RMOutInterceptor"> - <property name="bus" ref="cxf"/> - </bean> - <bean id="rmLogicalIn" class="org.apache.cxf.ws.rm.RMInInterceptor"> - <property name="bus" ref="cxf"/> - </bean> - <bean id="rmCodec" class="org.apache.cxf.ws.rm.soap.RMSoapInterceptor"/> - -  - - <cxf:bus name="cxf"> -  - <cxf:inInterceptors> - <ref bean="mapAggregator"/> - <ref bean="mapCodec"/> - <ref bean="rmLogicalIn"/> - <ref bean="rmCodec"/> - </cxf:inInterceptors> - <cxf:inFaultInterceptors> - <ref bean="mapAggregator"/> - <ref bean="mapCodec"/> - <ref bean="rmLogicalIn"/> - <ref bean="rmCodec"/> - </cxf:inFaultInterceptors> - <cxf:outInterceptors> - <ref bean="mapAggregator"/> - <ref bean="mapCodec"/> - <ref bean="rmLogicalOut"/> - <ref bean="rmCodec"/> - </cxf:outInterceptors> - <cxf:outFaultInterceptors> - <ref bean="mapAggregator"/> - <ref bean="mapCodec"/> - <ref bean="rmLogicalOut"/> - <ref bean="rmCodec"/> - </cxf:outFaultInterceptors> - </cxf:bus> - -</beans> \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/wsrm/wsrm-client-config.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,51 @@ +<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws" + xmlns:p="http://cxf.apache.org/policy" xmlns:cxf="http://cxf.apache.org/core" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> + + <bean id="mapAggregator" class="org.apache.cxf.ws.addressing.MAPAggregator"/> + <bean id="mapCodec" class="org.apache.cxf.ws.addressing.soap.MAPCodec"/> + <bean id="rmLogicalOut" class="org.apache.cxf.ws.rm.RMOutInterceptor"> + <property name="bus" ref="cxf"/> + </bean> + <bean id="rmLogicalIn" class="org.apache.cxf.ws.rm.RMInInterceptor"> + <property name="bus" ref="cxf"/> + </bean> + <bean id="rmCodec" class="org.apache.cxf.ws.rm.soap.RMSoapInterceptor"/> + +  + + <cxf:bus name="cxf"> +  + <cxf:inInterceptors> + <ref bean="mapAggregator"/> + <ref bean="mapCodec"/> + <ref bean="rmLogicalIn"/> + <ref bean="rmCodec"/> + </cxf:inInterceptors> + <cxf:inFaultInterceptors> + <ref bean="mapAggregator"/> + <ref bean="mapCodec"/> + <ref bean="rmLogicalIn"/> + <ref bean="rmCodec"/> + </cxf:inFaultInterceptors> + <cxf:outInterceptors> + <ref bean="mapAggregator"/> + <ref bean="mapCodec"/> + <ref bean="rmLogicalOut"/> + <ref bean="rmCodec"/> + </cxf:outInterceptors> + <cxf:outFaultInterceptors> + <ref bean="mapAggregator"/> + <ref bean="mapCodec"/> + <ref bean="rmLogicalOut"/> + <ref bean="rmCodec"/> + </cxf:outFaultInterceptors> + </cxf:bus> + +</beans> \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa (from rev 6639, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF (from rev 6639, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,23 +0,0 @@ -<beans - xmlns='http://www.springframework.org/schema/beans' - xmlns:jaxws='http://cxf.apache.org/jaxws' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' - xmlns:wsa="http://cxf.apache.org/ws/addressing" - xsi:schemaLocation=' - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd - '> - - <jaxws:endpoint - id='ServiceImpl' - address='http://@jboss.bind.address@:8080/jaxws-samples-wsa' - implementor='org.jboss.test.ws.jaxws.samples.wsa.ServiceImpl'> - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> - </jaxws:invoker> - <jaxws:features> - <wsa:addressing usingAddressingAdvisory="false" allowDuplicates="false"/> - </jaxws:features> - </jaxws:endpoint> - -</beans> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml (from rev 6639, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,23 @@ +<beans + xmlns='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xmlns:wsa="http://cxf.apache.org/ws/addressing" + xsi:schemaLocation=' + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd + '> + + <jaxws:endpoint + id='ServiceImpl' + address='http://@jboss.bind.address@:8080/jaxws-samples-wsa' + implementor='org.jboss.test.ws.jaxws.samples.wsa.ServiceImpl'> + <jaxws:invoker> + <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> + </jaxws:invoker> + <jaxws:features> + <wsa:addressing usingAddressingAdvisory="false" allowDuplicates="false"/> + </jaxws:features> + </jaxws:endpoint> + +</beans> Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app - version="2.5" 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 http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - <servlet> - <servlet-name>AddressingService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.wsa.ServiceImpl</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>AddressingService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> -</web-app> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml (from rev 6639, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app + version="2.5" 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 http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <servlet> + <servlet-name>AddressingService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.wsa.ServiceImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>AddressingService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl (from rev 6639, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="AddressingService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - <wsdl:types> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing"> -<xsd:element name="sayHello" type="tns:sayHello"/> -<xsd:complexType name="sayHello"> -<xsd:sequence/> -</xsd:complexType> -<xsd:element name="sayHelloResponse" type="tns:sayHelloResponse"/> -<xsd:complexType name="sayHelloResponse"> -<xsd:sequence> -<xsd:element minOccurs="0" name="return" type="xsd:string"/> -</xsd:sequence> -</xsd:complexType> -</xsd:schema> - </wsdl:types> - <wsdl:message name="sayHelloResponse"> - <wsdl:part name="parameters" element="tns:sayHelloResponse"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="sayHello"> - <wsdl:part name="parameters" element="tns:sayHello"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="ServiceIface"> - <wsdl:operation name="sayHello"> - <wsdl:input name="sayHello" message="tns:sayHello"> - </wsdl:input> - <wsdl:output name="sayHelloResponse" message="tns:sayHelloResponse"> - </wsdl:output> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AddressingServiceSoapBinding" type="tns:ServiceIface"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="sayHello"> - <soap:operation soapAction="" style="document"/> - <wsdl:input name="sayHello"> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output name="sayHelloResponse"> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AddressingService"> - <wsdl:port name="AddressingServicePort" binding="tns:AddressingServiceSoapBinding"> - <soap:address location="http://localhost:9090/hello"/> - <UsingAddressing xmlns="http://www.w3.org/2006/05/addressing/wsdl"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl (from rev 6639, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="AddressingService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + <wsdl:types> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing"> +<xsd:element name="sayHello" type="tns:sayHello"/> +<xsd:complexType name="sayHello"> +<xsd:sequence/> +</xsd:complexType> +<xsd:element name="sayHelloResponse" type="tns:sayHelloResponse"/> +<xsd:complexType name="sayHelloResponse"> +<xsd:sequence> +<xsd:element minOccurs="0" name="return" type="xsd:string"/> +</xsd:sequence> +</xsd:complexType> +</xsd:schema> + </wsdl:types> + <wsdl:message name="sayHelloResponse"> + <wsdl:part name="parameters" element="tns:sayHelloResponse"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="sayHello"> + <wsdl:part name="parameters" element="tns:sayHello"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="ServiceIface"> + <wsdl:operation name="sayHello"> + <wsdl:input name="sayHello" message="tns:sayHello"> + </wsdl:input> + <wsdl:output name="sayHelloResponse" message="tns:sayHelloResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="AddressingServiceSoapBinding" type="tns:ServiceIface"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="sayHello"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="sayHello"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="sayHelloResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="AddressingService"> + <wsdl:port name="AddressingServicePort" binding="tns:AddressingServiceSoapBinding"> + <soap:address location="http://localhost:9090/hello"/> + <UsingAddressing xmlns="http://www.w3.org/2006/05/addressing/wsdl"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,18 +0,0 @@ -<beans - xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:cxf="http://cxf.apache.org/core" - xmlns:wsa="http://cxf.apache.org/ws/addressing" - xsi:schemaLocation=" - http://cxf.apache.org/core - http://cxf.apache.org/schemas/core.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <cxf:bus> - <cxf:features> - <wsa:addressing/> - </cxf:features> - </cxf:bus> - -</beans> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml (from rev 6639, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,18 @@ +<beans + xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:wsa="http://cxf.apache.org/ws/addressing" + xsi:schemaLocation=" + http://cxf.apache.org/core + http://cxf.apache.org/schemas/core.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <cxf:bus> + <cxf:features> + <wsa:addressing/> + </cxf:features> + </cxf:bus> + +</beans> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm) Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,36 +0,0 @@ -<beans - xmlns='http://www.springframework.org/schema/beans' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' - xmlns:beans='http://www.springframework.org/schema/beans' - xmlns:jaxws='http://cxf.apache.org/jaxws' - xmlns:wsp='http://www.w3.org/2006/07/ws-policy' - xmlns:p='http://cxf.apache.org/policy' - xsi:schemaLocation='http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://cxf.apache.org/policy - http://cxf.apache.org/schemas/policy.xsd - http://www.w3.org/2006/07/ws-policy - http://www.w3.org/2006/11/ws-policy.xsd - http://cxf.apache.org/jaxws - http://cxf.apache.org/schemas/jaxws.xsd'> - - <wsp:Policy wsu:Id="wsrm10policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> - <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2006/05/addressing/wsdl"/> - <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> - </wsp:Policy> - - <jaxws:endpoint - id='SimpleServiceImpl' - address='http://@jboss.bind.address@:8080/jaxws-samples-wsrm' - implementor='org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl'> - <jaxws:invoker> - <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> - </jaxws:invoker> - <jaxws:features> - <p:policies namespace="http://www.w3.org/2006/07/ws-policy"> - <wsp:PolicyReference URI="#wsrm10policy" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - -</beans> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/jbossws-cxf.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,36 @@ +<beans + xmlns='http://www.springframework.org/schema/beans' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xmlns:beans='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' + xmlns:wsp='http://www.w3.org/2006/07/ws-policy' + xmlns:p='http://cxf.apache.org/policy' + xsi:schemaLocation='http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/policy + http://cxf.apache.org/schemas/policy.xsd + http://www.w3.org/2006/07/ws-policy + http://www.w3.org/2006/11/ws-policy.xsd + http://cxf.apache.org/jaxws + http://cxf.apache.org/schemas/jaxws.xsd'> + + <wsp:Policy wsu:Id="wsrm10policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2006/05/addressing/wsdl"/> + <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> + </wsp:Policy> + + <jaxws:endpoint + id='SimpleServiceImpl' + address='http://@jboss.bind.address@:8080/jaxws-samples-wsrm' + implementor='org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl'> + <jaxws:invoker> + <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> + </jaxws:invoker> + <jaxws:features> + <p:policies namespace="http://www.w3.org/2006/07/ws-policy"> + <wsp:PolicyReference URI="#wsrm10policy" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"/> + </p:policies> + </jaxws:features> + </jaxws:endpoint> + +</beans> Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app - version="2.5" 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 http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - <servlet> - <servlet-name>SimpleService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>SimpleService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> -</web-app> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/web.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app + version="2.5" 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 http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <servlet> + <servlet-name>SimpleService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.wsrm.service.SimpleServiceImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>SimpleService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl) Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions name="SimpleService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"> - - <wsp:UsingPolicy/> - <wsp:Policy wsu:Id="wsrm10policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> - <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2006/05/addressing/wsdl"/> - <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> - </wsp:Policy> - - <wsdl:types> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm"> -<xsd:element name="ping" type="tns:ping"/> -<xsd:complexType name="ping"> -<xsd:sequence/> -</xsd:complexType> -<xsd:element name="echo" type="tns:echo"/> -<xsd:complexType name="echo"> -<xsd:sequence> -<xsd:element minOccurs="0" name="arg0" type="xsd:string"/> -</xsd:sequence> -</xsd:complexType> -<xsd:element name="echoResponse" type="tns:echoResponse"/> -<xsd:complexType name="echoResponse"> -<xsd:sequence> -<xsd:element minOccurs="0" name="return" type="xsd:string"/> -</xsd:sequence> -</xsd:complexType> -</xsd:schema> - </wsdl:types> - <wsdl:message name="echoResponse"> - <wsdl:part name="parameters" element="tns:echoResponse"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="echo"> - <wsdl:part name="parameters" element="tns:echo"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="ping"> - <wsdl:part name="parameters" element="tns:ping"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="SimpleService"> - <wsdl:operation name="ping"> - <wsdl:input name="ping" message="tns:ping"> - </wsdl:input> - </wsdl:operation> - <wsdl:operation name="echo"> - <wsdl:input name="echo" message="tns:echo"> - </wsdl:input> - <wsdl:output name="echoResponse" message="tns:echoResponse"> - </wsdl:output> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="SimpleServiceSoapBinding" type="tns:SimpleService"> - <wsp:PolicyReference URI="#wsrm10policy"/> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="ping"> - <soap:operation soapAction="" style="document"/> - <wsdl:input name="ping"> - <soap:body use="literal"/> - </wsdl:input> - </wsdl:operation> - <wsdl:operation name="echo"> - <soap:operation soapAction="" style="document"/> - <wsdl:input name="echo"> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output name="echoResponse"> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="SimpleService"> - <wsdl:port name="SimpleServicePort" binding="tns:SimpleServiceSoapBinding"> - <soap:address location="http://localhost:9090/hello"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/WEB-INF/wsdl/SimpleService.wsdl 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="SimpleService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsp="http://www.w3.org/2006/07/ws-policy"> + + <wsp:UsingPolicy/> + <wsp:Policy wsu:Id="wsrm10policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."> + <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2006/05/addressing/wsdl"/> + <wsrmp:RMAssertion xmlns:wsrmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"/> + </wsp:Policy> + + <wsdl:types> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsrm" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsrm"> +<xsd:element name="ping" type="tns:ping"/> +<xsd:complexType name="ping"> +<xsd:sequence/> +</xsd:complexType> +<xsd:element name="echo" type="tns:echo"/> +<xsd:complexType name="echo"> +<xsd:sequence> +<xsd:element minOccurs="0" name="arg0" type="xsd:string"/> +</xsd:sequence> +</xsd:complexType> +<xsd:element name="echoResponse" type="tns:echoResponse"/> +<xsd:complexType name="echoResponse"> +<xsd:sequence> +<xsd:element minOccurs="0" name="return" type="xsd:string"/> +</xsd:sequence> +</xsd:complexType> +</xsd:schema> + </wsdl:types> + <wsdl:message name="echoResponse"> + <wsdl:part name="parameters" element="tns:echoResponse"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="echo"> + <wsdl:part name="parameters" element="tns:echo"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="ping"> + <wsdl:part name="parameters" element="tns:ping"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="SimpleService"> + <wsdl:operation name="ping"> + <wsdl:input name="ping" message="tns:ping"> + </wsdl:input> + </wsdl:operation> + <wsdl:operation name="echo"> + <wsdl:input name="echo" message="tns:echo"> + </wsdl:input> + <wsdl:output name="echoResponse" message="tns:echoResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="SimpleServiceSoapBinding" type="tns:SimpleService"> + <wsp:PolicyReference URI="#wsrm10policy"/> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="ping"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="ping"> + <soap:body use="literal"/> + </wsdl:input> + </wsdl:operation> + <wsdl:operation name="echo"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="echo"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="echoResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SimpleService"> + <wsdl:port name="SimpleServicePort" binding="tns:SimpleServiceSoapBinding"> + <soap:address location="http://localhost:9090/hello"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,37 +0,0 @@ -<beans - xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:cxf="http://cxf.apache.org/core" - xmlns:wsa="http://cxf.apache.org/ws/addressing" - xmlns:http="http://cxf.apache.org/transports/http/configuration" - xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" - xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" - xsi:schemaLocation=" - http://cxf.apache.org/core - http://cxf.apache.org/schemas/core.xsd - http://cxf.apache.org/transports/http/configuration - http://cxf.apache.org/schemas/configuration/http-conf.xsd - http://schemas.xmlsoap.org/ws/2005/02/rm/policy - http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd - http://cxf.apache.org/ws/rm/manager - http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd"> - - <cxf:bus> - <cxf:features> - <cxf:logging/> - <wsa:addressing/> - <wsrm-mgr:reliableMessaging> - <wsrm-policy:RMAssertion> - <wsrm-policy:BaseRetransmissionInterval Milliseconds="4000"/> - <wsrm-policy:AcknowledgementInterval Milliseconds="2000"/> - </wsrm-policy:RMAssertion> - <wsrm-mgr:destinationPolicy> - <wsrm-mgr:acksPolicy intraMessageThreshold="0" /> - </wsrm-mgr:destinationPolicy> - </wsrm-mgr:reliableMessaging> - </cxf:features> - </cxf:bus> - -</beans> Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsrm/wsrm-client-config.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,37 @@ +<beans + xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:wsa="http://cxf.apache.org/ws/addressing" + xmlns:http="http://cxf.apache.org/transports/http/configuration" + xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" + xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager" + xsi:schemaLocation=" + http://cxf.apache.org/core + http://cxf.apache.org/schemas/core.xsd + http://cxf.apache.org/transports/http/configuration + http://cxf.apache.org/schemas/configuration/http-conf.xsd + http://schemas.xmlsoap.org/ws/2005/02/rm/policy + http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd + http://cxf.apache.org/ws/rm/manager + http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <cxf:bus> + <cxf:features> + <cxf:logging/> + <wsa:addressing/> + <wsrm-mgr:reliableMessaging> + <wsrm-policy:RMAssertion> + <wsrm-policy:BaseRetransmissionInterval Milliseconds="4000"/> + <wsrm-policy:AcknowledgementInterval Milliseconds="2000"/> + </wsrm-policy:RMAssertion> + <wsrm-mgr:destinationPolicy> + <wsrm-mgr:acksPolicy intraMessageThreshold="0" /> + </wsrm-mgr:destinationPolicy> + </wsrm-mgr:reliableMessaging> + </cxf:features> + </cxf:bus> + +</beans> Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,97 +0,0 @@ -# -# $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun(a)jboss.com $ -# - -# Won't Fix: [CXF-1261] Handler does not see XOP message properly -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/webserviceref/** - -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-1774] Provide tools implementation for CXF -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -org/jboss/test/ws/jaxws/smoke/tools/** - -# [CXF-1244] Application Exception not initialized properly -org/jboss/test/ws/jaxws/samples/exception/** - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1253] CXF does not respect @HandlerChain on client SEI -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/namespace/** - -# [JBWS-2112] Cannot use CXF with endpoint API -org/jboss/test/ws/jaxws/endpoint/** - -# [CXF-1513] NPE in JaxWsServiceConfiguration -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1797/** - -# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2114] IllegalArgumentException: Wrong target. class -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1822/** - -# [CXF-1515] Bad Enumeration value 'extension restriction' -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1845/** - -# [JBWS-2115] EJB client vehicle not sufficiently isolated -org/jboss/test/ws/jaxws/jbws1581/** - -# [CXF-1516] Type inheritance with document/literal/wrapped -org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** - -# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [JBWS-2118] context-root in jboss.xml is ignored -org/jboss/test/ws/jaxws/jbws1813/** - -# [CXF-1518] Missing fault detail in messages from SLSB Provider -org/jboss/test/ws/jaxws/jbws1815/** - -# [JBWS-2119] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1520] MTOM chunked encoding transfer -org/jboss/test/ws/jaxws/jbws2000/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-1522] NPE in ServiceUtils -org/jboss/test/ws/jaxws/jbws1566/** - -# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -org/jboss/test/ws/jaxws/wsrm/** Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss422.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,97 @@ +# +# $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun(a)jboss.com $ +# + +# Won't Fix: [CXF-1261] Handler does not see XOP message properly +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* + +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** + +# [JBWS-1178] Multiple virtual host and soap:address problem +org/jboss/test/ws/jaxws/jbws1178/** + +# [JBWS-1774] Provide tools implementation for CXF +org/jboss/test/ws/jaxws/complex/** +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-1683] Fix JAXR samples for CXF +org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) +org/jboss/test/ws/jaxws/smoke/tools/** + +# [CXF-1244] Application Exception not initialized properly +org/jboss/test/ws/jaxws/samples/exception/** + +# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* +org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* + +# [CXF-1253] CXF does not respect @HandlerChain on client SEI +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* + +# [CXF-1510] Cannot handle anonymous bare requests +org/jboss/test/ws/jaxws/anonymous/** + +# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/namespace/** + +# [JBWS-2112] Cannot use CXF with endpoint API +org/jboss/test/ws/jaxws/endpoint/** + +# [CXF-1513] NPE in JaxWsServiceConfiguration +org/jboss/test/ws/jaxws/handlerscope/** +org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1797/** + +# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account +org/jboss/test/ws/jaxws/jbws1190/** + +# [JBWS-2114] IllegalArgumentException: Wrong target. class +org/jboss/test/ws/jaxws/jbws1283/** +org/jboss/test/ws/jaxws/jbws1822/** + +# [CXF-1515] Bad Enumeration value 'extension restriction' +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1845/** + +# [JBWS-2115] EJB client vehicle not sufficiently isolated +org/jboss/test/ws/jaxws/jbws1581/** + +# [CXF-1516] Type inheritance with document/literal/wrapped +org/jboss/test/ws/jaxws/jbws1702/** +org/jboss/test/ws/jaxws/jbws1733/** + +# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail +org/jboss/test/ws/jaxws/jbws1762/** + +# [CXF-1517] HTTP bindings for Provider +org/jboss/test/ws/jaxws/jbws1807/** + +# [JBWS-2118] context-root in jboss.xml is ignored +org/jboss/test/ws/jaxws/jbws1813/** + +# [CXF-1518] Missing fault detail in messages from SLSB Provider +org/jboss/test/ws/jaxws/jbws1815/** + +# [JBWS-2119] WebServiceRef injection from DD doesn't work +org/jboss/test/ws/jaxws/jbws1841/** + +# [CXF-1519] Explicitly set the namespace of a WebFault +org/jboss/test/ws/jaxws/jbws1904/** + +# [CXF-1520] MTOM chunked encoding transfer +org/jboss/test/ws/jaxws/jbws2000/** + +# [CXF-1521] Exception handling with @WebFault annotation +org/jboss/test/ws/jaxws/webfault/** + +# [CXF-1522] NPE in ServiceUtils +org/jboss/test/ws/jaxws/jbws1566/** + +# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks +org/jboss/test/ws/jaxws/wsrm/** Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,97 +0,0 @@ -# -# $Id$ -# - -# Won't Fix: [CXF-1261] Handler does not see XOP message properly -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/webserviceref/** - -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-1774] Provide tools implementation for CXF -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -org/jboss/test/ws/jaxws/smoke/tools/** - -# [CXF-1244] Application Exception not initialized properly -org/jboss/test/ws/jaxws/samples/exception/** - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1253] CXF does not respect @HandlerChain on client SEI -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/namespace/** - -# [JBWS-2112] Cannot use CXF with endpoint API -org/jboss/test/ws/jaxws/endpoint/** - -# [CXF-1513] NPE in JaxWsServiceConfiguration -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1797/** - -# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2114] IllegalArgumentException: Wrong target. class -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1822/** - -# [CXF-1515] Bad Enumeration value 'extension restriction' -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1845/** - -# [JBWS-2115] EJB client vehicle not sufficiently isolated -org/jboss/test/ws/jaxws/jbws1581/** - -# [CXF-1516] Type inheritance with document/literal/wrapped -org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** - -# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [JBWS-2118] context-root in jboss.xml is ignored -org/jboss/test/ws/jaxws/jbws1813/** - -# [CXF-1518] Missing fault detail in messages from SLSB Provider -org/jboss/test/ws/jaxws/jbws1815/** - -# [JBWS-2119] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1520] MTOM chunked encoding transfer -org/jboss/test/ws/jaxws/jbws2000/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-1522] NPE in ServiceUtils -org/jboss/test/ws/jaxws/jbws1566/** - -# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -org/jboss/test/ws/jaxws/wsrm/** Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss423.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,97 @@ +# +# $Id$ +# + +# Won't Fix: [CXF-1261] Handler does not see XOP message properly +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* + +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** + +# [JBWS-1178] Multiple virtual host and soap:address problem +org/jboss/test/ws/jaxws/jbws1178/** + +# [JBWS-1774] Provide tools implementation for CXF +org/jboss/test/ws/jaxws/complex/** +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-1683] Fix JAXR samples for CXF +org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) +org/jboss/test/ws/jaxws/smoke/tools/** + +# [CXF-1244] Application Exception not initialized properly +org/jboss/test/ws/jaxws/samples/exception/** + +# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* +org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* + +# [CXF-1253] CXF does not respect @HandlerChain on client SEI +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* + +# [CXF-1510] Cannot handle anonymous bare requests +org/jboss/test/ws/jaxws/anonymous/** + +# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/namespace/** + +# [JBWS-2112] Cannot use CXF with endpoint API +org/jboss/test/ws/jaxws/endpoint/** + +# [CXF-1513] NPE in JaxWsServiceConfiguration +org/jboss/test/ws/jaxws/handlerscope/** +org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1797/** + +# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account +org/jboss/test/ws/jaxws/jbws1190/** + +# [JBWS-2114] IllegalArgumentException: Wrong target. class +org/jboss/test/ws/jaxws/jbws1283/** +org/jboss/test/ws/jaxws/jbws1822/** + +# [CXF-1515] Bad Enumeration value 'extension restriction' +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1845/** + +# [JBWS-2115] EJB client vehicle not sufficiently isolated +org/jboss/test/ws/jaxws/jbws1581/** + +# [CXF-1516] Type inheritance with document/literal/wrapped +org/jboss/test/ws/jaxws/jbws1702/** +org/jboss/test/ws/jaxws/jbws1733/** + +# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail +org/jboss/test/ws/jaxws/jbws1762/** + +# [CXF-1517] HTTP bindings for Provider +org/jboss/test/ws/jaxws/jbws1807/** + +# [JBWS-2118] context-root in jboss.xml is ignored +org/jboss/test/ws/jaxws/jbws1813/** + +# [CXF-1518] Missing fault detail in messages from SLSB Provider +org/jboss/test/ws/jaxws/jbws1815/** + +# [JBWS-2119] WebServiceRef injection from DD doesn't work +org/jboss/test/ws/jaxws/jbws1841/** + +# [CXF-1519] Explicitly set the namespace of a WebFault +org/jboss/test/ws/jaxws/jbws1904/** + +# [CXF-1520] MTOM chunked encoding transfer +org/jboss/test/ws/jaxws/jbws2000/** + +# [CXF-1521] Exception handling with @WebFault annotation +org/jboss/test/ws/jaxws/webfault/** + +# [CXF-1522] NPE in ServiceUtils +org/jboss/test/ws/jaxws/jbws1566/** + +# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks +org/jboss/test/ws/jaxws/wsrm/** Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,103 +0,0 @@ -# -# $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun(a)jboss.com $ -# - -# Won't Fix: [CXF-1261] Handler does not see XOP message properly -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-1774] Provide tools implementation for CXF -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -org/jboss/test/ws/jaxws/smoke/tools/** - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [CXF-1244] Application Exception not initialized properly -org/jboss/test/ws/jaxws/samples/exception/** - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1253] CXF does not respect @HandlerChain on client SEI -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* - -# [JBWS-2107] Resolve dependency on @SecurityDomain -org/jboss/test/ws/jaxws/webserviceref/Secure** -org/jboss/test/ws/jaxws/jbws1840/** - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/namespace/** - -# [JBWS-2112] Cannot use CXF with endpoint API -org/jboss/test/ws/jaxws/endpoint/** - -# [CXF-1513] NPE in JaxWsServiceConfiguration -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1797/** - -# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2114] IllegalArgumentException: Wrong target. class -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1822/** - -# [CXF-1515] Bad Enumeration value 'extension restriction' -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1845/** - -# [JBWS-2115] EJB client vehicle not sufficiently isolated -org/jboss/test/ws/jaxws/jbws1581/** - -# [CXF-1516] Type inheritance with document/literal/wrapped -org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** - -# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [JBWS-2118] context-root in jboss.xml is ignored -org/jboss/test/ws/jaxws/jbws1813/** - -# [CXF-1518] Missing fault detail in messages from SLSB Provider -org/jboss/test/ws/jaxws/jbws1815/** - -# [JBWS-2119] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1520] MTOM chunked encoding transfer -org/jboss/test/ws/jaxws/jbws2000/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-1522] NPE in ServiceUtils -org/jboss/test/ws/jaxws/jbws1566/** - -# [JBWS-2120] @WebWservice does not work with class isolation -org/jboss/test/ws/jaxws/jbws1556/** - -# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -org/jboss/test/ws/jaxws/wsrm/** Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss500.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,103 @@ +# +# $Id: test-excludes.txt 3915 2007-07-17 16:16:05Z heiko.braun(a)jboss.com $ +# + +# Won't Fix: [CXF-1261] Handler does not see XOP message properly +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* + +# [JBWS-1178] Multiple virtual host and soap:address problem +org/jboss/test/ws/jaxws/jbws1178/** + +# [JBWS-1774] Provide tools implementation for CXF +org/jboss/test/ws/jaxws/complex/** +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-1683] Fix JAXR samples for CXF +org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) +org/jboss/test/ws/jaxws/smoke/tools/** + +# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored +org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* + +# [CXF-1244] Application Exception not initialized properly +org/jboss/test/ws/jaxws/samples/exception/** + +# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* +org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* + +# [CXF-1253] CXF does not respect @HandlerChain on client SEI +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* + +# [JBWS-2107] Resolve dependency on @SecurityDomain +org/jboss/test/ws/jaxws/webserviceref/Secure** +org/jboss/test/ws/jaxws/jbws1840/** + +# [CXF-1510] Cannot handle anonymous bare requests +org/jboss/test/ws/jaxws/anonymous/** + +# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/namespace/** + +# [JBWS-2112] Cannot use CXF with endpoint API +org/jboss/test/ws/jaxws/endpoint/** + +# [CXF-1513] NPE in JaxWsServiceConfiguration +org/jboss/test/ws/jaxws/handlerscope/** +org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1797/** + +# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account +org/jboss/test/ws/jaxws/jbws1190/** + +# [JBWS-2114] IllegalArgumentException: Wrong target. class +org/jboss/test/ws/jaxws/jbws1283/** +org/jboss/test/ws/jaxws/jbws1822/** + +# [CXF-1515] Bad Enumeration value 'extension restriction' +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1845/** + +# [JBWS-2115] EJB client vehicle not sufficiently isolated +org/jboss/test/ws/jaxws/jbws1581/** + +# [CXF-1516] Type inheritance with document/literal/wrapped +org/jboss/test/ws/jaxws/jbws1702/** +org/jboss/test/ws/jaxws/jbws1733/** + +# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail +org/jboss/test/ws/jaxws/jbws1762/** + +# [CXF-1517] HTTP bindings for Provider +org/jboss/test/ws/jaxws/jbws1807/** + +# [JBWS-2118] context-root in jboss.xml is ignored +org/jboss/test/ws/jaxws/jbws1813/** + +# [CXF-1518] Missing fault detail in messages from SLSB Provider +org/jboss/test/ws/jaxws/jbws1815/** + +# [JBWS-2119] WebServiceRef injection from DD doesn't work +org/jboss/test/ws/jaxws/jbws1841/** + +# [CXF-1519] Explicitly set the namespace of a WebFault +org/jboss/test/ws/jaxws/jbws1904/** + +# [CXF-1520] MTOM chunked encoding transfer +org/jboss/test/ws/jaxws/jbws2000/** + +# [CXF-1521] Exception handling with @WebFault annotation +org/jboss/test/ws/jaxws/webfault/** + +# [CXF-1522] NPE in ServiceUtils +org/jboss/test/ws/jaxws/jbws1566/** + +# [JBWS-2120] @WebWservice does not work with class isolation +org/jboss/test/ws/jaxws/jbws1556/** + +# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks +org/jboss/test/ws/jaxws/wsrm/** Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,110 +0,0 @@ -# -# $Id$ -# - -# Won't Fix: [CXF-1261] Handler does not see XOP message properly -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-1774] Provide tools implementation for CXF -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -org/jboss/test/ws/jaxws/smoke/tools/** - -# [EJBTHREE-1150] WebServiceContext injection requires mapped-name -org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.* - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.* - -# [CXF-1244] Application Exception not initialized properly -org/jboss/test/ws/jaxws/samples/exception/** - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1253] CXF does not respect @HandlerChain on client SEI -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* - -# TODO: Fix classpath to ClientLauncher -org/jboss/test/ws/jaxws/samples/webserviceref/** - -# [JBWS-2107] Resolve dependency on @SecurityDomain -org/jboss/test/ws/jaxws/jbws1840/** - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/namespace/** - -# [JBWS-2112] Cannot use CXF with endpoint API -org/jboss/test/ws/jaxws/endpoint/** - -# [CXF-1513] NPE in JaxWsServiceConfiguration -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1797/** - -# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2114] IllegalArgumentException: Wrong target. class -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1822/** - -# [CXF-1515] Bad Enumeration value 'extension restriction' -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1845/** - -# [JBWS-2115] EJB client vehicle not sufficiently isolated -org/jboss/test/ws/jaxws/jbws1581/** - -# [CXF-1516] Type inheritance with document/literal/wrapped -org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** - -# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [JBWS-2118] context-root in jboss.xml is ignored -org/jboss/test/ws/jaxws/jbws1813/** - -# [CXF-1518] Missing fault detail in messages from SLSB Provider -org/jboss/test/ws/jaxws/jbws1815/** - -# [JBWS-2119] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1520] MTOM chunked encoding transfer -org/jboss/test/ws/jaxws/jbws2000/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-1522] NPE in ServiceUtils -org/jboss/test/ws/jaxws/jbws1566/** - -# [JBAS-5359] mapped-name is required for context of deployment -org/jboss/test/ws/console/** -org/jboss/test/ws/jaxws/jbws1611/** - -# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -org/jboss/test/ws/jaxws/wsrm/** Copied: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt) =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/test-excludes-jboss501.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,110 @@ +# +# $Id$ +# + +# Won't Fix: [CXF-1261] Handler does not see XOP message properly +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* + +# [JBWS-1178] Multiple virtual host and soap:address problem +org/jboss/test/ws/jaxws/jbws1178/** + +# [JBWS-1774] Provide tools implementation for CXF +org/jboss/test/ws/jaxws/complex/** +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-1683] Fix JAXR samples for CXF +org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) +org/jboss/test/ws/jaxws/smoke/tools/** + +# [EJBTHREE-1150] WebServiceContext injection requires mapped-name +org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.* + +# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored +org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* +org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.* + +# [CXF-1244] Application Exception not initialized properly +org/jboss/test/ws/jaxws/samples/exception/** + +# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* +org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* + +# [CXF-1253] CXF does not respect @HandlerChain on client SEI +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* + +# TODO: Fix classpath to ClientLauncher +org/jboss/test/ws/jaxws/samples/webserviceref/** + +# [JBWS-2107] Resolve dependency on @SecurityDomain +org/jboss/test/ws/jaxws/jbws1840/** + +# [CXF-1510] Cannot handle anonymous bare requests +org/jboss/test/ws/jaxws/anonymous/** + +# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/namespace/** + +# [JBWS-2112] Cannot use CXF with endpoint API +org/jboss/test/ws/jaxws/endpoint/** + +# [CXF-1513] NPE in JaxWsServiceConfiguration +org/jboss/test/ws/jaxws/handlerscope/** +org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1797/** + +# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account +org/jboss/test/ws/jaxws/jbws1190/** + +# [JBWS-2114] IllegalArgumentException: Wrong target. class +org/jboss/test/ws/jaxws/jbws1283/** +org/jboss/test/ws/jaxws/jbws1822/** + +# [CXF-1515] Bad Enumeration value 'extension restriction' +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1845/** + +# [JBWS-2115] EJB client vehicle not sufficiently isolated +org/jboss/test/ws/jaxws/jbws1581/** + +# [CXF-1516] Type inheritance with document/literal/wrapped +org/jboss/test/ws/jaxws/jbws1702/** +org/jboss/test/ws/jaxws/jbws1733/** + +# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail +org/jboss/test/ws/jaxws/jbws1762/** + +# [CXF-1517] HTTP bindings for Provider +org/jboss/test/ws/jaxws/jbws1807/** + +# [JBWS-2118] context-root in jboss.xml is ignored +org/jboss/test/ws/jaxws/jbws1813/** + +# [CXF-1518] Missing fault detail in messages from SLSB Provider +org/jboss/test/ws/jaxws/jbws1815/** + +# [JBWS-2119] WebServiceRef injection from DD doesn't work +org/jboss/test/ws/jaxws/jbws1841/** + +# [CXF-1519] Explicitly set the namespace of a WebFault +org/jboss/test/ws/jaxws/jbws1904/** + +# [CXF-1520] MTOM chunked encoding transfer +org/jboss/test/ws/jaxws/jbws2000/** + +# [CXF-1521] Exception handling with @WebFault annotation +org/jboss/test/ws/jaxws/webfault/** + +# [CXF-1522] NPE in ServiceUtils +org/jboss/test/ws/jaxws/jbws1566/** + +# [JBAS-5359] mapped-name is required for context of deployment +org/jboss/test/ws/console/** +org/jboss/test/ws/jaxws/jbws1611/** + +# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks +org/jboss/test/ws/jaxws/wsrm/** Copied: stack/cxf/trunk/modules/testsuite/framework-tests (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests) Property changes on: stack/cxf/trunk/modules/testsuite/framework-tests ___________________________________________________________________ Name: svn:ignore + target Deleted: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,192 +0,0 @@ -<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>JBoss Web Services - Stack CXF Framework Tests</name> - <artifactId>jbossws-cxf-framework-tests</artifactId> - <packaging>jar</packaging> - -  - <parent> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf-testsuite</artifactId> - <version>3.0.2-SNAPSHOT</version> - </parent> - - <build> - <plugins> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <configuration> - <filesets> - <fileset> - <directory>src/test</directory> - <includes> - <include>ant-import/**</include> - <include>java/**</include> - <include>resources/**</include> - </includes> - </fileset> - </filesets> - </configuration> - </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <classifier>testsuite</classifier> - <type>zip</type> - </artifactItem> - </artifactItems> - <outputDirectory>src/test</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> -  - <profile> - <id>jboss422-cxf-tests-profile</id> - <activation> - <property> - <name>env</name> - <value>jboss422</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <testExcludes> -  - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> - <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/complex/**</exclude> - <exclude>org/jboss/test/ws/jaxws/holder/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/**</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/anonymous/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/binding/**</exclude> - <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude> - </testExcludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> Copied: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/pom.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,192 @@ +<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>JBoss Web Services - Stack CXF Framework Tests</name> + <artifactId>jbossws-cxf-framework-tests</artifactId> + <packaging>jar</packaging> + +  + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf-testsuite</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + + <build> + <plugins> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>src/test</directory> + <includes> + <include>ant-import/**</include> + <include>java/**</include> + <include>resources/**</include> + </includes> + </fileset> + </filesets> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <classifier>testsuite</classifier> + <type>zip</type> + </artifactItem> + </artifactItems> + <outputDirectory>src/test</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> +  + <profile> + <id>jboss422-cxf-tests-profile</id> + <activation> + <property> + <name>env</name> + <value>jboss422</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <testExcludes> +  + <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> + <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/complex/**</exclude> + <exclude>org/jboss/test/ws/jaxws/holder/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/anonymous/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/binding/**</exclude> + <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude> + </testExcludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Copied: stack/cxf/trunk/modules/testsuite/framework-tests/src (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src) Copied: stack/cxf/trunk/modules/testsuite/framework-tests/src/test (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test) Property changes on: stack/cxf/trunk/modules/testsuite/framework-tests/src/test ___________________________________________________________________ Name: svn:ignore + ant-import java resources Copied: stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc) Deleted: stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/jndi.properties =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc/jndi.properties 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/jndi.properties 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,3 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -java.naming.provider.url=jnp://@jboss.bind.address@:1099 \ No newline at end of file Copied: stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/jndi.properties (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc/jndi.properties) =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/jndi.properties (rev 0) +++ stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/jndi.properties 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,3 @@ +java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory +java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces +java.naming.provider.url=jnp://@jboss.bind.address@:1099 \ No newline at end of file Deleted: stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - -  -  -  - -  - <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <param name="File" value="${build.testlog}/test.log"/> - <param name="Append" value="true"/> - -  - <param name="DatePattern" value="'.'yyyy-MM-dd"/> - - <layout class="org.apache.log4j.PatternLayout"> -  - <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/> - </layout> - </appender> - -  -  -  - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Threshold" value="INFO"/> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> -  - <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  -  -  - - <category name="org.jboss.ws"> - <priority value="DEBUG"/> - </category> - - <category name="org.jboss.test.ws"> - <priority value="TRACE"/> - </category> - - <category name="org.apache.cxf"> - <priority value="TRACE"/> - </category> - -  - <category name="org.apache.xml.security"> - <priority value="INFO"/> - </category> - -  -  -  - - <root> -  - <appender-ref ref="FILE"/> - </root> - -</log4j:configuration> Copied: stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + + + + + + + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + +  +  +  + +  + <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> + <param name="File" value="${build.testlog}/test.log"/> + <param name="Append" value="true"/> + +  + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + + <layout class="org.apache.log4j.PatternLayout"> +  + <param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/> + </layout> + </appender> + +  +  +  + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Threshold" value="INFO"/> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> +  + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + +  +  +  + + <category name="org.jboss.ws"> + <priority value="DEBUG"/> + </category> + + <category name="org.jboss.test.ws"> + <priority value="TRACE"/> + </category> + + <category name="org.apache.cxf"> + <priority value="TRACE"/> + </category> + +  + <category name="org.apache.xml.security"> + <priority value="INFO"/> + </category> + +  +  +  + + <root> +  + <appender-ref ref="FILE"/> + </root> + +</log4j:configuration> Deleted: stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/tst.policy =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc/tst.policy 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/tst.policy 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,4 +0,0 @@ -grant { - permission java.security.AllPermission; -}; - Copied: stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/tst.policy (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc/tst.policy) =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/tst.policy (rev 0) +++ stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/tst.policy 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,4 @@ +grant { + permission java.security.AllPermission; +}; + Deleted: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,222 +0,0 @@ -<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>JBoss Web Services - Stack CXF Testsuite</name> - <artifactId>jbossws-cxf-testsuite</artifactId> - <packaging>pom</packaging> - -  - <parent> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf</artifactId> - <version>3.0.2-SNAPSHOT</version> - </parent> - -  - <properties> - <jboss.bind.address>localhost</jboss.bind.address> - <surefire.jdpw.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdpw.args> - <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args> - </properties> - -  - <modules> - <module>cxf-tests</module> - <module>framework-tests</module> - </modules> - -  - <dependencies> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <classifier>testsuite</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - </dependency> - <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> - </dependency> - <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf-client</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - -  - <build> - <testResources> -  - <testResource> - <directory>src/test/etc</directory> - </testResource> -  - <testResource> - <targetPath>../test-classes</targetPath> - <directory>src/test/java</directory> - <includes> - <include>**/*.xml</include> - </includes> - </testResource> -  - <testResource> - <targetPath>../test-resources</targetPath> - <directory>src/test/resources</directory> - <includes> - <include>**/*.wsdl</include> - <include>**/*.xml</include> - </includes> - <filtering>true</filtering> - </testResource> -  - <testResource> - <targetPath>../test-resources</targetPath> - <directory>src/test/resources</directory> - <excludes> - <exclude>**/*.wsdl</exclude> - <exclude>**/*.xml</exclude> - </excludes> - </testResource> - </testResources> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args}</argLine> -  - <systemProperties> - <property> - <name>java.naming.provider.url</name> - <value>jnp://${jboss.bind.address}:1099</value> - </property> - <property> - <name>java.util.logging.manager</name> - <value>org.jboss.wsf.common.logging.JDKLogManager</value> - </property> - <property> - <name>jboss.home</name> - <value>${jboss.home}</value> - </property> - <property> - <name>jbossws.integration.target</name> - <value>${jbossws.integration.target}</value> - </property> - <property> - <name>build.testlog</name> - <value>${project.build.directory}/test-log</value> - </property> - <property> - <name>test.archive.directory</name> - <value>${project.build.directory}/test-libs</value> - </property> - <property> - <name>test.resources.directory</name> - <value>${project.build.directory}/test-resources</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> -  - <profile> - <id>jboss422-cxf-testsuite-profile</id> - <activation> - <property> - <name>env</name> - <value>jboss422</value> - </property> - </activation> - <properties> - <jboss.version>4.2.2.GA</jboss.version> - <jbossws.integration.target>jboss422</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.client</groupId> - <artifactId>jbossall-client</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>no-env-profile</id> - <activation> - <property> - <name>!env</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <echo message="************************************"/> - <echo message="* No test environment specified *"/> - <echo message="* Run: mvn -Denv=jboss??? test *"/> - <echo message="************************************"/> - <fail/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> Copied: stack/cxf/trunk/modules/testsuite/pom.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml) =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,222 @@ +<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>JBoss Web Services - Stack CXF Testsuite</name> + <artifactId>jbossws-cxf-testsuite</artifactId> + <packaging>pom</packaging> + +  + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + +  + <properties> + <jboss.bind.address>localhost</jboss.bind.address> + <surefire.jdpw.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdpw.args> + <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args> + </properties> + +  + <modules> + <module>cxf-tests</module> + <module>framework-tests</module> + </modules> + +  + <dependencies> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <classifier>testsuite</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + </dependency> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + </dependency> + <dependency> + <groupId>javax.jws</groupId> + <artifactId>jsr181-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf-client</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + +  + <build> + <testResources> +  + <testResource> + <directory>src/test/etc</directory> + </testResource> +  + <testResource> + <targetPath>../test-classes</targetPath> + <directory>src/test/java</directory> + <includes> + <include>**/*.xml</include> + </includes> + </testResource> +  + <testResource> + <targetPath>../test-resources</targetPath> + <directory>src/test/resources</directory> + <includes> + <include>**/*.wsdl</include> + <include>**/*.xml</include> + </includes> + <filtering>true</filtering> + </testResource> +  + <testResource> + <targetPath>../test-resources</targetPath> + <directory>src/test/resources</directory> + <excludes> + <exclude>**/*.wsdl</exclude> + <exclude>**/*.xml</exclude> + </excludes> + </testResource> + </testResources> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefire.jvm.args}</argLine> +  + <systemProperties> + <property> + <name>java.naming.provider.url</name> + <value>jnp://${jboss.bind.address}:1099</value> + </property> + <property> + <name>java.util.logging.manager</name> + <value>org.jboss.wsf.common.logging.JDKLogManager</value> + </property> + <property> + <name>jboss.home</name> + <value>${jboss.home}</value> + </property> + <property> + <name>jbossws.integration.target</name> + <value>${jbossws.integration.target}</value> + </property> + <property> + <name>build.testlog</name> + <value>${project.build.directory}/test-log</value> + </property> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> + <name>test.resources.directory</name> + <value>${project.build.directory}/test-resources</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> +  + <profile> + <id>jboss422-cxf-testsuite-profile</id> + <activation> + <property> + <name>env</name> + <value>jboss422</value> + </property> + </activation> + <properties> + <jboss.version>4.2.2.GA</jboss.version> + <jbossws.integration.target>jboss422</jbossws.integration.target> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.client</groupId> + <artifactId>jbossall-client</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>no-env-profile</id> + <activation> + <property> + <name>!env</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <echo message="************************************"/> + <echo message="* No test environment specified *"/> + <echo message="* Run: mvn -Denv=jboss??? test *"/> + <echo message="************************************"/> + <fail/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,97 +0,0 @@ -# -# $Id$ -# - -# Won't Fix: [CXF-1261] Handler does not see XOP message properly -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/webserviceref/** - -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-1774] Provide tools implementation for CXF -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -org/jboss/test/ws/jaxws/smoke/tools/** - -# [CXF-1244] Application Exception not initialized properly -org/jboss/test/ws/jaxws/samples/exception/** - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1253] CXF does not respect @HandlerChain on client SEI -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/namespace/** - -# [JBWS-2112] Cannot use CXF with endpoint API -org/jboss/test/ws/jaxws/endpoint/** - -# [CXF-1513] NPE in JaxWsServiceConfiguration -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1797/** - -# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2114] IllegalArgumentException: Wrong target. class -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1822/** - -# [CXF-1515] Bad Enumeration value 'extension restriction' -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1845/** - -# [JBWS-2115] EJB client vehicle not sufficiently isolated -org/jboss/test/ws/jaxws/jbws1581/** - -# [CXF-1516] Type inheritance with document/literal/wrapped -org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** - -# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [JBWS-2118] context-root in jboss.xml is ignored -org/jboss/test/ws/jaxws/jbws1813/** - -# [CXF-1518] Missing fault detail in messages from SLSB Provider -org/jboss/test/ws/jaxws/jbws1815/** - -# [JBWS-2119] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1520] MTOM chunked encoding transfer -org/jboss/test/ws/jaxws/jbws2000/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-1522] NPE in ServiceUtils -org/jboss/test/ws/jaxws/jbws1566/** - -# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -org/jboss/test/ws/jaxws/wsrm/** Copied: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss423.txt) =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt (rev 0) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,97 @@ +# +# $Id$ +# + +# Won't Fix: [CXF-1261] Handler does not see XOP message properly +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* + +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** + +# [JBWS-1178] Multiple virtual host and soap:address problem +org/jboss/test/ws/jaxws/jbws1178/** + +# [JBWS-1774] Provide tools implementation for CXF +org/jboss/test/ws/jaxws/complex/** +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-1683] Fix JAXR samples for CXF +org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) +org/jboss/test/ws/jaxws/smoke/tools/** + +# [CXF-1244] Application Exception not initialized properly +org/jboss/test/ws/jaxws/samples/exception/** + +# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* +org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* + +# [CXF-1253] CXF does not respect @HandlerChain on client SEI +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* + +# [CXF-1510] Cannot handle anonymous bare requests +org/jboss/test/ws/jaxws/anonymous/** + +# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/namespace/** + +# [JBWS-2112] Cannot use CXF with endpoint API +org/jboss/test/ws/jaxws/endpoint/** + +# [CXF-1513] NPE in JaxWsServiceConfiguration +org/jboss/test/ws/jaxws/handlerscope/** +org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1797/** + +# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account +org/jboss/test/ws/jaxws/jbws1190/** + +# [JBWS-2114] IllegalArgumentException: Wrong target. class +org/jboss/test/ws/jaxws/jbws1283/** +org/jboss/test/ws/jaxws/jbws1822/** + +# [CXF-1515] Bad Enumeration value 'extension restriction' +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1845/** + +# [JBWS-2115] EJB client vehicle not sufficiently isolated +org/jboss/test/ws/jaxws/jbws1581/** + +# [CXF-1516] Type inheritance with document/literal/wrapped +org/jboss/test/ws/jaxws/jbws1702/** +org/jboss/test/ws/jaxws/jbws1733/** + +# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail +org/jboss/test/ws/jaxws/jbws1762/** + +# [CXF-1517] HTTP bindings for Provider +org/jboss/test/ws/jaxws/jbws1807/** + +# [JBWS-2118] context-root in jboss.xml is ignored +org/jboss/test/ws/jaxws/jbws1813/** + +# [CXF-1518] Missing fault detail in messages from SLSB Provider +org/jboss/test/ws/jaxws/jbws1815/** + +# [JBWS-2119] WebServiceRef injection from DD doesn't work +org/jboss/test/ws/jaxws/jbws1841/** + +# [CXF-1519] Explicitly set the namespace of a WebFault +org/jboss/test/ws/jaxws/jbws1904/** + +# [CXF-1520] MTOM chunked encoding transfer +org/jboss/test/ws/jaxws/jbws2000/** + +# [CXF-1521] Exception handling with @WebFault annotation +org/jboss/test/ws/jaxws/webfault/** + +# [CXF-1522] NPE in ServiceUtils +org/jboss/test/ws/jaxws/jbws1566/** + +# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks +org/jboss/test/ws/jaxws/wsrm/** Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,103 +0,0 @@ -# -# $Id$ -# - -# Won't Fix: [CXF-1261] Handler does not see XOP message properly -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-1774] Provide tools implementation for CXF -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -org/jboss/test/ws/jaxws/smoke/tools/** - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [CXF-1244] Application Exception not initialized properly -org/jboss/test/ws/jaxws/samples/exception/** - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1253] CXF does not respect @HandlerChain on client SEI -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* - -# [JBWS-2107] Resolve dependency on @SecurityDomain -org/jboss/test/ws/jaxws/webserviceref/Secure** -org/jboss/test/ws/jaxws/jbws1840/** - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/namespace/** - -# [JBWS-2112] Cannot use CXF with endpoint API -org/jboss/test/ws/jaxws/endpoint/** - -# [CXF-1513] NPE in JaxWsServiceConfiguration -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1797/** - -# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2114] IllegalArgumentException: Wrong target. class -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1822/** - -# [CXF-1515] Bad Enumeration value 'extension restriction' -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1845/** - -# [JBWS-2115] EJB client vehicle not sufficiently isolated -org/jboss/test/ws/jaxws/jbws1581/** - -# [CXF-1516] Type inheritance with document/literal/wrapped -org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** - -# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [JBWS-2118] context-root in jboss.xml is ignored -org/jboss/test/ws/jaxws/jbws1813/** - -# [CXF-1518] Missing fault detail in messages from SLSB Provider -org/jboss/test/ws/jaxws/jbws1815/** - -# [JBWS-2119] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1520] MTOM chunked encoding transfer -org/jboss/test/ws/jaxws/jbws2000/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-1522] NPE in ServiceUtils -org/jboss/test/ws/jaxws/jbws1566/** - -# [JBWS-2120] @WebWservice does not work with class isolation -org/jboss/test/ws/jaxws/jbws1556/** - -# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -org/jboss/test/ws/jaxws/wsrm/** Copied: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss500.txt) =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt (rev 0) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,103 @@ +# +# $Id$ +# + +# Won't Fix: [CXF-1261] Handler does not see XOP message properly +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* + +# [JBWS-1178] Multiple virtual host and soap:address problem +org/jboss/test/ws/jaxws/jbws1178/** + +# [JBWS-1774] Provide tools implementation for CXF +org/jboss/test/ws/jaxws/complex/** +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-1683] Fix JAXR samples for CXF +org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) +org/jboss/test/ws/jaxws/smoke/tools/** + +# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored +org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* + +# [CXF-1244] Application Exception not initialized properly +org/jboss/test/ws/jaxws/samples/exception/** + +# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* +org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* + +# [CXF-1253] CXF does not respect @HandlerChain on client SEI +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* + +# [JBWS-2107] Resolve dependency on @SecurityDomain +org/jboss/test/ws/jaxws/webserviceref/Secure** +org/jboss/test/ws/jaxws/jbws1840/** + +# [CXF-1510] Cannot handle anonymous bare requests +org/jboss/test/ws/jaxws/anonymous/** + +# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/namespace/** + +# [JBWS-2112] Cannot use CXF with endpoint API +org/jboss/test/ws/jaxws/endpoint/** + +# [CXF-1513] NPE in JaxWsServiceConfiguration +org/jboss/test/ws/jaxws/handlerscope/** +org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1797/** + +# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account +org/jboss/test/ws/jaxws/jbws1190/** + +# [JBWS-2114] IllegalArgumentException: Wrong target. class +org/jboss/test/ws/jaxws/jbws1283/** +org/jboss/test/ws/jaxws/jbws1822/** + +# [CXF-1515] Bad Enumeration value 'extension restriction' +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1845/** + +# [JBWS-2115] EJB client vehicle not sufficiently isolated +org/jboss/test/ws/jaxws/jbws1581/** + +# [CXF-1516] Type inheritance with document/literal/wrapped +org/jboss/test/ws/jaxws/jbws1702/** +org/jboss/test/ws/jaxws/jbws1733/** + +# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail +org/jboss/test/ws/jaxws/jbws1762/** + +# [CXF-1517] HTTP bindings for Provider +org/jboss/test/ws/jaxws/jbws1807/** + +# [JBWS-2118] context-root in jboss.xml is ignored +org/jboss/test/ws/jaxws/jbws1813/** + +# [CXF-1518] Missing fault detail in messages from SLSB Provider +org/jboss/test/ws/jaxws/jbws1815/** + +# [JBWS-2119] WebServiceRef injection from DD doesn't work +org/jboss/test/ws/jaxws/jbws1841/** + +# [CXF-1519] Explicitly set the namespace of a WebFault +org/jboss/test/ws/jaxws/jbws1904/** + +# [CXF-1520] MTOM chunked encoding transfer +org/jboss/test/ws/jaxws/jbws2000/** + +# [CXF-1521] Exception handling with @WebFault annotation +org/jboss/test/ws/jaxws/webfault/** + +# [CXF-1522] NPE in ServiceUtils +org/jboss/test/ws/jaxws/jbws1566/** + +# [JBWS-2120] @WebWservice does not work with class isolation +org/jboss/test/ws/jaxws/jbws1556/** + +# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks +org/jboss/test/ws/jaxws/wsrm/** Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,110 +0,0 @@ -# -# $Id$ -# - -# Won't Fix: [CXF-1261] Handler does not see XOP message properly -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-1774] Provide tools implementation for CXF -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -org/jboss/test/ws/jaxws/smoke/tools/** - -# [EJBTHREE-1150] WebServiceContext injection requires mapped-name -org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.* - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.* - -# [CXF-1244] Application Exception not initialized properly -org/jboss/test/ws/jaxws/samples/exception/** - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1253] CXF does not respect @HandlerChain on client SEI -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* - -# TODO: Fix classpath to ClientLauncher -org/jboss/test/ws/jaxws/samples/webserviceref/** - -# [JBWS-2107] Resolve dependency on @SecurityDomain -org/jboss/test/ws/jaxws/jbws1840/** - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/namespace/** - -# [JBWS-2112] Cannot use CXF with endpoint API -org/jboss/test/ws/jaxws/endpoint/** - -# [CXF-1513] NPE in JaxWsServiceConfiguration -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1797/** - -# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2114] IllegalArgumentException: Wrong target. class -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1822/** - -# [CXF-1515] Bad Enumeration value 'extension restriction' -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1845/** - -# [JBWS-2115] EJB client vehicle not sufficiently isolated -org/jboss/test/ws/jaxws/jbws1581/** - -# [CXF-1516] Type inheritance with document/literal/wrapped -org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** - -# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [JBWS-2118] context-root in jboss.xml is ignored -org/jboss/test/ws/jaxws/jbws1813/** - -# [CXF-1518] Missing fault detail in messages from SLSB Provider -org/jboss/test/ws/jaxws/jbws1815/** - -# [JBWS-2119] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1520] MTOM chunked encoding transfer -org/jboss/test/ws/jaxws/jbws2000/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-1522] NPE in ServiceUtils -org/jboss/test/ws/jaxws/jbws1566/** - -# [JBAS-5359] mapped-name is required for context of deployment -org/jboss/test/ws/console/** -org/jboss/test/ws/jaxws/jbws1611/** - -# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -org/jboss/test/ws/jaxws/wsrm/** Copied: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt (from rev 6638, stack/cxf/branches/tdiesler/trunk/modules/testsuite/test-excludes-jboss501.txt) =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt (rev 0) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,110 @@ +# +# $Id$ +# + +# Won't Fix: [CXF-1261] Handler does not see XOP message properly +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* + +# [JBWS-1178] Multiple virtual host and soap:address problem +org/jboss/test/ws/jaxws/jbws1178/** + +# [JBWS-1774] Provide tools implementation for CXF +org/jboss/test/ws/jaxws/complex/** +org/jboss/test/ws/jaxws/holder/** + +# [JBWS-1683] Fix JAXR samples for CXF +org/jboss/test/ws/jaxws/samples/jaxr/** + +# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) +org/jboss/test/ws/jaxws/smoke/tools/** + +# [EJBTHREE-1150] WebServiceContext injection requires mapped-name +org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.* + +# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored +org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* +org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.* + +# [CXF-1244] Application Exception not initialized properly +org/jboss/test/ws/jaxws/samples/exception/** + +# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* +org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* + +# [CXF-1253] CXF does not respect @HandlerChain on client SEI +org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* + +# TODO: Fix classpath to ClientLauncher +org/jboss/test/ws/jaxws/samples/webserviceref/** + +# [JBWS-2107] Resolve dependency on @SecurityDomain +org/jboss/test/ws/jaxws/jbws1840/** + +# [CXF-1510] Cannot handle anonymous bare requests +org/jboss/test/ws/jaxws/anonymous/** + +# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/namespace/** + +# [JBWS-2112] Cannot use CXF with endpoint API +org/jboss/test/ws/jaxws/endpoint/** + +# [CXF-1513] NPE in JaxWsServiceConfiguration +org/jboss/test/ws/jaxws/handlerscope/** +org/jboss/test/ws/jaxws/jbws1694/** +org/jboss/test/ws/jaxws/jbws1797/** + +# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account +org/jboss/test/ws/jaxws/jbws1190/** + +# [JBWS-2114] IllegalArgumentException: Wrong target. class +org/jboss/test/ws/jaxws/jbws1283/** +org/jboss/test/ws/jaxws/jbws1822/** + +# [CXF-1515] Bad Enumeration value 'extension restriction' +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1845/** + +# [JBWS-2115] EJB client vehicle not sufficiently isolated +org/jboss/test/ws/jaxws/jbws1581/** + +# [CXF-1516] Type inheritance with document/literal/wrapped +org/jboss/test/ws/jaxws/jbws1702/** +org/jboss/test/ws/jaxws/jbws1733/** + +# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail +org/jboss/test/ws/jaxws/jbws1762/** + +# [CXF-1517] HTTP bindings for Provider +org/jboss/test/ws/jaxws/jbws1807/** + +# [JBWS-2118] context-root in jboss.xml is ignored +org/jboss/test/ws/jaxws/jbws1813/** + +# [CXF-1518] Missing fault detail in messages from SLSB Provider +org/jboss/test/ws/jaxws/jbws1815/** + +# [JBWS-2119] WebServiceRef injection from DD doesn't work +org/jboss/test/ws/jaxws/jbws1841/** + +# [CXF-1519] Explicitly set the namespace of a WebFault +org/jboss/test/ws/jaxws/jbws1904/** + +# [CXF-1520] MTOM chunked encoding transfer +org/jboss/test/ws/jaxws/jbws2000/** + +# [CXF-1521] Exception handling with @WebFault annotation +org/jboss/test/ws/jaxws/webfault/** + +# [CXF-1522] NPE in ServiceUtils +org/jboss/test/ws/jaxws/jbws1566/** + +# [JBAS-5359] mapped-name is required for context of deployment +org/jboss/test/ws/console/** +org/jboss/test/ws/jaxws/jbws1611/** + +# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks +org/jboss/test/ws/jaxws/wsrm/** Copied: stack/cxf/trunk/pom.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/pom.xml) =================================================================== --- stack/cxf/trunk/pom.xml (rev 0) +++ stack/cxf/trunk/pom.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,329 @@ +<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>JBoss Web Services - Stack CXF</name> + <groupId>org.jboss.ws</groupId> + <artifactId>trunk</artifactId> + <packaging>pom</packaging> + + <version>3.0.2-SNAPSHOT</version> + +  + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + +  + <modules> + <module>modules/management</module> + <module>modules/server</module> + <module>modules/client</module> + </modules> + +  + <properties> + <cxf.version>2.0.5-incubator</cxf.version> + <cxf.stax.version>1.0.1</cxf.stax.version> + <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> + <jbossws.framework.version>${version}</jbossws.framework.version> + <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> + <jbossws.jboss42.version>4.2.2-SNAPSHOT</jbossws.jboss42.version> + <jboss.common.version>1.2.1.GA</jboss.common.version> + <jaxb.api.version>2.1</jaxb.api.version> + <jaxb.impl.version>2.1.6</jaxb.impl.version> + <jaxrpc.api.version>1.1</jaxrpc.api.version> + <jaxws.api.version>2.0</jaxws.api.version> + <juddi.service.version>1.2.0.GA</juddi.service.version> + <saaj.api.version>1.3</saaj.api.version> + </properties> + +  + <dependencyManagement> + <dependencies> + +  + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <version>${jbossws.common.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>${jbossws.spi.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <version>${jbossws.framework.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <version>${version}</version> + <classifier>scripts</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <version>${version}</version> + <classifier>testsuite</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + <version>${jbossws.jboss42.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + <version>${jbossws.jboss42.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> + +  + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <version>3.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.jws</groupId> + <artifactId>jsr181-api</artifactId> + <version>1.0-MR1</version> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-bindings-soap</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-bindings-soap</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http-jetty</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-jms</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-rm</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + <version>${jaxrpc.api.version}</version> + </dependency> + <dependency> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + <version>${saaj.api.version}</version> + </dependency> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>${jaxws.api.version}</version> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>${cxf.stax.version}</version> + </dependency> + +  + <dependency> + <groupId>jboss.common</groupId> + <artifactId>jboss-common</artifactId> + <version>${jboss.common.version}</version> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb.api.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${jaxb.impl.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-xjc</artifactId> + <version>${jaxb.impl.version}</version> + </dependency> + <dependency> + <groupId>jboss.jaxr</groupId> + <artifactId>juddi-service</artifactId> + <version>${juddi.service.version}</version> + <type>sar</type> + </dependency> + </dependencies> + </dependencyManagement> + +  + <dependencies> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <classifier>scripts</classifier> + <type>zip</type> + </dependency> + </dependencies> + +  + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>validate-jboss-home</id> + <phase>validate</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <echo/> + <echo message="jboss.home=${jboss.home}"/> + <echo/> + <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/> + <fail message="Invalid integration target: ${jboss.home}" unless="jboss.available"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>deploy-artifacts</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> +  + <descriptors> + <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + +  + <profiles> +  + <profile> + <id>testsuite</id> + <modules> + <module>modules/testsuite</module> + </modules> + </profile> + +  + <profile> + <id>bindist</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>jbossws-cxf-dist</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/main/scripts/assembly-bin-dist.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>jboss422-user-profile</id> + <activation> + <property> + <name>env</name> + <value>jboss422</value> + </property> + </activation> + <properties> + <jbossws.integration.target>jboss422</jbossws.integration.target> + <jboss.home>${jboss422.home}</jboss.home> + </properties> + </profile> + </profiles> + +  + <repositories> + <repository> + <id>apache.incubating.repository</id> + <url>http://people.apache.org/repo/m2-incubating-repository</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>java.net</id> + <url>http://download.java.net/maven/1/</url> + <layout>legacy</layout> + </repository> + </repositories> +</project> Copied: stack/cxf/trunk/profiles-example.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/profiles-example.xml) =================================================================== --- stack/cxf/trunk/profiles-example.xml (rev 0) +++ stack/cxf/trunk/profiles-example.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,21 @@ +<profilesXml 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/xsd/profiles-1.0.0.xsd"> + <profiles> + +  + <profile> + <id>jboss-home-profile</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home> + <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> + <jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home> + <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4</jboss500.home> + <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1</jboss501.home> + </properties> + </profile> + + </profiles> +</profilesXml> \ No newline at end of file Property changes on: stack/cxf/trunk/src ___________________________________________________________________ Name: svn:externals - test-framework http://anonsvn.jboss.org/repos/jbossws/framework/trunk/testsuite/test Copied: stack/cxf/trunk/src/main/distro/JBossORG-EULA.txt (from rev 6638, stack/cxf/branches/tdiesler/trunk/src/main/distro/JBossORG-EULA.txt) =================================================================== --- stack/cxf/trunk/src/main/distro/JBossORG-EULA.txt (rev 0) +++ stack/cxf/trunk/src/main/distro/JBossORG-EULA.txt 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,107 @@ +LICENSE AGREEMENT +JBOSS(r) + +This License Agreement governs the use of the Software Packages and any updates to the Software +Packages, regardless of the delivery mechanism. Each Software Package is a collective work +under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to +the user ("Client") a license to the applicable collective work(s) pursuant to the +GNU Lesser General Public License v. 2.1 except for the following Software Packages: +(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the +GNU General Public License v.2; + +(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0; + +(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the +(open source) Sleepycat License (if Client does not wish to use the open source version of this database, +it may purchase a license from Sleepycat Software); + +and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, +and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various +royalty-free patent licenses. + +Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php. + +1. The Software. "Software Packages" refer to the various software modules that are created and made available +for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages +may be comprised of hundreds of software components. The end user license agreement for each component is located in +the component's source code. With the exception of certain image files identified in Section 2 below, +the license terms for the components permit Client to copy, modify, and redistribute the component, +in both source code and binary code forms. This agreement does not limit Client's rights under, +or grant Client rights that supersede, the license terms of any particular component. + +2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright +and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall +remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the +individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates +in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages +using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's +trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by +these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. +If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at +http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted. +Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages. + +3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular +component, to the maximum extent permitted under applicable law, the Software Packages and the +components are provided and licensed "as is" without warranty of any kind, expressed or implied, +including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. +Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in +materials and manufacture under normal use for a period of 30 days from the date of delivery to Client. +Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements +or that the operation of the Software Packages will be entirely error free or appear precisely as described +in the accompanying documentation. This warranty extends only to the party that purchases the Services +pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. + +4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies +described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's +exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of +delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or +refund the money paid by Client for the Software. To the maximum extent permitted by applicable law, +Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential +damages, including lost profits or lost savings arising out of the use or inability to use the Software, +even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall +Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this +Agreement during the twelve months preceding the action. + +5. Export Control. As required by U.S. law, Client represents and warrants that it: +(a) understands that the Software Packages are subject to export controls under the +U.S. Commerce Department's Export Administration Regulations ("EAR"); + +(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations +(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); + +(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, +or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; + +(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or +biological weapons, or missile technology end-uses unless authorized by the U.S. Government by +regulation or specific license; + +(e) understands and agrees that if it is in the United States and exports or transfers the Software +Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual +reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and +address (including country) of each transferee; + +and (f) understands that countries other than the United States may restrict the import, use, or +export of encryption products and that it shall be solely responsible for compliance with any such +import, use, or export restrictions. + +6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages +that are not part of the Software Packages and which Client must install separately. These third party +programs are subject to their own license terms. The license terms either accompany the programs or +can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable +license terms for such programs, then Client may not install them. If Client wishes to install the programs +on more than one system or transfer the programs to another party, then Client must contact the licensor +of the programs. + +7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the +enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the +State of North Carolina and of the United States, without regard to any conflict of laws provisions, +except that the United Nations Convention on the International Sale of Goods shall not apply. + +Copyright 2006 Red Hat, Inc. All rights reserved. +"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc. +All other trademarks are the property of their respective owners. + + Page 1 of 1 18 October 2006 + Copied: stack/cxf/trunk/src/main/distro/ant.properties (from rev 6638, stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties) =================================================================== --- stack/cxf/trunk/src/main/distro/ant.properties (rev 0) +++ stack/cxf/trunk/src/main/distro/ant.properties 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,31 @@ +# +# A sample ant properties file +# +# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ + +# Optional JBoss Home +jboss422.home=(a)jboss422.home@ +jboss423.home=(a)jboss423.home@ +jboss500.home=(a)jboss500.home@ +jboss501.home=(a)jboss501.home@ + +# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501] +jbossws.integration.target=(a)jbossws.integration.target@ + +# The JBoss settings +jboss.server.instance=default +jboss.bind.address=localhost + +# JBoss Repository +#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository +jboss.repository=http://repository.jboss.org + +# JBoss JMX invoker authentication +#jmx.authentication.username=admin +#jmx.authentication.password=admin + +# Java Compiler options +javac.debug=yes +javac.deprecation=no +javac.fail.onerror=yes +javac.verbose=no Deleted: stack/cxf/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/src/main/distro/ant.properties.example 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/src/main/distro/ant.properties.example 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,31 +0,0 @@ -# -# A sample ant properties file -# -# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ - -# Optional JBoss Home -jboss422.home=(a)jboss422.home@ -jboss423.home=(a)jboss423.home@ -jboss500.home=(a)jboss500.home@ -jboss501.home=(a)jboss501.home@ - -# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501] -jbossws.integration.target=(a)jbossws.integration.target@ - -# The JBoss settings -jboss.server.instance=default -jboss.bind.address=localhost - -# JBoss Repository -#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository -jboss.repository=http://repository.jboss.org - -# JBoss JMX invoker authentication -#jmx.authentication.username=admin -#jmx.authentication.password=admin - -# Java Compiler options -javac.debug=yes -javac.deprecation=no -javac.fail.onerror=yes -javac.verbose=no Deleted: stack/cxf/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,189 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project default="main" basedir="." name="JBossWS-CXF"> - -  -  -  - - <property name="build.dir" value="${basedir}/build"/> - <property name="docs.dir" value="${basedir}/docs"/> - <property name="thirdparty.dir" value="${basedir}/deploy/lib"/> - <property name="tests.dir" value="${basedir}/tests"/> - <property name="tests.output.dir" value="${basedir}/output"/> - - <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss42"/> - <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss50"/> - <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> - - <property file="${basedir}/ant.properties"/> - <property file="${basedir}/version.properties"/> - - <property name="jboss422.lib" value="${jboss422.home}/lib"/> - <property name="jboss422.client" value="${jboss422.home}/client"/> - <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> - <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> - <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> - - <property name="jboss423.lib" value="${jboss423.home}/lib"/> - <property name="jboss423.client" value="${jboss423.home}/client"/> - <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> - <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> - <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> - - <property name="jboss500.lib" value="${jboss500.home}/lib"/> - <property name="jboss500.client" value="${jboss500.home}/client"/> - <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> - <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> - <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> - <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - - <property name="jboss501.lib" value="${jboss501.home}/lib"/> - <property name="jboss501.client" value="${jboss501.home}/client"/> - <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> - <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> - <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> - - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> - - <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> - <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> - <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> - - <available property="jboss422.available" file="${jboss422.available.file}"/> - <available property="jboss423.available" file="${jboss423.available.file}"/> - <available property="jboss500.available" file="${jboss500.available.file}"/> - <available property="jboss501.available" file="${jboss501.available.file}"/> - - <condition property="jbossws.integration.jboss42" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </or> - </condition> - <condition property="jbossws.integration.jboss50" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </or> - </condition> - -  - <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - <available classname="java.io.Console" property="HAVE_JDK_1.6"/> - - <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> - - <import file="${basedir}/build/build-deploy.xml"/> - <import file="${basedir}/build/jbossws-deploy-macros.xml"/> - <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> - -  -  -  - - <target name="prepare"> - -  - <condition property="jboss.home" value="${jboss500.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="jboss.home" value="${jboss422.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - <condition property="jboss.home" value="${jboss423.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - -  - <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> - - </target> - - <target name="tests-init" depends="prepare,tests-classpath"> - - <path id="ws.stack.classpath"> - <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> - <pathelement location="${thirdparty.dir}/cxf-${cxf.version}.jar"/> - <pathelement location="${thirdparty.dir}/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <pathelement location="${thirdparty.dir}/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-api-${cxf.jaxws.api}.jar"/> - <pathelement location="${thirdparty.dir}/jdom-${cxf.jdom}.jar"/> - <pathelement location="${thirdparty.dir}/neethi-${cxf.neethi}.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api-${cxf.saaj}.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl-${cxf.saaj}.jar"/> - <pathelement location="${thirdparty.dir}/spring-beans-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/spring-context-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/spring-core-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/wstx-${cxf.wstx}.jar"/> - <pathelement location="${thirdparty.dir}/xml-resolver-${cxf.xml.resolver}.jar"/> - <pathelement location="${thirdparty.dir}/XmlSchema-${cxf.xmlschema}.jar"/> - </path> - - <path id="tests.extra.classpath"> - <pathelement location="${thirdparty.dir}/jbossws-cxf-client.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> - </path> - - </target> - -  -  -  - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> - </target> - -  -  -  - -  - <target name="tests-copy-resources" depends="tests-init"> - <macro-copy-resources srcdir="${tests.dir}"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources"> - <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> - -  - <target name="prepare-deploy" depends="prepare"/> - -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${tests.output.dir}"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - </target> - - <target name="main" depends="most" description="Executes the default target (most)."/> - - <target name="most" depends="tests-main" description="Builds almost everything."/> - -</project> \ No newline at end of file Copied: stack/cxf/trunk/src/main/distro/build-deploy.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml) =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml (rev 0) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <target name="deploy-structure-jboss42" depends="prepare-deploy"> + <delete dir="${deploy.structure.jboss42}"/> + <antcall target="deploy-jbossws-cxf42" inheritall="false"> + <param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/> + <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + </antcall> + <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/> + </target> + +  +  +  + + <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422"> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <copy todir="${jboss422.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss42}"/> + </copy> + <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422"> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + +  +  +  + + <target name="deploy-jboss423" depends="undeploy-jboss423" description="Deploy jbossws to jboss423"> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <copy todir="${jboss423.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss42}"/> + </copy> + <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423"> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + +  +  +  + + <target name="deploy-jboss500" depends="undeploy-jboss500" description="Deploy jbossws to jboss500"> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <copy todir="${jboss500.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss50}"/> + </copy> + <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500"> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + +  +  +  + + <target name="deploy-jboss501" depends="undeploy-jboss501" description="Deploy jbossws to jboss501"> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <copy todir="${jboss501.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss50}"/> + </copy> + <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + +  +  +  + + <macrodef name="macro-create-deploy-conf"> + <attribute name="deploystructure"/> + <sequential> + <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/> + <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> + <property name="jbossws.sar.dir" value="@{deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> + <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/> + </sequential> + </macrodef> + +</project> Copied: stack/cxf/trunk/src/main/distro/build-setup.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml) =================================================================== --- stack/cxf/trunk/src/main/distro/build-setup.xml (rev 0) +++ stack/cxf/trunk/src/main/distro/build-setup.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + +  + <available property="ant.properties.available" file="${basedir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + + <property file="${basedir}/ant.properties"/> + + <property name="jboss422.lib" value="${jboss422.home}/lib"/> + <property name="jboss422.client" value="${jboss422.home}/client"/> + <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> + <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> + <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> + + <property name="jboss423.lib" value="${jboss423.home}/lib"/> + <property name="jboss423.client" value="${jboss423.home}/client"/> + <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> + <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> + <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> + + <property name="jboss500.lib" value="${jboss500.home}/lib"/> + <property name="jboss500.client" value="${jboss500.home}/client"/> + <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> + <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> + <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> + + <property name="jboss501.lib" value="${jboss501.home}/lib"/> + <property name="jboss501.client" value="${jboss501.home}/client"/> + <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> + <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> + <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> + <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> + + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> + <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> + + <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss423.available" file="${jboss423.available.file}"/> + <available property="jboss500.available" file="${jboss500.available.file}"/> + <available property="jboss501.available" file="${jboss501.available.file}"/> + + <condition property="jbossws.integration.jboss42" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> + </or> + </condition> + <condition property="jbossws.integration.jboss50" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </or> + </condition> + +  +  +  + + <target name="prepare"> + <tstamp> + <format property="build.id" pattern="yyyyMMddHHmm"/> + </tstamp> + </target> + +</project> \ No newline at end of file Copied: stack/cxf/trunk/src/main/distro/build.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml) =================================================================== --- stack/cxf/trunk/src/main/distro/build.xml (rev 0) +++ stack/cxf/trunk/src/main/distro/build.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main" basedir="." name="JBossWS-CXF"> + +  + <available property="ant.properties.available" file="${basedir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + <property file="${basedir}/ant.properties"/> + +  +  +  + + <property name="build.dir" value="${basedir}/build"/> + <property name="docs.dir" value="${basedir}/docs"/> + <property name="thirdparty.dir" value="${basedir}/deploy/lib"/> + <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${basedir}/output"/> + + <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> + <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss422"/> + <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss500"/> + <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> + + <import file="${build.dir}/build-setup.xml"/> + <import file="${build.dir}/build-deploy.xml"/> + <import file="${build.dir}/jbossws-deploy-macros.xml"/> + <import file="${tests.dir}/ant-import/build-testsuite.xml"/> + +  + <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> + +  +  +  + + <target name="tests-init" depends="prepare,tests-classpath"> + + <path id="ws.stack.classpath"> + <fileset dir="${thirdparty.dir}"/> + </path> + + <path id="tests.extra.classpath"> + </path> + + <property name="jbossws.test.log" value="${tests.output.dir}"/> + </target> + +  +  +  + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> + <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> + +  + <target name="prepare-deploy" depends="prepare"/> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${tests.output.dir}"/> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + </target> + + <target name="main" depends="most" description="Executes the default target (most)."/> + + <target name="most" depends="tests-main" description="Builds almost everything."/> + +</project> \ No newline at end of file Copied: stack/cxf/trunk/src/main/distro/jbossws-default-deploy.conf (from rev 6638, stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf) =================================================================== --- stack/cxf/trunk/src/main/distro/jbossws-default-deploy.conf (rev 0) +++ stack/cxf/trunk/src/main/distro/jbossws-default-deploy.conf 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar \ No newline at end of file Copied: stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml) =================================================================== --- stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml (rev 0) +++ stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,307 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  + <patternset id="jbossws.bin.patternset"> + <include name="**/wsconsume.bat"/> + <include name="**/wsconsume.sh"/> + <include name="**/wsprovide.bat"/> + <include name="**/wsprovide.sh"/> + </patternset> + + <patternset id="jbossws.client.patternset"> + <include name="**/cxf-*.jar"/> + <include name="**/geronimo-javamail*.jar"/> + <include name="**/geronimo-ws-metadata*.jar"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/jaxb-xjc.jar"/> + <include name="**/jaxws-api.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-cxf-client*.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-spi.jar"/> + <include name="**/jdom.jar"/> + <include name="**/neethi.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/saaj-impl.jar"/> + <include name="**/spring-beans.jar"/> + <include name="**/spring-context.jar"/> + <include name="**/spring-core.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wsdl4j.jar"/> + <include name="**/wstx.jar"/> + <include name="**/xml-resolver.jar"/> + <include name="**/XmlSchema.jar"/> + </patternset> + + <patternset id="jbossws.lib.patternset"> + <include name="**/nothing-to-deploy"/> + </patternset> + + <patternset id="jbossws.lib.endorsed.patternset"> + <include name="**/jaxb-api.jar"/> + </patternset> + + <patternset id="jbossws.server.lib.patternset"> + <include name="**/jaxws-api.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-spi.jar"/> + <include name="**/saaj-api.jar"/> + </patternset> + + <patternset id="jbossws.service.lib.patternset"> + <include name="**/cxf-*.jar"/> + <include name="**/geronimo-javamail*.jar"/> + <include name="**/geronimo-ws-metadata*.jar"/> + <include name="**/jaxrpc-api.jar"/> + <include name="**/jaxws-api.jar"/> + <include name="**/jbossws-cxf-client*.jar"/> + <include name="**/jbossws-cxf-server*.jar"/> + <include name="**/jdom.jar"/> + <include name="**/neethi.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/saaj-impl.jar"/> + <include name="**/spring-beans.jar"/> + <include name="**/spring-context.jar"/> + <include name="**/spring-core.jar"/> + <include name="**/wsdl4j.jar"/> + <include name="**/xml-resolver.jar"/> + <include name="**/XmlSchema.jar"/> + </patternset> + +  +  +  + + <macrodef name="macro-deploy-jbossws-bin"> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/bin"> + <patternset refid="jbossws.bin.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-jbossws-lib42"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-jbossws-lib50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.lib.patternset"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-jbossws-endorsed"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.lib.endorsed.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-jbossws-client"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.client.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-jbossws-server-lib"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.server.lib.patternset"/> + <include name="**/jbossws-jboss42.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-jbossws-cxf42-sar"> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true"> + <fileset dir="@{artifactsdir}/lib"> + <patternset refid="jbossws.service.lib.patternset"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> + </fileset> + </copy> + <unzip dest="@{targetdir}/jbossws-management.war"> + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-cxf-management.war"/> + </fileset> + </unzip> + <copy todir="@{targetdir}/jbossws.beans"> + <fileset dir="@{artifactsdir}/resources/jbossws-beans42"> + <include name="META-INF/**"/> + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF"> + <fileset dir="@{artifactsdir}/resources/jbossws-cxf.sar/META-INF"/> + </copy> + <copy todir="@{targetdir}/META-INF"> + <fileset dir="@{artifactsdir}/resources/jbossws-jboss42.sar/META-INF"/> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-jbossws-cxf50-sar"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.service.lib.patternset"/> + <include name="**/jbossws-deploy.conf"/> + </fileset> + </copy> + <unzip dest="@{targetdir}/jbossws-context.war" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf-context*.war"/> + </fileset> + </unzip> + <copy todir="@{targetdir}/jbossws.beans/META-INF"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf50-beans.xml"/> + </fileset> + </copy> + <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-cxf50-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/> + <copy todir="@{targetdir}/META-INF"> + <fileset dir="@{thirdpartydir}/resources/jbossws-cxf.sar/META-INF"/> + </copy> + </sequential> + </macrodef> + +  +  +  + +  + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <target name="deploy-jbossws-cxf42" depends="deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}"/> + </target> + + <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/> + </target> + + <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> + </target> + +  +  +  + + <macrodef name="macro-undeploy-jbossws"> + <attribute name="defaultconf"/> + <attribute name="targetdir"/> + <sequential> + <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/> + <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> + + <property name="jboss.undeploy.home" value="@{targetdir}/../../../.."/> + <available property="jboss.undeploy.client" file="${jboss.undeploy.home}/client"/> + <fail message="Cannot find ${jboss.undeploy.home}/client" unless="jboss.undeploy.client"/> + + <delete> + <fileset dir="${jboss.undeploy.home}" includes="${jbossws.deploy.conf}"/> + </delete> + <delete dir="@{targetdir}"/> + </sequential> + </macrodef> + +</project> \ No newline at end of file Copied: stack/cxf/trunk/src/main/scripts (from rev 6638, stack/cxf/branches/tdiesler/trunk/src/main/scripts) Deleted: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,75 +0,0 @@ -<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>binary-distribution</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <fileSets> -  - <fileSet> - <directory>src/main/distro</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>build.xml</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/distro</directory> - <outputDirectory>/</outputDirectory> - <filtered>true</filtered> - <includes> - <include>ant.properties</include> - </includes> - </fileSet> -  - <fileSet> - <directory>src/main/distro</directory> - <outputDirectory>build</outputDirectory> - <filtered>true</filtered> - <includes> - <include>build-deploy.xml</include> - <include>build-setup.xml</include> - <include>jbossws-default-deploy.conf</include> - <include>jbossws-deploy-macros.xml</include> - </includes> - </fileSet> -  - <fileSet> - <directory>src/main/distro</directory> - <outputDirectory>docs</outputDirectory> - <filtered>true</filtered> - <includes> - <include>Install.txt</include> - <include>ReleaseNotes.txt</include> - <include>JBossORG-EULA.txt</include> - </includes> - </fileSet> -  - <fileSet> - <directory>target/deploy-artifacts</directory> - <outputDirectory>deploy</outputDirectory> - </fileSet> -  - <fileSet> - <directory>modules/testsuite/framework-tests/src/test</directory> - <outputDirectory>tests</outputDirectory> - <includes> - <include>ant-import/**</include> - <include>etc/**</include> - <include>java/org/jboss/test/ws/jaxws/samples/**</include> - <include>resources/jaxws/samples/**</include> - </includes> - </fileSet> - <fileSet> - <directory>modules/testsuite/cxf-tests/src/test/resources</directory> - <outputDirectory>tests/resources</outputDirectory> - <includes> - <include>test-excludes-*.txt</include> - </includes> - </fileSet> - </fileSets> - -</assembly> \ No newline at end of file Copied: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml) =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml (rev 0) +++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,75 @@ +<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>binary-distribution</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> +  + <fileSet> + <directory>src/main/distro</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>build.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/distro</directory> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + <includes> + <include>ant.properties</include> + </includes> + </fileSet> +  + <fileSet> + <directory>src/main/distro</directory> + <outputDirectory>build</outputDirectory> + <filtered>true</filtered> + <includes> + <include>build-deploy.xml</include> + <include>build-setup.xml</include> + <include>jbossws-default-deploy.conf</include> + <include>jbossws-deploy-macros.xml</include> + </includes> + </fileSet> +  + <fileSet> + <directory>src/main/distro</directory> + <outputDirectory>docs</outputDirectory> + <filtered>true</filtered> + <includes> + <include>Install.txt</include> + <include>ReleaseNotes.txt</include> + <include>JBossORG-EULA.txt</include> + </includes> + </fileSet> +  + <fileSet> + <directory>target/deploy-artifacts</directory> + <outputDirectory>deploy</outputDirectory> + </fileSet> +  + <fileSet> + <directory>modules/testsuite/framework-tests/src/test</directory> + <outputDirectory>tests</outputDirectory> + <includes> + <include>ant-import/**</include> + <include>etc/**</include> + <include>java/org/jboss/test/ws/jaxws/samples/**</include> + <include>resources/jaxws/samples/**</include> + </includes> + </fileSet> + <fileSet> + <directory>modules/testsuite/cxf-tests/src/test/resources</directory> + <outputDirectory>tests/resources</outputDirectory> + <includes> + <include>test-excludes-*.txt</include> + </includes> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file Deleted: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-23 19:39:06 UTC (rev 6638) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,98 +0,0 @@ -<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>deploy-artifacts</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - -  - <dependencySets> - <dependencySet> - <outputDirectory>bin</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <unpack>true</unpack> - <includes> - <include>*:jbossws-framework:zip:scripts</include> - </includes> - </dependencySet> - </dependencySets> - -  - <moduleSets> - <moduleSet> - <includes> - <include>org.jboss.ws:jbossws-cxf-client</include> - <include>org.jboss.ws:jbossws-cxf-server</include> - </includes> - <binaries> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <unpack>false</unpack> - <dependencySets> - <dependencySet> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:cxf-*</include> - <include>*:geronimo-javamail*</include> - <include>*:geronimo-ws-metadata*</include> - <include>*:jaxb-api:jar</include> - <include>*:jaxb-impl:jar</include> - <include>*:jaxb-xjc:jar</include> - <include>*:jaxrpc-api:jar</include> - <include>*:jaxws-api:jar</include> - <include>*:jbossws-common:jar</include> - <include>*:jbossws-framework:jar</include> - <include>*:jbossws-spi:jar</include> - <include>*:jbossws-jboss42:jar</include> - <include>*:neethi:jar</include> - <include>*:saaj-api:jar</include> - <include>*:saaj-impl:jar</include> - <include>*:spring-beans:jar</include> - <include>*:spring-context:jar</include> - <include>*:spring-core:jar</include> - <include>*:stax-api:jar</include> - <include>*:wsdl4j:jar</include> - <include>*:xml-resolver:jar</include> - <include>*:XmlSchema:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputFileNameMapping>wstx.jar</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:wstx-asl:jar</include> - </includes> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> - <moduleSet> - <includes> - <include>org.jboss.ws:jbossws-cxf-management</include> - </includes> - <binaries> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <includeDependencies>false</includeDependencies> - <unpack>false</unpack> - </binaries> - </moduleSet> - </moduleSets> - -  - <fileSets> - <fileSet> - <directory>modules/server/target/resources</directory> - <outputDirectory>resources</outputDirectory> - <includes> - <include>jbossws-beans42/**</include> - <include>jbossws-cxf.sar/**</include> - <include>jbossws-jboss42.sar/**</include> - </includes> - </fileSet> - </fileSets> - -</assembly> \ No newline at end of file Copied: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml (from rev 6638, stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml) =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml (rev 0) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-23 20:09:00 UTC (rev 6640) @@ -0,0 +1,98 @@ +<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>deploy-artifacts</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + +  + <dependencySets> + <dependencySet> + <outputDirectory>bin</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <unpack>true</unpack> + <includes> + <include>*:jbossws-framework:zip:scripts</include> + </includes> + </dependencySet> + </dependencySets> + +  + <moduleSets> + <moduleSet> + <includes> + <include>org.jboss.ws:jbossws-cxf-client</include> + <include>org.jboss.ws:jbossws-cxf-server</include> + </includes> + <binaries> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:cxf-*</include> + <include>*:geronimo-javamail*</include> + <include>*:geronimo-ws-metadata*</include> + <include>*:jaxb-api:jar</include> + <include>*:jaxb-impl:jar</include> + <include>*:jaxb-xjc:jar</include> + <include>*:jaxrpc-api:jar</include> + <include>*:jaxws-api:jar</include> + <include>*:jbossws-common:jar</include> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-spi:jar</include> + <include>*:jbossws-jboss42:jar</include> + <include>*:neethi:jar</include> + <include>*:saaj-api:jar</include> + <include>*:saaj-impl:jar</include> + <include>*:spring-beans:jar</include> + <include>*:spring-context:jar</include> + <include>*:spring-core:jar</include> + <include>*:stax-api:jar</include> + <include>*:wsdl4j:jar</include> + <include>*:xml-resolver:jar</include> + <include>*:XmlSchema:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputFileNameMapping>wstx.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:wstx-asl:jar</include> + </includes> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + <moduleSet> + <includes> + <include>org.jboss.ws:jbossws-cxf-management</include> + </includes> + <binaries> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <includeDependencies>false</includeDependencies> + <unpack>false</unpack> + </binaries> + </moduleSet> + </moduleSets> + +  + <fileSets> + <fileSet> + <directory>modules/server/target/resources</directory> + <outputDirectory>resources</outputDirectory> + <includes> + <include>jbossws-beans42/**</include> + <include>jbossws-cxf.sar/**</include> + <include>jbossws-jboss42.sar/**</include> + </includes> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file Deleted: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2008-04-23 20:01:36 UTC (rev 6639) +++ stack/cxf/trunk/version.properties 2008-04-23 20:09:00 UTC (rev 6640) @@ -1,55 +0,0 @@ - -# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ - -specification.title=JBossWS -specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-3.0 - -version.id=cxf-3.0.2.DEV -repository.id=snapshot - -implementation.title=JBoss Web Services - Apache CXF -implementation.url=http://www.jboss.org/products/jbossws -implementation.vendor=JBoss Inc. -implementation.vendor.id=http://www.jboss.org - -# Apache CXF version -cxf.svn.url=http://svn.apache.org/repos/asf/incubator/cxf/tags/cxf-2.0.5-incubator -cxf.svn.rev=HEAD - -# Apache CXF versions -cxf.version=2.0.5-incubator -cxf.geronimo.javamail=1.4_spec-1.2 -cxf.geronimo.ws.metadata=2.0_spec-1.1.2 -cxf.jaxws.api=2.0 -cxf.jetty=6.1.8 -cxf.jdom=1.0 -cxf.neethi=2.0.2 -cxf.saaj=1.3 -cxf.spring=2.0.8 -cxf.xbean=2.2.0 -cxf.xml.resolver=1.2 -cxf.xmlschema=1.3.2 - -# Dependend integration projects -jbossws-spi=3.0.0-SNAPSHOT -jbossws-common=3.0.0-SNAPSHOT -jbossws-framework=3.0.2-SNAPSHOT - -jbossws-jboss422=4.2.2.DEV -jbossws-jboss423=4.2.3.DEV -jbossws-jboss501=5.0.1.DEV - -apache-xml-commons=1.2 -ibm-wsdl4j=1.6.2 -jboss-common-core=2.0.2.GA -jboss-common-logging-spi=2.0.2.GA -jboss-javaee=5.0.0.Beta3Update1 -jboss-jaxr=1.2.0.GA -jboss-security-spi=2.0.0.Beta -stax-api=1.0.1 -sun-jaf=1.1 -sun-jaxb=2.1.6 -sun-jaxrpc=1.1 -sun-servlet=2.5 -woodstox=3.2.4

18 years

1
0
0 / 0

JBossWS SVN: r6639 - in stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test: java/org/jboss/test/ws/jaxws/samples/wsa and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-23 16:01:36 -0400 (Wed, 23 Apr 2008) New Revision: 6639 Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml Log: Add samples wsa Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java 2008-04-23 20:01:36 UTC (rev 6639) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.samples.wsa; + +import java.io.File; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import junit.framework.Test; +import org.apache.cxf.Bus; +import org.apache.cxf.bus.spring.SpringBusFactory; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Client invoking web service using WS-Addressing + * + * @author richard.opalka(a)jboss.com + */ +public final class AddressingTestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsa/AddressingService"; + private ServiceIface proxy; + private Bus bus; + + public static Test suite() + { + return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-samples-wsa.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + SpringBusFactory busFactory = new SpringBusFactory(); + URL cxfConfig = new File("test-resources/jaxws/samples/wsa/cxf-client-config.xml").toURL(); + bus = busFactory.createBus(cxfConfig); + busFactory.setDefaultBus(bus); + + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsaddressing", "AddressingService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + proxy = (ServiceIface)service.getPort(ServiceIface.class); + } + + @Override + protected void tearDown() throws Exception + { + bus.shutdown(true); + + super.tearDown(); + } + + public void test() throws Exception + { + assertEquals("Hello World!", proxy.sayHello()); + } + +} Property changes on: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/AddressingTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java 2008-04-23 20:01:36 UTC (rev 6639) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.samples.wsa; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService +( + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing" +) +public interface ServiceIface +{ + @WebMethod + String sayHello(); +} Property changes on: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceIface.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java 2008-04-23 20:01:36 UTC (rev 6639) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.samples.wsa; + +import javax.jws.WebService; + +@WebService +( + portName = "AddressingServicePort", + serviceName = "AddressingService", + wsdlLocation = "WEB-INF/wsdl/AddressingService.wsdl", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing", + endpointInterface = "org.jboss.test.ws.jaxws.samples.wsa.ServiceIface" +) +public class ServiceImpl implements ServiceIface +{ + public String sayHello() + { + return "Hello World!"; + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java 2008-04-23 20:01:36 UTC (rev 6639) @@ -0,0 +1,24 @@ + +package org.jboss.test.ws.jaxws.samples.wsa.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +/** + * This class was generated by the CXF 2.0.5-incubator + * Mon Apr 21 16:36:02 CEST 2008 + * Generated source version: 2.0.5-incubator + * + */ + +@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") + +public class SayHello { + + +} + Property changes on: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHello.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java 2008-04-23 20:01:36 UTC (rev 6639) @@ -0,0 +1,35 @@ + +package org.jboss.test.ws.jaxws.samples.wsa.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +/** + * This class was generated by the CXF 2.0.5-incubator + * Mon Apr 21 16:36:02 CEST 2008 + * Generated source version: 2.0.5-incubator + * + */ + +@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing") + +public class SayHelloResponse { + + @XmlElement(name = "return") + private java.lang.String _return; + + public java.lang.String get_return() { + return this._return; + } + + public void set_return( java.lang.String new_return ) { + this._return = new_return; + } + +} + Property changes on: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/jaxws/SayHelloResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml 2008-04-23 20:01:36 UTC (rev 6639) @@ -0,0 +1,23 @@ +<beans + xmlns='http://www.springframework.org/schema/beans' + xmlns:jaxws='http://cxf.apache.org/jaxws' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xmlns:wsa="http://cxf.apache.org/ws/addressing" + xsi:schemaLocation=' + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd + '> + + <jaxws:endpoint + id='ServiceImpl' + address='http://@jboss.bind.address@:8080/jaxws-samples-wsa' + implementor='org.jboss.test.ws.jaxws.samples.wsa.ServiceImpl'> + <jaxws:invoker> + <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/> + </jaxws:invoker> + <jaxws:features> + <wsa:addressing usingAddressingAdvisory="false" allowDuplicates="false"/> + </jaxws:features> + </jaxws:endpoint> + +</beans> Property changes on: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/jbossws-cxf.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml 2008-04-23 20:01:36 UTC (rev 6639) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app + version="2.5" 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 http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <servlet> + <servlet-name>AddressingService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.wsa.ServiceImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>AddressingService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Property changes on: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl 2008-04-23 20:01:36 UTC (rev 6639) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="AddressingService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + <wsdl:types> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing"> +<xsd:element name="sayHello" type="tns:sayHello"/> +<xsd:complexType name="sayHello"> +<xsd:sequence/> +</xsd:complexType> +<xsd:element name="sayHelloResponse" type="tns:sayHelloResponse"/> +<xsd:complexType name="sayHelloResponse"> +<xsd:sequence> +<xsd:element minOccurs="0" name="return" type="xsd:string"/> +</xsd:sequence> +</xsd:complexType> +</xsd:schema> + </wsdl:types> + <wsdl:message name="sayHelloResponse"> + <wsdl:part name="parameters" element="tns:sayHelloResponse"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="sayHello"> + <wsdl:part name="parameters" element="tns:sayHello"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="ServiceIface"> + <wsdl:operation name="sayHello"> + <wsdl:input name="sayHello" message="tns:sayHello"> + </wsdl:input> + <wsdl:output name="sayHelloResponse" message="tns:sayHelloResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="AddressingServiceSoapBinding" type="tns:ServiceIface"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="sayHello"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="sayHello"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="sayHelloResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="AddressingService"> + <wsdl:port name="AddressingServicePort" binding="tns:AddressingServiceSoapBinding"> + <soap:address location="http://localhost:9090/hello"/> + <UsingAddressing xmlns="http://www.w3.org/2006/05/addressing/wsdl"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Property changes on: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/WEB-INF/wsdl/AddressingService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml 2008-04-23 20:01:36 UTC (rev 6639) @@ -0,0 +1,18 @@ +<beans + xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:cxf="http://cxf.apache.org/core" + xmlns:wsa="http://cxf.apache.org/ws/addressing" + xsi:schemaLocation=" + http://cxf.apache.org/core + http://cxf.apache.org/schemas/core.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <cxf:bus> + <cxf:features> + <wsa:addressing/> + </cxf:features> + </cxf:bus> + +</beans> Property changes on: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsa/cxf-client-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years

1
0
0 / 0

JBossWS SVN: r6638 - in stack/cxf/branches/tdiesler/trunk: modules/testsuite and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-23 15:39:06 -0400 (Wed, 23 Apr 2008) New Revision: 6638 Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml stack/cxf/branches/tdiesler/trunk/src/main/distro/JBossORG-EULA.txt Removed: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml stack/cxf/branches/tdiesler/trunk/src/main/etc/ stack/cxf/branches/tdiesler/trunk/version.properties Modified: stack/cxf/branches/tdiesler/trunk/build.xml stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml stack/cxf/branches/tdiesler/trunk/pom.xml stack/cxf/branches/tdiesler/trunk/profiles-example.xml stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml Log: bin-dist ok Modified: stack/cxf/branches/tdiesler/trunk/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -11,7 +11,7 @@  -<project default="main" basedir="." name="JBossWS-CXF"> +<project basedir="." name="JBossWS-CXF">  <available property="ant.properties.available" file="${basedir}/ant.properties"/> @@ -24,13 +24,12 @@ <property name="cxf.dir" value="${basedir}"/> <property name="cxf.distro.dir" value="${cxf.dir}/src/main/distro"/> + <property name="cxf.output.dir" value="${cxf.dir}/target"/> <property name="cxf.modules.dir" value="${cxf.dir}/modules"/> <property name="cxf.management.dir" value="${cxf.modules.dir}/management"/> <property name="cxf.client.dir" value="${cxf.modules.dir}/client"/> <property name="cxf.server.dir" value="${cxf.modules.dir}/server"/> - <property name="cxf.output.dir" value="${cxf.dir}/target"/> - <property name="deploy.artifacts.dir" value="${cxf.output.dir}/deploy-artifacts"/> <property name="deploy.structure.jboss42" value="${cxf.output.dir}/deploy-jboss422"/> <property name="deploy.structure.jboss50" value="${cxf.output.dir}/deploy-jboss500"/> @@ -52,29 +51,19 @@ </target>  -  +   -  - - <target name="compile" depends="init" description="Compile all source files."/> - -  -  -  - -  - <target name="jars" depends="compile" description="Builds all jar files."> + <target name="build-bin-dist" depends="prepare" description="Build the binary distribution"> + + <echo message="*************************************"/> + <echo message="* mvn -P bindist assembly:directory *"/> + <echo message="*************************************"/> + + <delete dir="${cxf.output.dir}/jbossws-cxf-dist"/> <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="package"/> + <arg value="-P bindist"/> + <arg value="assembly:directory"/> </exec> </target> @@ -83,6 +72,11 @@  <target name="prepare-deploy" depends="prepare"> + + <echo message="*************************************************"/> + <echo message="* mvn -Denv=${jbossws.integration.target} package assembly:directory *"/> + <echo message="*************************************************"/> + <delete dir="${deploy.artifacts.dir}"/> <exec dir="${basedir}" executable="mvn" failonerror="true"> <arg value="-Denv=${jbossws.integration.target}"/> @@ -92,15 +86,14 @@ </target> <target name="clean" depends="prepare" description="Cleans up most generated files."> + + <echo message="*************************************"/> + <echo message="* mvn clean *"/> + <echo message="*************************************"/> + <exec dir="${basedir}" executable="mvn" failonerror="true"> <arg value="clean"/> </exec> </target> - <target name="main" description="Executes the default target (most)." depends="most"/> - - <target name="most" description="Builds almost everything." depends="jars"/> - - <target name="all" description="Create a distribution zip file" depends="most"/> - </project> Deleted: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project> - - <description>JBossWS test archive builder</description> - -  -  -  -  -  -  -  - - <target name="build-jars-jaxws" description="Build the deployments."> - - <mkdir dir="${tests.output.dir}/test-libs"/> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - -  - - </target> - -</project> Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + + <description>JBossWS test archive builder</description> + +  +  +  +  +  +  +  + + <target name="build-jars-jaxws" description="Build the deployments."> + + <mkdir dir="${tests.output.dir}/test-libs"/> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + +  + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + +  + + </target> + +</project> Deleted: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - -<project> - -  -  -  - - <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> - - <mkdir dir="${tests.output.dir}/test-libs"/> - -  - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" - prefix="WEB-INF/wsdl"/> - </war> - -  - - </target> - -</project> Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + +  +  +  + + <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> + + <mkdir dir="${tests.output.dir}/test-libs"/> + +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + +  + + </target> + +</project> Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -22,7 +22,7 @@  <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <param name="File" value="${jbossws.test.log}/test.log"/> + <param name="File" value="${build.testlog}/test.log"/> <param name="Append" value="true"/>  Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -119,15 +119,15 @@ </property> <property> <name>jboss.home</name> - <value>${jboss422.home}</value> + <value>${jboss.home}</value> </property> <property> <name>jbossws.integration.target</name> <value>${jbossws.integration.target}</value> </property> <property> - <name>jbossws.test.log</name> - <value>${project.build.directory}</value> + <name>build.testlog</name> + <value>${project.build.directory}/test-log</value> </property> <property> <name>test.archive.directory</name> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -21,7 +21,6 @@ <module>modules/management</module> <module>modules/server</module> <module>modules/client</module> -  </modules>  @@ -214,6 +213,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> + <id>validate-jboss-home</id> <phase>validate</phase> <goals> <goal>run</goal> @@ -236,29 +236,67 @@ <finalName>deploy-artifacts</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> +  <descriptors> <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor> </descriptors> </configuration> </plugin> -  </plugins> </build>  <profiles> +  <profile> + <id>alltests</id> + <modules> + <module>modules/testsuite</module> + </modules> + </profile> + +  + <profile> + <id>bindist</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>jbossws-cxf-dist</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/main/scripts/assembly-bin-dist.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> <id>jboss422-user-profile</id> <activation> <property> Modified: stack/cxf/branches/tdiesler/trunk/profiles-example.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -4,7 +4,7 @@  <profile> - <id>user-profile-jboss</id> + <id>jboss-home-profile</id> <activation> <activeByDefault>true</activeByDefault> </activation> Copied: stack/cxf/branches/tdiesler/trunk/src/main/distro/JBossORG-EULA.txt (from rev 6632, stack/cxf/branches/tdiesler/trunk/src/main/etc/JBossORG-EULA.txt) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/JBossORG-EULA.txt (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/JBossORG-EULA.txt 2008-04-23 19:39:06 UTC (rev 6638) @@ -0,0 +1,107 @@ +LICENSE AGREEMENT +JBOSS(r) + +This License Agreement governs the use of the Software Packages and any updates to the Software +Packages, regardless of the delivery mechanism. Each Software Package is a collective work +under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to +the user ("Client") a license to the applicable collective work(s) pursuant to the +GNU Lesser General Public License v. 2.1 except for the following Software Packages: +(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the +GNU General Public License v.2; + +(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0; + +(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the +(open source) Sleepycat License (if Client does not wish to use the open source version of this database, +it may purchase a license from Sleepycat Software); + +and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, +and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various +royalty-free patent licenses. + +Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php. + +1. The Software. "Software Packages" refer to the various software modules that are created and made available +for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages +may be comprised of hundreds of software components. The end user license agreement for each component is located in +the component's source code. With the exception of certain image files identified in Section 2 below, +the license terms for the components permit Client to copy, modify, and redistribute the component, +in both source code and binary code forms. This agreement does not limit Client's rights under, +or grant Client rights that supersede, the license terms of any particular component. + +2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright +and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall +remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the +individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates +in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages +using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's +trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by +these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. +If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at +http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted. +Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages. + +3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular +component, to the maximum extent permitted under applicable law, the Software Packages and the +components are provided and licensed "as is" without warranty of any kind, expressed or implied, +including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. +Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in +materials and manufacture under normal use for a period of 30 days from the date of delivery to Client. +Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements +or that the operation of the Software Packages will be entirely error free or appear precisely as described +in the accompanying documentation. This warranty extends only to the party that purchases the Services +pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. + +4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies +described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's +exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of +delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or +refund the money paid by Client for the Software. To the maximum extent permitted by applicable law, +Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential +damages, including lost profits or lost savings arising out of the use or inability to use the Software, +even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall +Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this +Agreement during the twelve months preceding the action. + +5. Export Control. As required by U.S. law, Client represents and warrants that it: +(a) understands that the Software Packages are subject to export controls under the +U.S. Commerce Department's Export Administration Regulations ("EAR"); + +(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations +(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); + +(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, +or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; + +(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or +biological weapons, or missile technology end-uses unless authorized by the U.S. Government by +regulation or specific license; + +(e) understands and agrees that if it is in the United States and exports or transfers the Software +Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual +reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and +address (including country) of each transferee; + +and (f) understands that countries other than the United States may restrict the import, use, or +export of encryption products and that it shall be solely responsible for compliance with any such +import, use, or export restrictions. + +6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages +that are not part of the Software Packages and which Client must install separately. These third party +programs are subject to their own license terms. The license terms either accompany the programs or +can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable +license terms for such programs, then Client may not install them. If Client wishes to install the programs +on more than one system or transfer the programs to another party, then Client must contact the licensor +of the programs. + +7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the +enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the +State of North Carolina and of the United States, without regard to any conflict of laws provisions, +except that the United Nations Convention on the International Sale of Goods shall not apply. + +Copyright 2006 Red Hat, Inc. All rights reserved. +"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc. +All other trademarks are the property of their respective owners. + + Page 1 of 1 18 October 2006 + Modified: stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -28,13 +28,13 @@ <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> - + <property name="jboss423.lib" value="${jboss423.home}/lib"/> <property name="jboss423.client" value="${jboss423.home}/client"/> <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> - + <property name="jboss500.lib" value="${jboss500.home}/lib"/> <property name="jboss500.client" value="${jboss500.home}/client"/> <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> @@ -59,6 +59,19 @@ <available property="jboss500.available" file="${jboss500.available.file}"/> <available property="jboss501.available" file="${jboss501.available.file}"/> + <condition property="jbossws.integration.jboss42" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> + </or> + </condition> + <condition property="jbossws.integration.jboss50" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </or> + </condition> +    Modified: stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -13,6 +13,11 @@ <project default="main" basedir="." name="JBossWS-CXF"> +  + <available property="ant.properties.available" file="${basedir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + <property file="${basedir}/ant.properties"/> +    @@ -24,125 +29,32 @@ <property name="tests.output.dir" value="${basedir}/output"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss42"/> - <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss50"/> + <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss422"/> + <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss500"/> <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> - <property file="${basedir}/ant.properties"/> - <property file="${basedir}/version.properties"/> + <import file="${build.dir}/build-setup.xml"/> + <import file="${build.dir}/build-deploy.xml"/> + <import file="${build.dir}/jbossws-deploy-macros.xml"/> + <import file="${tests.dir}/ant-import/build-testsuite.xml"/> - <property name="jboss422.lib" value="${jboss422.home}/lib"/> - <property name="jboss422.client" value="${jboss422.home}/client"/> - <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> - <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> - <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> +  + <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> - <property name="jboss423.lib" value="${jboss423.home}/lib"/> - <property name="jboss423.client" value="${jboss423.home}/client"/> - <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> - <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> - <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> - - <property name="jboss500.lib" value="${jboss500.home}/lib"/> - <property name="jboss500.client" value="${jboss500.home}/client"/> - <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> - <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> - <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> - <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - - <property name="jboss501.lib" value="${jboss501.home}/lib"/> - <property name="jboss501.client" value="${jboss501.home}/client"/> - <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> - <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> - <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> - - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> - - <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> - <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> - <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> - - <available property="jboss422.available" file="${jboss422.available.file}"/> - <available property="jboss423.available" file="${jboss423.available.file}"/> - <available property="jboss500.available" file="${jboss500.available.file}"/> - <available property="jboss501.available" file="${jboss501.available.file}"/> - - <condition property="jbossws.integration.jboss42" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </or> - </condition> - <condition property="jbossws.integration.jboss50" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </or> - </condition> - -  - <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - <available classname="java.io.Console" property="HAVE_JDK_1.6"/> - - <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> - - <import file="${basedir}/build/build-deploy.xml"/> - <import file="${basedir}/build/jbossws-deploy-macros.xml"/> - <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> -    - <target name="prepare"> - -  - <condition property="jboss.home" value="${jboss500.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="jboss.home" value="${jboss422.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - <condition property="jboss.home" value="${jboss423.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - -  - <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> - - </target> - <target name="tests-init" depends="prepare,tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> - <pathelement location="${thirdparty.dir}/cxf-${cxf.version}.jar"/> - <pathelement location="${thirdparty.dir}/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <pathelement location="${thirdparty.dir}/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-api-${cxf.jaxws.api}.jar"/> - <pathelement location="${thirdparty.dir}/jdom-${cxf.jdom}.jar"/> - <pathelement location="${thirdparty.dir}/neethi-${cxf.neethi}.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api-${cxf.saaj}.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl-${cxf.saaj}.jar"/> - <pathelement location="${thirdparty.dir}/spring-beans-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/spring-context-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/spring-core-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/wstx-${cxf.wstx}.jar"/> - <pathelement location="${thirdparty.dir}/xml-resolver-${cxf.xml.resolver}.jar"/> - <pathelement location="${thirdparty.dir}/XmlSchema-${cxf.xmlschema}.jar"/> + <fileset dir="${thirdparty.dir}"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${thirdparty.dir}/jbossws-cxf-client.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> </path> + <property name="jbossws.test.log" value="${tests.output.dir}"/> </target>  Modified: stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -12,9 +12,15 @@ <fileSet> <directory>src/main/distro</directory> <outputDirectory>/</outputDirectory> + <includes> + <include>build.xml</include> + </includes> + </fileSet> + <fileSet> + <directory>src/main/distro</directory> + <outputDirectory>/</outputDirectory> <filtered>true</filtered> <includes> - <include>build.xml</include> <include>ant.properties</include> </includes> </fileSet> @@ -25,10 +31,45 @@ <filtered>true</filtered> <includes> <include>build-deploy.xml</include> + <include>build-setup.xml</include> <include>jbossws-default-deploy.conf</include> <include>jbossws-deploy-macros.xml</include> </includes> </fileSet> +  + <fileSet> + <directory>src/main/distro</directory> + <outputDirectory>docs</outputDirectory> + <filtered>true</filtered> + <includes> + <include>Install.txt</include> + <include>ReleaseNotes.txt</include> + <include>JBossORG-EULA.txt</include> + </includes> + </fileSet> +  + <fileSet> + <directory>target/deploy-artifacts</directory> + <outputDirectory>deploy</outputDirectory> + </fileSet> +  + <fileSet> + <directory>modules/testsuite/framework-tests/src/test</directory> + <outputDirectory>tests</outputDirectory> + <includes> + <include>ant-import/**</include> + <include>etc/**</include> + <include>java/org/jboss/test/ws/jaxws/samples/**</include> + <include>resources/jaxws/samples/**</include> + </includes> + </fileSet> + <fileSet> + <directory>modules/testsuite/cxf-tests/src/test/resources</directory> + <outputDirectory>tests/resources</outputDirectory> + <includes> + <include>test-excludes-*.txt</include> + </includes> + </fileSet> </fileSets> </assembly> \ No newline at end of file Deleted: stack/cxf/branches/tdiesler/trunk/version.properties =================================================================== --- stack/cxf/branches/tdiesler/trunk/version.properties 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/version.properties 2008-04-23 19:39:06 UTC (rev 6638) @@ -1,9 +0,0 @@ - -# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ - -# Apache CXF versions -cxf.geronimo.javamail=1.4_spec -cxf.geronimo.ws.metadata=2.0_spec - -# Thirdparty library versions -jbossws-jboss42=4.2.1.GA

18 years

1
0
0 / 0

JBossWS SVN: r6637 - in stack/cxf/branches/tdiesler/trunk: src/main/distro and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-23 12:23:11 -0400 (Wed, 23 Apr 2008) New Revision: 6637 Added: stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml Removed: stack/cxf/branches/tdiesler/trunk/ant-import/ stack/cxf/branches/tdiesler/trunk/build.bat stack/cxf/branches/tdiesler/trunk/build.sh stack/cxf/branches/tdiesler/trunk/tools/ Modified: stack/cxf/branches/tdiesler/trunk/ant.properties.example stack/cxf/branches/tdiesler/trunk/build.xml stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml Log: Cleanup ant stuff Modified: stack/cxf/branches/tdiesler/trunk/ant.properties.example =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant.properties.example 2008-04-23 16:06:36 UTC (rev 6636) +++ stack/cxf/branches/tdiesler/trunk/ant.properties.example 2008-04-23 16:23:11 UTC (rev 6637) @@ -14,31 +14,7 @@ # The JBoss settings jboss.server.instance=default -jboss.bind.address=localhost -# JBoss JMX invoker authentication -#jmx.authentication.username=admin -#jmx.authentication.password=admin - -# JBoss Repository -#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository -jboss.repository=http://repository.jboss.org - # JBossWS Release jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content -jboss.local.repository=/home/tdiesler/svn/jboss.local.repository - -# Force thirdparty HTTP get -#force.thirdparty.get=true - -# JDK settings -#java.home.jdk16=/usr/java/jdk1.6 - -# Endpoint servlet used by test descriptors -endpoint.servlet=org.jboss.wsf.stack.cxf.CXFServletExt - -# Java Compiler options -javac.debug=yes -javac.deprecation=no -javac.fail.onerror=yes -javac.verbose=no +jboss.local.repository=/home/tdiesler/svn/jboss.local.repository \ No newline at end of file Deleted: stack/cxf/branches/tdiesler/trunk/build.bat =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.bat 2008-04-23 16:06:36 UTC (rev 6636) +++ stack/cxf/branches/tdiesler/trunk/build.bat 2008-04-23 16:23:11 UTC (rev 6637) @@ -1,101 +0,0 @@ -@echo off - -REM ====================================================================== -REM -REM This is the main entry point for the build system. -REM -REM Users should be sure to execute this file rather than 'ant' to ensure -REM the correct version is being used with the correct configuration. -REM -REM ====================================================================== -REM -REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $ - -REM ****************************************************** -REM Ignore the ANT_HOME variable: we want to use *our* -REM ANT version and associated JARs. -REM ****************************************************** -REM Ignore the users classpath, cause it might mess -REM things up -REM ****************************************************** - -SETLOCAL - -set NOPAUSE=true -set CLASSPATH= -set ANT_HOME= - -set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat - -REM -REM - "for" loops have been unrolled for compatibility -REM with some WIN32 systems. -REM ****************************************************** - -set NAMES=tools\ant -set SUBFOLDERS=..;..\..;..\..\..;..\..\..\.. - -REM ****************************************************** -REM ********Save the command line arguments*************** -REM ****************************************************** -set BUILD_ARGS=%1 -if ""%1""=="""" goto completedArgs -shift -:processArg -if ""%1""=="""" goto completedArgs -set BUILD_ARGS=%BUILD_ARGS% %1 -shift -goto processArg - -:completedArgs - -REM ****************************************************** -REM ****************************************************** - -SET EXECUTED=FALSE -for %%i in (%NAMES%) do call :subLoop %%i %BUILD_ARGS% - -goto :EOF - -REM ****************************************************** -REM ********* Search for names in the subfolders ********* -REM ****************************************************** - -:subLoop -for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %BUILD_ARGS% - -goto :EOF - -REM ****************************************************** -REM ************ Test if ANT Batch file exists *********** -REM ****************************************************** - -:testIfExists -if exist %1 call :BatchFound %1 %BUILD_ARGS% - -goto :EOF - -REM ****************************************************** -REM ************** Batch file has been found ************* -REM ****************************************************** - -:BatchFound -if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %BUILD_ARGS% -set EXECUTED=TRUE - -goto :EOF - -REM ****************************************************** -REM ************* Execute Batch file only once *********** -REM ****************************************************** - -:ExecuteBatch -echo Calling %1 %BUILD_ARGS% - -REM set ENDORSED= -call %1 %BUILD_ARGS% - -:end - -if "%NOPAUSE%" == "" pause - Deleted: stack/cxf/branches/tdiesler/trunk/build.sh =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.sh 2008-04-23 16:06:36 UTC (rev 6636) +++ stack/cxf/branches/tdiesler/trunk/build.sh 2008-04-23 16:23:11 UTC (rev 6637) @@ -1,169 +0,0 @@ -#!/bin/sh -### ====================================================================== ### -## ## -## This is the main entry point for the build system. ## -## ## -## Users should be sure to execute this file rather than 'ant' to ensure ## -## the correct version is being used with the correct configuration. ## -## ## -## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ## -## ## -### ====================================================================== ### - -# $Id: build.sh 60589 2007-02-16 16:37:13Z jfrederic.clere(a)jboss.com $ - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` -GREP="grep" -ROOT="/" - -# Ignore user's ANT_HOME if it is set -ANT_HOME="" - -# the default search path for ant -ANT_SEARCH_PATH="tools/ant" - -# the default build file name -ANT_BUILD_FILE="build.xml" - -# the default arguments -ANT_OPTIONS="--noconfig -find $ANT_BUILD_FILE" - -# Use the maximum available, or set MAX_FD != -1 to use that -MAX_FD="maximum" - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -darwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; - - Darwin*) - darwin=true - ;; -esac - -# -# Helper to complain. -# -die() { - echo "${PROGNAME}: $*" - exit 1 -} - -# -# Helper to complain. -# -warn() { - echo "${PROGNAME}: $*" -} - -# -# Helper to source a file if it exists. -# -maybe_source() { - for file in $*; do - if [ -f "$file" ]; then - . $file - fi - done -} - -search() { - search="$*" - for d in $search; do - ANT_HOME="`pwd`/$d" - ANT="$ANT_HOME/bin/ant" - if [ -x "$ANT" ]; then - # found one - echo $ANT_HOME - break - fi - done -} - -# -# Main function. -# -main() { - # if there is a build config file. then source it - maybe_source "$DIRNAME/build.conf" - - # Increase the maximum file descriptors if we can - if [ $cygwin = "false" ]; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ]; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then - # use the system max - MAX_FD="$MAX_FD_LIMIT" - fi - - ulimit -n $MAX_FD - if [ $? -ne 0 ]; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" - fi - fi - - # try the search path - ANT_HOME=`search $ANT_SEARCH_PATH` - - # try looking up to root - if [ "x$ANT_HOME" = "x" ]; then - target="build" - _cwd=`pwd` - - while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do - cd .. - cwd=`pwd` - ANT_HOME=`search $ANT_SEARCH_PATH` - done - - # make sure we get back - cd $_cwd - - if [ "$cwd" != "$ROOT" ]; then - found="true" - fi - - # complain if we did not find anything - if [ "$found" != "true" ]; then - die "Could not locate Ant; check \$ANT or \$ANT_HOME." - fi - fi - - # make sure we have one - ANT=$ANT_HOME/bin/ant - if [ ! -x "$ANT" ]; then - die "Ant file is not executable: $ANT" - fi - - # Set the max memory to 256m - ANT_OPTS=-Xmx256m - - # Endorse JAXB, JAXWS API - ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" - - # setup some build properties - ANT_OPTS="$ANT_OPTS -Dbuild.script=$0" - - # change to the directory where the script lives so users are not forced - # to be in the same directory as build.xml - cd $DIRNAME - - # export some stuff for ant - export ANT ANT_HOME ANT_OPTS - - # run ant - $ANT $ANT_OPTIONS "$@" -} - -## -## Bootstrap -## - -main "$@" Modified: stack/cxf/branches/tdiesler/trunk/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 16:06:36 UTC (rev 6636) +++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 16:23:11 UTC (rev 6637) @@ -13,35 +13,34 @@ <project default="main" basedir="." name="JBossWS-CXF"> - <property name="cxf.dir" value="${basedir}"/> +  + <available property="ant.properties.available" file="${basedir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + <property file="${basedir}/ant.properties"/> - <import file="${basedir}/ant-import/build-setup.xml"/> - <import file="${basedir}/ant-import/build-deploy.xml"/> - <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/> -    + <property name="cxf.dir" value="${basedir}"/> + <property name="cxf.distro.dir" value="${cxf.dir}/src/main/distro"/> <property name="cxf.modules.dir" value="${cxf.dir}/modules"/> <property name="cxf.management.dir" value="${cxf.modules.dir}/management"/> <property name="cxf.client.dir" value="${cxf.modules.dir}/client"/> <property name="cxf.server.dir" value="${cxf.modules.dir}/server"/> - <property name="cxf.src.dir" value="${cxf.dir}/src/main"/> - <property name="cxf.etc.dir" value="${cxf.src.dir}/etc"/> - <property name="cxf.distro.dir" value="${cxf.src.dir}/distro"/> - <property name="cxf.java.dir" value="${cxf.src.dir}/java"/> - <property name="cxf.resources.dir" value="${cxf.src.dir}/resources"/> <property name="cxf.output.dir" value="${cxf.dir}/target"/> - <property name="cxf.output.etc.dir" value="${cxf.output.dir}/etc"/> - <property name="cxf.output.resources.dir" value="${cxf.output.dir}/resources"/> <property name="deploy.artifacts.dir" value="${cxf.output.dir}/deploy-artifacts"/> <property name="deploy.structure.jboss42" value="${cxf.output.dir}/deploy-jboss422"/> - <property name="deploy.structure.jboss50" value="${cxf.output.dir}/deploy-jboss50"/> - <property name="jbossws.default.deploy.conf" value="${cxf.dir}/ant-import/jbossws-default-deploy.conf"/> + <property name="deploy.structure.jboss50" value="${cxf.output.dir}/deploy-jboss500"/> + <import file="${cxf.distro.dir}/build-setup.xml"/> + <import file="${cxf.distro.dir}/build-deploy.xml"/> + <import file="${cxf.distro.dir}/jbossws-deploy-macros.xml"/> + + <property name="jbossws.default.deploy.conf" value="${cxf.distro.dir}/jbossws-default-deploy.conf"/> +    Modified: stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml 2008-04-23 16:06:36 UTC (rev 6636) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml 2008-04-23 16:23:11 UTC (rev 6637) @@ -17,13 +17,12 @@   - <target name="deploy-structure-jboss42" depends="prepare"> + <target name="deploy-structure-jboss42" depends="prepare-deploy"> <delete dir="${deploy.structure.jboss42}"/> - <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="-Denv=jboss422"/> - <arg value="package"/> - <arg value="assembly:directory"/> - </exec> + <antcall target="deploy-jbossws-cxf42" inheritall="false"> + <param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/> + <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/> </target> Added: stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml 2008-04-23 16:23:11 UTC (rev 6637) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + +  + <available property="ant.properties.available" file="${basedir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + + <property file="${basedir}/ant.properties"/> + + <property name="jboss422.lib" value="${jboss422.home}/lib"/> + <property name="jboss422.client" value="${jboss422.home}/client"/> + <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> + <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> + <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> + + <property name="jboss423.lib" value="${jboss423.home}/lib"/> + <property name="jboss423.client" value="${jboss423.home}/client"/> + <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> + <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> + <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> + + <property name="jboss500.lib" value="${jboss500.home}/lib"/> + <property name="jboss500.client" value="${jboss500.home}/client"/> + <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> + <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> + <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> + + <property name="jboss501.lib" value="${jboss501.home}/lib"/> + <property name="jboss501.client" value="${jboss501.home}/client"/> + <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> + <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> + <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> + <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> + + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> + <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> + + <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss423.available" file="${jboss423.available.file}"/> + <available property="jboss500.available" file="${jboss500.available.file}"/> + <available property="jboss501.available" file="${jboss501.available.file}"/> + +  +  +  + + <target name="prepare"> + <tstamp> + <format property="build.id" pattern="yyyyMMddHHmm"/> + </tstamp> + </target> + +</project> \ No newline at end of file Property changes on: stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-23 16:06:36 UTC (rev 6636) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-23 16:23:11 UTC (rev 6637) @@ -92,12 +92,12 @@  <macrodef name="macro-deploy-jbossws-bin"> - <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> <attribute name="targetdir"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> + <fileset dir="@{artifactsdir}/bin"> <patternset refid="jbossws.bin.patternset"/> </fileset> </copy> @@ -195,15 +195,13 @@  <macrodef name="macro-deploy-jbossws-cxf42-sar"> - <attribute name="thirdpartydir"/> - <attribute name="resourcesdir"/> + <attribute name="artifactsdir"/> <attribute name="targetdir"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true"> - <fileset dir="@{thirdpartydir}"> + <fileset dir="@{artifactsdir}/lib"> <patternset refid="jbossws.service.lib.patternset"/> - <include name="**/jbossws-deploy.conf"/> <include name="**/jaxb-api.jar"/> <include name="**/jaxb-impl.jar"/> <include name="**/stax-api.jar"/> @@ -211,21 +209,20 @@ </fileset> </copy> <unzip dest="@{targetdir}/jbossws-management.war"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf-management*.war"/> + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-cxf-management.war"/> </fileset> </unzip> - <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf42-beans.xml"/> + <copy todir="@{targetdir}/jbossws.beans"> + <fileset dir="@{artifactsdir}/resources/jbossws-beans42"> + <include name="META-INF/**"/> </fileset> </copy> - <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-cxf42-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/> <copy todir="@{targetdir}/META-INF"> - <fileset dir="@{thirdpartydir}/resources/jbossws-cxf.sar/META-INF"/> + <fileset dir="@{artifactsdir}/resources/jbossws-cxf.sar/META-INF"/> </copy> <copy todir="@{targetdir}/META-INF"> - <fileset dir="@{resourcesdir}/META-INF"/> + <fileset dir="@{artifactsdir}/resources/jbossws-jboss42.sar/META-INF"/> </copy> </sequential> </macrodef> @@ -246,7 +243,7 @@ <include name="**/jbossws-cxf-context*.war"/> </fileset> </unzip> - <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true"> + <copy todir="@{targetdir}/jbossws.beans/META-INF"> <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-cxf50-beans.xml"/> </fileset> @@ -266,11 +263,11 @@ <available classname="java.io.Console" property="HAVE_JDK_1.6"/> <target name="deploy-jbossws-cxf42" depends="deploy-jbossws-endorsed"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}"/> </target> <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed">

18 years

1
0
0 / 0

JBossWS SVN: r6636 - in stack/cxf/branches/tdiesler/trunk: ant-import and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-23 12:06:36 -0400 (Wed, 23 Apr 2008) New Revision: 6636 Added: stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml Removed: stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties.example stack/cxf/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml stack/cxf/branches/tdiesler/trunk/build.xml stack/cxf/branches/tdiesler/trunk/pom.xml stack/cxf/branches/tdiesler/trunk/profiles-example.xml Log: deploy based on deploy-artifacts Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -17,13 +17,12 @@   - <target name="deploy-structure-jboss42" depends="prepare"> + <target name="deploy-structure-jboss42" depends="prepare-deploy"> <delete dir="${deploy.structure.jboss42}"/> - <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="-Denv=jboss422"/> - <arg value="package"/> - <arg value="assembly:directory"/> - </exec> + <antcall target="deploy-jbossws-cxf42" inheritall="false"> + <param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/> + <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/> </target> Modified: stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -92,12 +92,12 @@  <macrodef name="macro-deploy-jbossws-bin"> - <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> <attribute name="targetdir"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> + <fileset dir="@{artifactsdir}/bin"> <patternset refid="jbossws.bin.patternset"/> </fileset> </copy> @@ -195,15 +195,13 @@  <macrodef name="macro-deploy-jbossws-cxf42-sar"> - <attribute name="thirdpartydir"/> - <attribute name="resourcesdir"/> + <attribute name="artifactsdir"/> <attribute name="targetdir"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true"> - <fileset dir="@{thirdpartydir}"> + <fileset dir="@{artifactsdir}/lib"> <patternset refid="jbossws.service.lib.patternset"/> - <include name="**/jbossws-deploy.conf"/> <include name="**/jaxb-api.jar"/> <include name="**/jaxb-impl.jar"/> <include name="**/stax-api.jar"/> @@ -211,21 +209,20 @@ </fileset> </copy> <unzip dest="@{targetdir}/jbossws-management.war"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf-management*.war"/> + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-cxf-management.war"/> </fileset> </unzip> - <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf42-beans.xml"/> + <copy todir="@{targetdir}/jbossws.beans"> + <fileset dir="@{artifactsdir}/resources/jbossws-beans42"> + <include name="META-INF/**"/> </fileset> </copy> - <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-cxf42-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/> <copy todir="@{targetdir}/META-INF"> - <fileset dir="@{thirdpartydir}/resources/jbossws-cxf.sar/META-INF"/> + <fileset dir="@{artifactsdir}/resources/jbossws-cxf.sar/META-INF"/> </copy> <copy todir="@{targetdir}/META-INF"> - <fileset dir="@{resourcesdir}/META-INF"/> + <fileset dir="@{artifactsdir}/resources/jbossws-jboss42.sar/META-INF"/> </copy> </sequential> </macrodef> @@ -246,7 +243,7 @@ <include name="**/jbossws-cxf-context*.war"/> </fileset> </unzip> - <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true"> + <copy todir="@{targetdir}/jbossws.beans/META-INF"> <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-cxf50-beans.xml"/> </fileset> @@ -266,11 +263,11 @@ <available classname="java.io.Console" property="HAVE_JDK_1.6"/> <target name="deploy-jbossws-cxf42" depends="deploy-jbossws-endorsed"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}"/> </target> <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed"> Modified: stack/cxf/branches/tdiesler/trunk/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -16,9 +16,7 @@ <property name="cxf.dir" value="${basedir}"/> <import file="${basedir}/ant-import/build-setup.xml"/> - <import file="${basedir}/ant-import/build-bin-dist.xml"/> <import file="${basedir}/ant-import/build-deploy.xml"/> - <import file="${basedir}/ant-import/build-release.xml"/> <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/>  @@ -30,8 +28,6 @@ <property name="cxf.client.dir" value="${cxf.modules.dir}/client"/> <property name="cxf.server.dir" value="${cxf.modules.dir}/server"/> - <property name="thirdparty.dir" value="${cxf.server.dir}/target/thirdparty"/> - <property name="cxf.src.dir" value="${cxf.dir}/src/main"/> <property name="cxf.etc.dir" value="${cxf.src.dir}/etc"/> <property name="cxf.distro.dir" value="${cxf.src.dir}/distro"/> @@ -41,6 +37,7 @@ <property name="cxf.output.etc.dir" value="${cxf.output.dir}/etc"/> <property name="cxf.output.resources.dir" value="${cxf.output.dir}/resources"/> + <property name="deploy.artifacts.dir" value="${cxf.output.dir}/deploy-artifacts"/> <property name="deploy.structure.jboss42" value="${cxf.output.dir}/deploy-jboss422"/> <property name="deploy.structure.jboss50" value="${cxf.output.dir}/deploy-jboss50"/> <property name="jbossws.default.deploy.conf" value="${cxf.dir}/ant-import/jbossws-default-deploy.conf"/> @@ -77,18 +74,24 @@ | Build all jar files. --> <target name="jars" depends="compile" description="Builds all jar files."> - -  <exec dir="${basedir}" executable="mvn" failonerror="true"> <arg value="package"/> </exec> - </target>    + <target name="prepare-deploy" depends="prepare"> + <delete dir="${deploy.artifacts.dir}"/> + <exec dir="${basedir}" executable="mvn" failonerror="true"> + <arg value="-Denv=${jbossws.integration.target}"/> + <arg value="package"/> + <arg value="assembly:directory"/> + </exec> + </target> + <target name="clean" depends="prepare" description="Cleans up most generated files."> <exec dir="${basedir}" executable="mvn" failonerror="true"> <arg value="clean"/> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -21,6 +21,7 @@ <module>modules/management</module> <module>modules/server</module> <module>modules/client</module> +  </modules>  @@ -32,11 +33,11 @@ <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> <jbossws.jboss42.version>4.2.2-SNAPSHOT</jbossws.jboss42.version> <jboss.common.version>1.2.1.GA</jboss.common.version> - <juddi.service.version>1.2.0.GA</juddi.service.version> <jaxb.api.version>2.1</jaxb.api.version> <jaxb.impl.version>2.1.6</jaxb.impl.version> <jaxrpc.api.version>1.1</jaxrpc.api.version> <jaxws.api.version>2.0</jaxws.api.version> + <juddi.service.version>1.2.0.GA</juddi.service.version> <saaj.api.version>1.3</saaj.api.version> </properties> @@ -210,19 +211,68 @@ <build> <plugins> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <echo/> + <echo message="jboss.home=${jboss.home}"/> + <echo/> + <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/> + <fail message="Invalid integration target: ${jboss.home}" unless="jboss.available"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> - <finalName>deploy-jboss422</finalName> + <finalName>deploy-artifacts</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>src/main/scripts/assembly-install-jboss422.xml</descriptor> + <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor> </descriptors> </configuration> </plugin> +  </plugins> </build> +  + <profiles> + <profile> + <id>jboss422-user-profile</id> + <activation> + <property> + <name>env</name> + <value>jboss422</value> + </property> + </activation> + <properties> + <jbossws.integration.target>jboss422</jbossws.integration.target> + <jboss.home>${jboss422.home}</jboss.home> + </properties> + </profile> + </profiles> +  <repositories> <repository> Modified: stack/cxf/branches/tdiesler/trunk/profiles-example.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -2,17 +2,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd"> <profiles> -  - <profile> - <id>user-profile-cxf</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <jbossws.integration.target>jboss422</jbossws.integration.target> - </properties> - </profile> -  <profile> <id>user-profile-jboss</id> Copied: stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties (from rev 6632, stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties.example) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties 2008-04-23 16:06:36 UTC (rev 6636) @@ -0,0 +1,31 @@ +# +# A sample ant properties file +# +# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ + +# Optional JBoss Home +jboss422.home=(a)jboss422.home@ +jboss423.home=(a)jboss423.home@ +jboss500.home=(a)jboss500.home@ +jboss501.home=(a)jboss501.home@ + +# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501] +jbossws.integration.target=(a)jbossws.integration.target@ + +# The JBoss settings +jboss.server.instance=default +jboss.bind.address=localhost + +# JBoss Repository +#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository +jboss.repository=http://repository.jboss.org + +# JBoss JMX invoker authentication +#jmx.authentication.username=admin +#jmx.authentication.password=admin + +# Java Compiler options +javac.debug=yes +javac.deprecation=no +javac.fail.onerror=yes +javac.verbose=no Deleted: stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties.example 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/ant.properties.example 2008-04-23 16:06:36 UTC (rev 6636) @@ -1,31 +0,0 @@ -# -# A sample ant properties file -# -# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ - -# Optional JBoss Home -jboss422.home=(a)jboss422.home@ -jboss423.home=(a)jboss423.home@ -jboss500.home=(a)jboss500.home@ -jboss501.home=(a)jboss501.home@ - -# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501] -jbossws.integration.target=(a)jbossws.integration.target@ - -# The JBoss settings -jboss.server.instance=default -jboss.bind.address=localhost - -# JBoss Repository -#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository -jboss.repository=http://repository.jboss.org - -# JBoss JMX invoker authentication -#jmx.authentication.username=admin -#jmx.authentication.password=admin - -# Java Compiler options -javac.debug=yes -javac.deprecation=no -javac.fail.onerror=yes -javac.verbose=no Deleted: stack/cxf/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -1,189 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project default="main" basedir="." name="JBossWS-CXF"> - -  -  -  - - <property name="build.dir" value="${basedir}/build"/> - <property name="docs.dir" value="${basedir}/docs"/> - <property name="thirdparty.dir" value="${basedir}/deploy/lib"/> - <property name="tests.dir" value="${basedir}/tests"/> - <property name="tests.output.dir" value="${basedir}/output"/> - - <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss42"/> - <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss50"/> - <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> - - <property file="${basedir}/ant.properties"/> - <property file="${basedir}/version.properties"/> - - <property name="jboss422.lib" value="${jboss422.home}/lib"/> - <property name="jboss422.client" value="${jboss422.home}/client"/> - <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> - <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> - <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> - - <property name="jboss423.lib" value="${jboss423.home}/lib"/> - <property name="jboss423.client" value="${jboss423.home}/client"/> - <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> - <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> - <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> - - <property name="jboss500.lib" value="${jboss500.home}/lib"/> - <property name="jboss500.client" value="${jboss500.home}/client"/> - <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> - <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> - <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> - <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - - <property name="jboss501.lib" value="${jboss501.home}/lib"/> - <property name="jboss501.client" value="${jboss501.home}/client"/> - <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> - <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> - <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> - - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> - - <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> - <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> - <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> - - <available property="jboss422.available" file="${jboss422.available.file}"/> - <available property="jboss423.available" file="${jboss423.available.file}"/> - <available property="jboss500.available" file="${jboss500.available.file}"/> - <available property="jboss501.available" file="${jboss501.available.file}"/> - - <condition property="jbossws.integration.jboss42" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </or> - </condition> - <condition property="jbossws.integration.jboss50" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </or> - </condition> - -  - <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - <available classname="java.io.Console" property="HAVE_JDK_1.6"/> - - <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> - - <import file="${basedir}/build/build-deploy.xml"/> - <import file="${basedir}/build/jbossws-deploy-macros.xml"/> - <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> - -  -  -  - - <target name="prepare"> - -  - <condition property="jboss.home" value="${jboss500.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="jboss.home" value="${jboss422.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - <condition property="jboss.home" value="${jboss423.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - -  - <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> - - </target> - - <target name="tests-init" depends="prepare,tests-classpath"> - - <path id="ws.stack.classpath"> - <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> - <pathelement location="${thirdparty.dir}/cxf-${cxf.version}.jar"/> - <pathelement location="${thirdparty.dir}/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <pathelement location="${thirdparty.dir}/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-api-${cxf.jaxws.api}.jar"/> - <pathelement location="${thirdparty.dir}/jdom-${cxf.jdom}.jar"/> - <pathelement location="${thirdparty.dir}/neethi-${cxf.neethi}.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api-${cxf.saaj}.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl-${cxf.saaj}.jar"/> - <pathelement location="${thirdparty.dir}/spring-beans-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/spring-context-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/spring-core-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/wstx-${cxf.wstx}.jar"/> - <pathelement location="${thirdparty.dir}/xml-resolver-${cxf.xml.resolver}.jar"/> - <pathelement location="${thirdparty.dir}/XmlSchema-${cxf.xmlschema}.jar"/> - </path> - - <path id="tests.extra.classpath"> - <pathelement location="${thirdparty.dir}/jbossws-cxf-client.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> - </path> - - </target> - -  -  -  - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> - </target> - -  -  -  - -  - <target name="tests-copy-resources" depends="tests-init"> - <macro-copy-resources srcdir="${tests.dir}"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources"> - <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> - -  - <target name="prepare-deploy" depends="prepare"/> - -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${tests.output.dir}"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - </target> - - <target name="main" depends="most" description="Executes the default target (most)."/> - - <target name="most" depends="tests-main" description="Builds almost everything."/> - -</project> \ No newline at end of file Copied: stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml (from rev 6632, stack/cxf/branches/tdiesler/trunk/ant-import/build-deploy.xml) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <target name="deploy-structure-jboss42" depends="prepare"> + <delete dir="${deploy.structure.jboss42}"/> + <exec dir="${basedir}" executable="mvn" failonerror="true"> + <arg value="-Denv=jboss422"/> + <arg value="package"/> + <arg value="assembly:directory"/> + </exec> + <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/> + </target> + +  +  +  + + <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422"> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <copy todir="${jboss422.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss42}"/> + </copy> + <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422"> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + +  +  +  + + <target name="deploy-jboss423" depends="undeploy-jboss423" description="Deploy jbossws to jboss423"> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <copy todir="${jboss423.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss42}"/> + </copy> + <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423"> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + +  +  +  + + <target name="deploy-jboss500" depends="undeploy-jboss500" description="Deploy jbossws to jboss500"> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <copy todir="${jboss500.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss50}"/> + </copy> + <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500"> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + +  +  +  + + <target name="deploy-jboss501" depends="undeploy-jboss501" description="Deploy jbossws to jboss501"> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <copy todir="${jboss501.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss50}"/> + </copy> + <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + </target> + +  +  +  + + <macrodef name="macro-create-deploy-conf"> + <attribute name="deploystructure"/> + <sequential> + <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/> + <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> + <property name="jbossws.sar.dir" value="@{deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> + <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/> + </sequential> + </macrodef> + +</project> Copied: stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml (from rev 6632, stack/cxf/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -0,0 +1,189 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main" basedir="." name="JBossWS-CXF"> + +  +  +  + + <property name="build.dir" value="${basedir}/build"/> + <property name="docs.dir" value="${basedir}/docs"/> + <property name="thirdparty.dir" value="${basedir}/deploy/lib"/> + <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${basedir}/output"/> + + <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> + <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss42"/> + <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss50"/> + <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + + <property name="jboss422.lib" value="${jboss422.home}/lib"/> + <property name="jboss422.client" value="${jboss422.home}/client"/> + <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> + <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> + <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> + + <property name="jboss423.lib" value="${jboss423.home}/lib"/> + <property name="jboss423.client" value="${jboss423.home}/client"/> + <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> + <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> + <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> + + <property name="jboss500.lib" value="${jboss500.home}/lib"/> + <property name="jboss500.client" value="${jboss500.home}/client"/> + <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> + <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> + <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> + + <property name="jboss501.lib" value="${jboss501.home}/lib"/> + <property name="jboss501.client" value="${jboss501.home}/client"/> + <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> + <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> + <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> + <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> + + <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> + <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> + <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> + + <available property="jboss422.available" file="${jboss422.available.file}"/> + <available property="jboss423.available" file="${jboss423.available.file}"/> + <available property="jboss500.available" file="${jboss500.available.file}"/> + <available property="jboss501.available" file="${jboss501.available.file}"/> + + <condition property="jbossws.integration.jboss42" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> + </or> + </condition> + <condition property="jbossws.integration.jboss50" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </or> + </condition> + +  + <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> + + <import file="${basedir}/build/build-deploy.xml"/> + <import file="${basedir}/build/jbossws-deploy-macros.xml"/> + <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> + +  +  +  + + <target name="prepare"> + +  + <condition property="jboss.home" value="${jboss500.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss422.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + <condition property="jboss.home" value="${jboss423.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + +  + <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> + + <path id="ws.stack.classpath"> + <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/cxf-${cxf.version}.jar"/> + <pathelement location="${thirdparty.dir}/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> + <pathelement location="${thirdparty.dir}/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api-${cxf.jaxws.api}.jar"/> + <pathelement location="${thirdparty.dir}/jdom-${cxf.jdom}.jar"/> + <pathelement location="${thirdparty.dir}/neethi-${cxf.neethi}.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api-${cxf.saaj}.jar"/> + <pathelement location="${thirdparty.dir}/saaj-impl-${cxf.saaj}.jar"/> + <pathelement location="${thirdparty.dir}/spring-beans-${cxf.spring}.jar"/> + <pathelement location="${thirdparty.dir}/spring-context-${cxf.spring}.jar"/> + <pathelement location="${thirdparty.dir}/spring-core-${cxf.spring}.jar"/> + <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${thirdparty.dir}/wstx-${cxf.wstx}.jar"/> + <pathelement location="${thirdparty.dir}/xml-resolver-${cxf.xml.resolver}.jar"/> + <pathelement location="${thirdparty.dir}/XmlSchema-${cxf.xmlschema}.jar"/> + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${thirdparty.dir}/jbossws-cxf-client.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> + </path> + + </target> + +  +  +  + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> + <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> + +  + <target name="prepare-deploy" depends="prepare"/> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${tests.output.dir}"/> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + </target> + + <target name="main" depends="most" description="Executes the default target (most)."/> + + <target name="most" depends="tests-main" description="Builds almost everything."/> + +</project> \ No newline at end of file Copied: stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf (from rev 6632, stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-default-deploy.conf) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf 2008-04-23 16:06:36 UTC (rev 6636) @@ -0,0 +1 @@ +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar \ No newline at end of file Copied: stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml (from rev 6632, stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  + <patternset id="jbossws.bin.patternset"> + <include name="**/wsconsume.bat"/> + <include name="**/wsconsume.sh"/> + <include name="**/wsprovide.bat"/> + <include name="**/wsprovide.sh"/> + </patternset> + + <patternset id="jbossws.client.patternset"> + <include name="**/cxf-*.jar"/> + <include name="**/geronimo-javamail*.jar"/> + <include name="**/geronimo-ws-metadata*.jar"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/jaxb-xjc.jar"/> + <include name="**/jaxws-api.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-cxf-client*.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-spi.jar"/> + <include name="**/jdom.jar"/> + <include name="**/neethi.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/saaj-impl.jar"/> + <include name="**/spring-beans.jar"/> + <include name="**/spring-context.jar"/> + <include name="**/spring-core.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wsdl4j.jar"/> + <include name="**/wstx.jar"/> + <include name="**/xml-resolver.jar"/> + <include name="**/XmlSchema.jar"/> + </patternset> + + <patternset id="jbossws.lib.patternset"> + <include name="**/nothing-to-deploy"/> + </patternset> + + <patternset id="jbossws.lib.endorsed.patternset"> + <include name="**/jaxb-api.jar"/> + </patternset> + + <patternset id="jbossws.server.lib.patternset"> + <include name="**/jaxws-api.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-spi.jar"/> + <include name="**/saaj-api.jar"/> + </patternset> + + <patternset id="jbossws.service.lib.patternset"> + <include name="**/cxf-*.jar"/> + <include name="**/geronimo-javamail*.jar"/> + <include name="**/geronimo-ws-metadata*.jar"/> + <include name="**/jaxrpc-api.jar"/> + <include name="**/jaxws-api.jar"/> + <include name="**/jbossws-cxf-client*.jar"/> + <include name="**/jbossws-cxf-server*.jar"/> + <include name="**/jdom.jar"/> + <include name="**/neethi.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/saaj-impl.jar"/> + <include name="**/spring-beans.jar"/> + <include name="**/spring-context.jar"/> + <include name="**/spring-core.jar"/> + <include name="**/wsdl4j.jar"/> + <include name="**/xml-resolver.jar"/> + <include name="**/XmlSchema.jar"/> + </patternset> + +  +  +  + + <macrodef name="macro-deploy-jbossws-bin"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.bin.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-jbossws-lib42"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-jbossws-lib50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.lib.patternset"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-jbossws-endorsed"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.lib.endorsed.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-jbossws-client"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.client.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-jbossws-server-lib"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.server.lib.patternset"/> + <include name="**/jbossws-jboss42.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-jbossws-cxf42-sar"> + <attribute name="thirdpartydir"/> + <attribute name="resourcesdir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.service.lib.patternset"/> + <include name="**/jbossws-deploy.conf"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> + </fileset> + </copy> + <unzip dest="@{targetdir}/jbossws-management.war"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf-management*.war"/> + </fileset> + </unzip> + <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf42-beans.xml"/> + </fileset> + </copy> + <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-cxf42-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/> + <copy todir="@{targetdir}/META-INF"> + <fileset dir="@{thirdpartydir}/resources/jbossws-cxf.sar/META-INF"/> + </copy> + <copy todir="@{targetdir}/META-INF"> + <fileset dir="@{resourcesdir}/META-INF"/> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-jbossws-cxf50-sar"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.service.lib.patternset"/> + <include name="**/jbossws-deploy.conf"/> + </fileset> + </copy> + <unzip dest="@{targetdir}/jbossws-context.war" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf-context*.war"/> + </fileset> + </unzip> + <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf50-beans.xml"/> + </fileset> + </copy> + <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-cxf50-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/> + <copy todir="@{targetdir}/META-INF"> + <fileset dir="@{thirdpartydir}/resources/jbossws-cxf.sar/META-INF"/> + </copy> + </sequential> + </macrodef> + +  +  +  + +  + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <target name="deploy-jbossws-cxf42" depends="deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/> + </target> + + <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/> + </target> + + <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> + </target> + +  +  +  + + <macrodef name="macro-undeploy-jbossws"> + <attribute name="defaultconf"/> + <attribute name="targetdir"/> + <sequential> + <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/> + <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> + + <property name="jboss.undeploy.home" value="@{targetdir}/../../../.."/> + <available property="jboss.undeploy.client" file="${jboss.undeploy.home}/client"/> + <fail message="Cannot find ${jboss.undeploy.home}/client" unless="jboss.undeploy.client"/> + + <delete> + <fileset dir="${jboss.undeploy.home}" includes="${jbossws.deploy.conf}"/> + </delete> + <delete dir="@{targetdir}"/> + </sequential> + </macrodef> + +</project> \ No newline at end of file Added: stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -0,0 +1,34 @@ +<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>binary-distribution</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> +  + <fileSet> + <directory>src/main/distro</directory> + <outputDirectory>/</outputDirectory> + <filtered>true</filtered> + <includes> + <include>build.xml</include> + <include>ant.properties</include> + </includes> + </fileSet> +  + <fileSet> + <directory>src/main/distro</directory> + <outputDirectory>build</outputDirectory> + <filtered>true</filtered> + <includes> + <include>build-deploy.xml</include> + <include>jbossws-default-deploy.conf</include> + <include>jbossws-deploy-macros.xml</include> + </includes> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file Property changes on: stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml (from rev 6633, stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -0,0 +1,98 @@ +<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>deploy-artifacts</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + +  + <dependencySets> + <dependencySet> + <outputDirectory>bin</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <unpack>true</unpack> + <includes> + <include>*:jbossws-framework:zip:scripts</include> + </includes> + </dependencySet> + </dependencySets> + +  + <moduleSets> + <moduleSet> + <includes> + <include>org.jboss.ws:jbossws-cxf-client</include> + <include>org.jboss.ws:jbossws-cxf-server</include> + </includes> + <binaries> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:cxf-*</include> + <include>*:geronimo-javamail*</include> + <include>*:geronimo-ws-metadata*</include> + <include>*:jaxb-api:jar</include> + <include>*:jaxb-impl:jar</include> + <include>*:jaxb-xjc:jar</include> + <include>*:jaxrpc-api:jar</include> + <include>*:jaxws-api:jar</include> + <include>*:jbossws-common:jar</include> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-spi:jar</include> + <include>*:jbossws-jboss42:jar</include> + <include>*:neethi:jar</include> + <include>*:saaj-api:jar</include> + <include>*:saaj-impl:jar</include> + <include>*:spring-beans:jar</include> + <include>*:spring-context:jar</include> + <include>*:spring-core:jar</include> + <include>*:stax-api:jar</include> + <include>*:wsdl4j:jar</include> + <include>*:xml-resolver:jar</include> + <include>*:XmlSchema:jar</include> + </includes> + </dependencySet> + <dependencySet> + <outputFileNameMapping>wstx.jar</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:wstx-asl:jar</include> + </includes> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + <moduleSet> + <includes> + <include>org.jboss.ws:jbossws-cxf-management</include> + </includes> + <binaries> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <includeDependencies>false</includeDependencies> + <unpack>false</unpack> + </binaries> + </moduleSet> + </moduleSets> + +  + <fileSets> + <fileSet> + <directory>modules/server/target/resources</directory> + <outputDirectory>resources</outputDirectory> + <includes> + <include>jbossws-beans42/**</include> + <include>jbossws-cxf.sar/**</include> + <include>jbossws-jboss42.sar/**</include> + </includes> + </fileSet> + </fileSets> + +</assembly> \ No newline at end of file Deleted: stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml 2008-04-23 15:57:09 UTC (rev 6635) +++ stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-install-jboss422.xml 2008-04-23 16:06:36 UTC (rev 6636) @@ -1,205 +0,0 @@ -<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>deploy-structure-jboss422</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <dependencySets> - -  - <dependencySet> - <outputDirectory>bin</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <unpack>true</unpack> - <includes> - <include>*:jbossws-framework:zip:scripts</include> - </includes> - </dependencySet> - -  -  - </dependencySets> - - <moduleSets> -  - <moduleSet> - <includes> - <include>org.jboss.ws:jbossws-cxf-client</include> - </includes> - <binaries> - <outputDirectory>client</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <unpack>false</unpack> - <dependencySets> - <dependencySet> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:cxf-*</include> - <include>*:geronimo-javamail*</include> - <include>*:geronimo-ws-metadata*</include> - <include>*:jaxb-api:jar</include> - <include>*:jaxb-impl:jar</include> - <include>*:jaxb-xjc:jar</include> - <include>*:jaxws-api:jar</include> - <include>*:jbossws-common:jar</include> - <include>*:jbossws-framework:jar</include> - <include>*:jbossws-spi:jar</include> - <include>*:jbossws-jboss42:jar</include> - <include>*:neethi:jar</include> - <include>*:saaj-api:jar</include> - <include>*:saaj-impl:jar</include> - <include>*:spring-beans:jar</include> - <include>*:spring-context:jar</include> - <include>*:spring-core:jar</include> - <include>*:stax-api:jar</include> - <include>*:wsdl4j:jar</include> - <include>*:xml-resolver:jar</include> - <include>*:XmlSchema:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputFileNameMapping>wstx.jar</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:wstx-asl:jar</include> - </includes> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> - -  - <moduleSet> - <includes> - <include>org.jboss.ws:jbossws-cxf-server</include> - </includes> - <binaries> - <outputDirectory>server/default/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <unpack>false</unpack> - <dependencySets> - <dependencySet> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> -  - <includes> - <include>*:jaxws-api:jar</include> - <include>*:jbossws-common:jar</include> - <include>*:jbossws-framework:jar</include> - <include>*:jbossws-spi:jar</include> - <include>*:jbossws-jboss42:jar</include> - <include>*:saaj-api:jar</include> - </includes> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> - -  - <moduleSet> - <includes> - <include>org.jboss.ws:jbossws-cxf-server</include> - <include>org.jboss.ws:jbossws-cxf-client</include> - </includes> - <binaries> - <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <unpack>false</unpack> - <dependencySets> - <dependencySet> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:cxf-*</include> - <include>*:geronimo-javamail*</include> - <include>*:geronimo-ws-metadata*</include> - <include>*:jaxb-api:jar</include> - <include>*:jaxb-impl:jar</include> - <include>*:jaxrpc-api*</include> - <include>*:jaxws-api*</include> - <include>*:neethi*</include> - <include>*:saaj-api*</include> - <include>*:saaj-impl*</include> - <include>*:spring-beans*</include> - <include>*:spring-context*</include> - <include>*:spring-core*</include> - <include>*:stax-api*</include> - <include>*:wsdl4j*</include> - <include>*:xml-resolver*</include> - <include>*:XmlSchema*</include> - </includes> - </dependencySet> - <dependencySet> - <outputFileNameMapping>wstx.jar</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:wstx-asl:jar</include> - </includes> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> -  - <moduleSet> - <includes> - <include>org.jboss.ws:jbossws-cxf-management</include> - </includes> - <binaries> - <outputDirectory>server/default/deploy/jbossws.sar/jbossws-context.war</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <includeDependencies>false</includeDependencies> - <unpack>true</unpack> - </binaries> - </moduleSet> - </moduleSets> - <fileSets> -  - <fileSet> - <directory>modules/server/target/resources/jbossws-cxf.sar</directory> - <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> - <includes> - <include>META-INF/**</include> - </includes> - </fileSet> - <fileSet> - <directory>modules/server/target/resources/jbossws-jboss42.sar</directory> - <outputDirectory>server/default/deploy/jbossws.sar</outputDirectory> - <includes> - <include>META-INF/**</include> - </includes> - </fileSet> -  - <fileSet> - <directory>modules/server/target/resources/jbossws-beans42</directory> - <outputDirectory>server/default/deploy/jbossws.sar/jbossws.beans</outputDirectory> - <includes> - <include>META-INF/**</include> - </includes> - </fileSet> - </fileSets> - -</assembly> \ No newline at end of file

18 years

1
0
0 / 0

← Newer
1
...
16
17
18
19
20
21
22
...
62
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2008