April 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r6404 - in framework/trunk: framework and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-14 03:51:42 -0400 (Mon, 14 Apr 2008) New Revision: 6404 Added: framework/trunk/framework/ant/ framework/trunk/framework/ant/build-install.xml framework/trunk/hudson/ant.properties.example framework/trunk/hudson/build.xml framework/trunk/testsuite/ framework/trunk/testsuite/test/ Removed: framework/trunk/ant.properties.example framework/trunk/build.xml framework/trunk/externals/ framework/trunk/hudson/build-hudson.xml framework/trunk/testsuite/test/ Modified: framework/trunk/ framework/trunk/framework/pom.xml framework/trunk/hudson/ Log: Remove dependency on ant for install target Property changes on: framework/trunk ___________________________________________________________________ Name: svn:ignore - ant.properties Deleted: framework/trunk/ant.properties.example =================================================================== --- framework/trunk/ant.properties.example 2008-04-14 06:56:25 UTC (rev 6403) +++ framework/trunk/ant.properties.example 2008-04-14 07:51:42 UTC (rev 6404) @@ -1,57 +0,0 @@ -# -# A sample ant properties file -# -# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ - -# JBossWS local repository -jboss.local.repository=/home/tdiesler/svn/jboss.local.repository - -# JBoss remote repository -jboss.repository=http://repository.jboss.org - -# The JBoss settings -jboss.server.instance=default -jboss.bind.address=localhost - -# JDK settings -#java.home.jdk16=/usr/java/jdk1.6 - -# Hudson QA Environment -hudson.username=changeme -hudson.password=changeme - -hudson.root=/usr/share/java/workspace -hudson.host=jbws.dyndns.org -hudson.admin.port=8150 -hudson.http.port=8180 - -hudson.native.url=https://svn.jboss.org/repos/jbossws/stack/native/trunk -hudson.metro.url=https://svn.jboss.org/repos/jbossws/stack/metro/trunk -hudson.cxf.url=https://svn.jboss.org/repos/jbossws/stack/cxf/trunk - -hudson.jboss421.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_1_GA -hudson.jboss421.build=jboss-4.2.1.GA -hudson.jboss421.rev=HEAD - -hudson.jboss422.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_2_GA -hudson.jboss422.build=jboss-4.2.2.GA -hudson.jboss422.rev=HEAD - -hudson.jboss423.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2 -hudson.jboss423.build=jboss-4.2.3.GA -hudson.jboss423.rev=HEAD - -hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_5_0_0_Beta4 -hudson.jboss500.build=jboss-5.0.0.Beta4 -hudson.jboss500.rev=HEAD - -hudson.jboss501.url=https://svn.jboss.org/repos/jbossas/trunk -hudson.jboss501.build=jboss-5.0.0.CR1 -hudson.jboss501.rev=HEAD - -hudson.mail.recipients= -hudson.smtp.host=localhost - -# Hudson setup -apache-tomcat=5.5.20 -sun-hudson=1.160 \ No newline at end of file Deleted: framework/trunk/build.xml =================================================================== --- framework/trunk/build.xml 2008-04-14 06:56:25 UTC (rev 6403) +++ framework/trunk/build.xml 2008-04-14 07:51:42 UTC (rev 6404) @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project name="JBossWS-Framework" default="main" basedir="."> - -  -  -  - - <property name="framework.dir" value="${basedir}/framework"/> - <property name="framework.etc.dir" value="${framework.dir}/src/main/etc"/> - <property name="framework.target.dir" value="${framework.dir}/target"/> - - <import file="${basedir}/hudson/build-hudson.xml"/> - -  -  -  - - <target name="init"> - -  - <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"/> - - <xmlproperty file="${basedir}/pom.xml"/> - <property name="version.id" value="${project.version}"/> - <property name="repository.id" value="${project.version}"/> - - <echo message="version.id=${version.id}"/> - <echo message="repository.id=${repository.id}"/> - </target> - -  -  -  - -  - <target name="install" depends="init" description="Install to jboss.local.repository"> - -  - <available property="jbossws.framework.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}.jar"/> - <fail message="Cannot find jbossws-framework-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.framework.jar.available"/> - -  - <available property="jbossws.framework.sources.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar"/> - <fail message="Cannot find jbossws-framework-${version.id}-sources.jar. Did you run 'mvn source:jar'?" unless="jbossws.framework.sources.jar.available"/> - -  - <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-framework/${repository.id}"/> - <mkdir dir="${jboss.repository.dir}/lib"/> - <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar" tofile="${jboss.repository.dir}//lib/jbossws-framework.jar" overwrite="true"/> - <copy file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-framework-src.jar" overwrite="true"/> - <copy file="${framework.target.dir}/jbossws-framework-${version.id}-scripts.zip" tofile="${jboss.repository.dir}/lib/jbossws-framework-scripts.zip" overwrite="true"/> - <copy file="${framework.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/> - </target> - -  -  -  - - <target name="clean" depends="init" description="Cleans up most generated files."> - <delete dir="${framework.target.dir}"/> - </target> - - <target name="main" description="Executes the default target (install)." depends="install"/> - -</project> Added: framework/trunk/framework/ant/build-install.xml =================================================================== --- framework/trunk/framework/ant/build-install.xml (rev 0) +++ framework/trunk/framework/ant/build-install.xml 2008-04-14 07:51:42 UTC (rev 6404) @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <property name="framework.dir" value="${basedir}"/> + <property name="framework.etc.dir" value="${framework.dir}/src/main/etc"/> + <property name="framework.target.dir" value="${framework.dir}/target"/> + +  +  +  + + <target name="init"> + <echo message="version.id=${version.id}"/> + <echo message="repository.id=${repository.id}"/> + <echo message="jboss.local.repository=${jboss.local.repository}"/> + </target> + +  +  +  + +  + <target name="install" depends="init" description="Install to jboss.local.repository"> + +  + <available property="jbossws.framework.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}.jar"/> + <fail message="Cannot find jbossws-framework-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.framework.jar.available"/> + +  + <available property="jbossws.framework.sources.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar"/> + <fail message="Cannot find jbossws-framework-${version.id}-sources.jar. Did you run 'mvn source:jar'?" unless="jbossws.framework.sources.jar.available"/> + +  + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-framework/${repository.id}"/> + <mkdir dir="${jboss.repository.dir}/lib"/> + <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar" tofile="${jboss.repository.dir}//lib/jbossws-framework.jar" overwrite="true"/> + <copy file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-framework-src.jar" overwrite="true"/> + <copy file="${framework.target.dir}/jbossws-framework-${version.id}-scripts.zip" tofile="${jboss.repository.dir}/lib/jbossws-framework-scripts.zip" overwrite="true"/> + <copy file="${framework.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/> + </target> + +</project> Property changes on: framework/trunk/framework/ant/build-install.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: framework/trunk/framework/pom.xml =================================================================== --- framework/trunk/framework/pom.xml 2008-04-14 06:56:25 UTC (rev 6403) +++ framework/trunk/framework/pom.xml 2008-04-14 07:51:42 UTC (rev 6404) @@ -16,6 +16,7 @@ <properties> <jbossws-common>3.0.0-SNAPSHOT</jbossws-common> <jbossws-spi>3.0.0-SNAPSHOT</jbossws-spi> + <jboss.local.repository>/home/tdiesler/svn/jboss.local.repository</jboss.local.repository> </properties>  @@ -63,6 +64,25 @@ </resources> <plugins> <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks description="Install artifacts to the jboss local repository"> + <property name="version.id" value="${project.version}"/> + <property name="repository.id" value="${project.version}"/> + <property name="jboss.local.repository" value="${jboss.local.repository}"/> + <ant antfile="ant/build-install.xml" target="install"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> @@ -70,13 +90,13 @@ <goals> <goal>single</goal> </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + </configuration> </execution> </executions> - <configuration> - <descriptors> - <descriptor>src/main/assembly/src.xml</descriptor> - </descriptors> - </configuration> </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> Property changes on: framework/trunk/hudson ___________________________________________________________________ Name: svn:ignore + ant.properties target Added: framework/trunk/hudson/ant.properties.example =================================================================== --- framework/trunk/hudson/ant.properties.example (rev 0) +++ framework/trunk/hudson/ant.properties.example 2008-04-14 07:51:42 UTC (rev 6404) @@ -0,0 +1,54 @@ +# +# A sample ant properties file +# +# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ + +# JBoss remote repository +jboss.repository=http://repository.jboss.org + +# The JBoss settings +jboss.server.instance=default +jboss.bind.address=localhost + +# JDK settings +#java.home.jdk16=/usr/java/jdk1.6 + +# Hudson QA Environment +hudson.username=hudson +hudson.password=deadbeefjboss + +hudson.root=/home/tdiesler/workspace +hudson.host=jbws.dyndns.org +hudson.admin.port=8150 +hudson.http.port=8180 + +hudson.native.url=https://svn.jboss.org/repos/jbossws/stack/native/trunk +hudson.metro.url=https://svn.jboss.org/repos/jbossws/stack/metro/trunk +hudson.cxf.url=https://svn.jboss.org/repos/jbossws/stack/cxf/trunk + +hudson.jboss421.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_1_GA +hudson.jboss421.build=jboss-4.2.1.GA +hudson.jboss421.rev=HEAD + +hudson.jboss422.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_2_GA +hudson.jboss422.build=jboss-4.2.2.GA +hudson.jboss422.rev=HEAD + +hudson.jboss423.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2 +hudson.jboss423.build=jboss-4.2.3.GA +hudson.jboss423.rev=HEAD + +hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_5_0_0_Beta4 +hudson.jboss500.build=jboss-5.0.0.Beta4 +hudson.jboss500.rev=HEAD + +hudson.jboss501.url=https://svn.jboss.org/repos/jbossas/trunk +hudson.jboss501.build=jboss-5.0.0.CR1 +hudson.jboss501.rev=HEAD + +hudson.mail.recipients= +hudson.smtp.host=localhost + +# Hudson setup +apache-tomcat=5.5.20 +sun-hudson=1.160 \ No newline at end of file Deleted: framework/trunk/hudson/build-hudson.xml =================================================================== --- framework/trunk/hudson/build-hudson.xml 2008-04-14 06:56:25 UTC (rev 6403) +++ framework/trunk/hudson/build-hudson.xml 2008-04-14 07:51:42 UTC (rev 6404) @@ -1,170 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - - <target name="init-hudson" depends="init"> - - <property name="hudson.tomcat" value="${hudson.root}/jbossws-hudson-${version.id}/apache-tomcat"/> - <property name="hudson.home" value="${hudson.root}/jbossws-hudson-${version.id}/hudson-home"/> - <echo/> - <echo message="hudson.root = ${hudson.root}"/> - <echo message="hudson.home = ${hudson.home}"/> - <echo/> - - <available file="${hudson.root}" property="hudson.root.available"/> - <available file="${hudson.tomcat}" property="hudson.tomcat.available"/> - <fail message="Hudson root not available" unless="hudson.root.available"/> - - <property name="hudson.username.${hudson.username}" value="true"/> - <fail message="Cannot use default hudson username: ${hudson.username}" if="hudson.username.changeme"/> - <property name="hudson.password.${hudson.password}" value="true"/> - <fail message="Cannot use default hudson password: ${hudson.password}" if="hudson.password.changeme"/> - - <property name="thirdparty.dir" value="${framework.target.dir}/thirdparty"/> - <mkdir dir="${thirdparty.dir}"/> - - </target> - -  - <target name="hudson-tomcat-setup" depends="init-hudson" unless="hudson.tomcat.available"> - - <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> - - <mkdir dir="${hudson.root}"/> - <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/> - <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/> - <chmod perm="+x"> - <fileset dir="${hudson.tomcat}/bin"> - <include name="*.sh"/> - </fileset> - </chmod> - -  - <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> - <copy todir="${hudson.tomcat}" overwrite="true"> - <fileset dir="${framework.dir}/hudson/apache-tomcat"> - <include name="**/*.xml"/> - </fileset> - <filterset> - <filtersfile file="${framework.dir}/ant.properties"/> - <filter token="hudson.home" value="${hudson.home}"/> - </filterset> - </copy> - </target> - -  - <target name="hudson-update" depends="init-hudson"> - - <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="false" verbose="true"/> - - <delete dir="${hudson.tomcat}/webapps/hudson"/> - <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> - </target> - -  - <target name="hudson-setup" depends="init-hudson,hudson-tomcat-setup" - description="Setup the Hudson QA environment"> - -  - <exec dir="${framework.dir}" executable="svn" failonerror="true" output="${framework.target.dir}/svn-info.xml"> - <arg line="info"/> - <arg line="--xml"/> - </exec> - <xmlproperty file="${framework.target.dir}/svn-info.xml"/> - <property name="hudson.framework.url" value="${info.entry.url}"/> - -  - <copy todir="${hudson.home}" overwrite="true"> - <fileset dir="${framework.dir}/hudson/hudson-home"> - <include name="jobs/*/config.xml"/> - <include name="users/*/config.xml"/> - <include name="*.xml"/> - </fileset> - <filterset> - <filter token="hudson.framework.url" value="${hudson.framework.url}"/> - <filter token="hudson.home" value="${hudson.home}"/> - <filter token="version.id" value="${version.id}"/> - <filtersfile file="${framework.dir}/ant.properties"/> - </filterset> - </copy> - <chmod perm="g+w"> - <fileset dir="${hudson.home}"> - <include name="jobs/*/config.xml"/> - <include name="users/*/config.xml"/> - <include name="*.xml"/> - </fileset> - </chmod> - - <echo/> - <echo message="*************************************"/> - <echo message="* Hudson setup successfully *"/> - <echo message="* ant hudson-start *"/> - <echo message="*************************************"/> - <echo/> - - </target> - - <target name="hudson-stop" depends="init-hudson" description="Stops the Hudson QA environment"> - - <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true"> - <arg line="stop"/> - </exec> - - <echo/> - <echo message="*************************************"/> - <echo message="* Hudson stopped successfully *"/> - <echo message="* ant hudson-start *"/> - <echo message="*************************************"/> - <echo/> - - </target> - - <target name="hudson-start" depends="init-hudson" description="Start the Hudson QA environment"> - - <property environment="env"/> - <fail message="unset JBOSS_REPOSITORY=${env.JBOSS_REPOSITORY}" if="env.JBOSS_REPOSITORY"/> - -  - - <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${framework.target.dir}/hudson.log"> - <env key="CATALINA_OPTS" value="-Xmx512m -Djava.awt.headless=true"/> - <arg line="start"/> - </exec> - <chmod perm="g+w"> - <fileset dir="${hudson.tomcat}"> - <include name="logs/**"/> - </fileset> - </chmod> - - <echo/> - <echo message="*************************************"/> - <echo message="* Hudson started successfully *"/> - <echo message="* http://localhost:${hudson.http.port}/hudson *"/> - <echo message="*************************************"/> - <echo/> - - </target> - -</project> Copied: framework/trunk/hudson/build.xml (from rev 6402, framework/trunk/hudson/build-hudson.xml) =================================================================== --- framework/trunk/hudson/build.xml (rev 0) +++ framework/trunk/hudson/build.xml 2008-04-14 07:51:42 UTC (rev 6404) @@ -0,0 +1,193 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + + <property name="hudson.dir" value="${basedir}"/> + <property name="hudson.target.dir" value="${hudson.dir}/target"/> + +  +  +  + + <target name="init"> + +  + <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"/> + + <xmlproperty file="${basedir}/../pom.xml"/> + <property name="version.id" value="${project.version}"/> + <property name="repository.id" value="${project.version}"/> + + <echo message="version.id=${version.id}"/> + <echo message="repository.id=${repository.id}"/> + </target> + + <target name="init-hudson" depends="init"> + + <property name="hudson.tomcat" value="${hudson.root}/jbossws-hudson-${version.id}/apache-tomcat"/> + <property name="hudson.home" value="${hudson.root}/jbossws-hudson-${version.id}/hudson-home"/> + <echo/> + <echo message="hudson.root = ${hudson.root}"/> + <echo message="hudson.home = ${hudson.home}"/> + <echo/> + + <available file="${hudson.root}" property="hudson.root.available"/> + <available file="${hudson.tomcat}" property="hudson.tomcat.available"/> + <fail message="Hudson root not available" unless="hudson.root.available"/> + + <property name="hudson.username.${hudson.username}" value="true"/> + <fail message="Cannot use default hudson username: ${hudson.username}" if="hudson.username.changeme"/> + <property name="hudson.password.${hudson.password}" value="true"/> + <fail message="Cannot use default hudson password: ${hudson.password}" if="hudson.password.changeme"/> + + <property name="thirdparty.dir" value="${hudson.target.dir}/thirdparty"/> + <mkdir dir="${thirdparty.dir}"/> + + </target> + +  + <target name="hudson-tomcat-setup" depends="init-hudson" unless="hudson.tomcat.available"> + + <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> + + <mkdir dir="${hudson.root}"/> + <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/> + <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/> + <chmod perm="+x"> + <fileset dir="${hudson.tomcat}/bin"> + <include name="*.sh"/> + </fileset> + </chmod> + +  + <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> + <copy todir="${hudson.tomcat}" overwrite="true"> + <fileset dir="${hudson.dir}/apache-tomcat"> + <include name="**/*.xml"/> + </fileset> + <filterset> + <filtersfile file="${hudson.dir}/ant.properties"/> + <filter token="hudson.home" value="${hudson.home}"/> + </filterset> + </copy> + </target> + +  + <target name="hudson-update" depends="init-hudson"> + + <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="false" verbose="true"/> + + <delete dir="${hudson.tomcat}/webapps/hudson"/> + <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> + </target> + +  + <target name="hudson-setup" depends="init-hudson,hudson-tomcat-setup" + description="Setup the Hudson QA environment"> + +  + <exec dir="${hudson.dir}" executable="svn" failonerror="true" output="${hudson.target.dir}/svn-info.xml"> + <arg line="info"/> + <arg line="--xml"/> + </exec> + <xmlproperty file="${hudson.target.dir}/svn-info.xml"/> + <property name="hudson.framework.url" value="${info.entry.url}"/> + +  + <copy todir="${hudson.home}" overwrite="true"> + <fileset dir="${hudson.dir}/hudson-home"> + <include name="jobs/*/config.xml"/> + <include name="users/*/config.xml"/> + <include name="*.xml"/> + </fileset> + <filterset> + <filter token="hudson.framework.url" value="${hudson.framework.url}"/> + <filter token="hudson.home" value="${hudson.home}"/> + <filter token="version.id" value="${version.id}"/> + <filtersfile file="${hudson.dir}/ant.properties"/> + </filterset> + </copy> + <chmod perm="g+w"> + <fileset dir="${hudson.home}"> + <include name="jobs/*/config.xml"/> + <include name="users/*/config.xml"/> + <include name="*.xml"/> + </fileset> + </chmod> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson setup successfully *"/> + <echo message="* ant hudson-start *"/> + <echo message="*************************************"/> + <echo/> + + </target> + + <target name="hudson-stop" depends="init-hudson" description="Stops the Hudson QA environment"> + + <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true"> + <arg line="stop"/> + </exec> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson stopped successfully *"/> + <echo message="* ant hudson-start *"/> + <echo message="*************************************"/> + <echo/> + + </target> + + <target name="hudson-start" depends="init-hudson" description="Start the Hudson QA environment"> + + <property environment="env"/> + <fail message="unset JBOSS_REPOSITORY=${env.JBOSS_REPOSITORY}" if="env.JBOSS_REPOSITORY"/> + +  + + <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${hudson.target.dir}/hudson.log"> + <env key="CATALINA_OPTS" value="-Xmx512m -Djava.awt.headless=true"/> + <arg line="start"/> + </exec> + <chmod perm="g+w"> + <fileset dir="${hudson.tomcat}"> + <include name="logs/**"/> + </fileset> + </chmod> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson started successfully *"/> + <echo message="* http://localhost:${hudson.http.port}/hudson *"/> + <echo message="*************************************"/> + <echo/> + + </target> + +</project> Copied: framework/trunk/testsuite (from rev 6402, framework/trunk/externals) Copied: framework/trunk/testsuite/test (from rev 6403, framework/trunk/externals/test)

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6403 - framework/trunk/framework.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-14 02:56:25 -0400 (Mon, 14 Apr 2008) New Revision: 6403 Modified: framework/trunk/framework/pom.xml Log: deploy assembly Modified: framework/trunk/framework/pom.xml =================================================================== --- framework/trunk/framework/pom.xml 2008-04-13 20:42:55 UTC (rev 6402) +++ framework/trunk/framework/pom.xml 2008-04-14 06:56:25 UTC (rev 6403) @@ -68,7 +68,7 @@ <execution> <phase>package</phase> <goals> - <goal>assembly</goal> + <goal>single</goal> </goals> </execution> </executions>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6402 - framework/trunk/framework.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-13 16:42:55 -0400 (Sun, 13 Apr 2008) New Revision: 6402 Modified: framework/trunk/framework/pom.xml Log: assembly Modified: framework/trunk/framework/pom.xml =================================================================== --- framework/trunk/framework/pom.xml 2008-04-13 19:49:08 UTC (rev 6401) +++ framework/trunk/framework/pom.xml 2008-04-13 20:42:55 UTC (rev 6402) @@ -64,6 +64,14 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>assembly</goal> + </goals> + </execution> + </executions> <configuration> <descriptors> <descriptor>src/main/assembly/src.xml</descriptor>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6401 - in framework/trunk: framework and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-13 15:49:08 -0400 (Sun, 13 Apr 2008) New Revision: 6401 Added: framework/trunk/framework/ framework/trunk/framework/pom.xml framework/trunk/framework/src/ framework/trunk/framework/src/main/ framework/trunk/framework/src/main/assembly/ framework/trunk/framework/src/main/assembly/src.xml framework/trunk/hudson/build-hudson.xml Removed: framework/trunk/ant-import/ framework/trunk/framework/src/main/ framework/trunk/src/ Modified: framework/trunk/ framework/trunk/.classpath framework/trunk/build.xml framework/trunk/pom.xml Log: Use framework modules Property changes on: framework/trunk ___________________________________________________________________ Name: svn:ignore - ant.properties target + ant.properties Modified: framework/trunk/.classpath =================================================================== --- framework/trunk/.classpath 2008-04-13 17:52:18 UTC (rev 6400) +++ framework/trunk/.classpath 2008-04-13 19:49:08 UTC (rev 6401) @@ -5,13 +5,13 @@ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/> <classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/> <classpathentry kind="var" path="M2_REPO/javax/xml/jaxrpc-api/1.1/jaxrpc-api-1.1.jar"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/> - <classpathentry combineaccessrules="false" exported="true" kind="src" path="/spi"/> <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR7/jbossxb-2.0.0.CR7.jar"/> <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar"/> <classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/> <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/> <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar"/> - <classpathentry kind="output" path="target/eclipse"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/3.0.0-SNAPSHOT/jbossws-spi-3.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-common/3.0.0-SNAPSHOT/jbossws-common-3.0.0-SNAPSHOT.jar"/> + <classpathentry kind="output" path="framework/target/eclipse"/> </classpath> Modified: framework/trunk/build.xml =================================================================== --- framework/trunk/build.xml 2008-04-13 17:52:18 UTC (rev 6400) +++ framework/trunk/build.xml 2008-04-13 19:49:08 UTC (rev 6401) @@ -13,16 +13,16 @@ <project name="JBossWS-Framework" default="main" basedir="."> - <import file="${basedir}/ant-import/build-hudson.xml"/> -    - <property name="framework.dir" value="${basedir}"/> + <property name="framework.dir" value="${basedir}/framework"/> <property name="framework.etc.dir" value="${framework.dir}/src/main/etc"/> <property name="framework.target.dir" value="${framework.dir}/target"/> + <import file="${basedir}/hudson/build-hudson.xml"/> +    @@ -33,9 +33,9 @@ <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="${framework.dir}/ant.properties"/> + <property file="${basedir}/ant.properties"/> - <xmlproperty file="${framework.dir}/pom.xml"/> + <xmlproperty file="${basedir}/pom.xml"/> <property name="version.id" value="${project.version}"/> <property name="repository.id" value="${project.version}"/> @@ -59,13 +59,12 @@ <fail message="Cannot find jbossws-framework-${version.id}-sources.jar. Did you run 'mvn source:jar'?" unless="jbossws.framework.sources.jar.available"/>  - <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> - <mkdir dir="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib"/> - <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar" tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib/jbossws-framework.jar" - overwrite="true"/> - <copy file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar" - tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib/jbossws-framework-src.jar" overwrite="true"/> - <copy file="${framework.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/component-info.xml" overwrite="true"/> + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-framework/${repository.id}"/> + <mkdir dir="${jboss.repository.dir}/lib"/> + <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar" tofile="${jboss.repository.dir}//lib/jbossws-framework.jar" overwrite="true"/> + <copy file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-framework-src.jar" overwrite="true"/> + <copy file="${framework.target.dir}/jbossws-framework-${version.id}-scripts.zip" tofile="${jboss.repository.dir}/lib/jbossws-framework-scripts.zip" overwrite="true"/> + <copy file="${framework.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/> </target>  Property changes on: framework/trunk/framework ___________________________________________________________________ Name: svn:ignore + target Added: framework/trunk/framework/pom.xml =================================================================== --- framework/trunk/framework/pom.xml (rev 0) +++ framework/trunk/framework/pom.xml 2008-04-13 19:49:08 UTC (rev 6401) @@ -0,0 +1,93 @@ +<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 - Framework</name> + <artifactId>jbossws-framework</artifactId> + <packaging>jar</packaging> + + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework-parent</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + +  + <properties> + <jbossws-common>3.0.0-SNAPSHOT</jbossws-common> + <jbossws-spi>3.0.0-SNAPSHOT</jbossws-spi> + </properties> + +  + <dependencies> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <version>${jbossws-common}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>${jbossws-spi}</version> + </dependency> + <dependency> + <groupId>wsdl4j</groupId> + <artifactId>wsdl4j</artifactId> + <version>1.6.1</version> + </dependency> + </dependencies> + +  + <build> + <resources> + <resource> + <targetPath>../etc</targetPath> + <directory>src/main/etc</directory> + <filtering>true</filtering> + </resource> + </resources> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + </configuration> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + +</project> Property changes on: framework/trunk/framework/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: framework/trunk/framework/src (from rev 6380, framework/trunk/src) Copied: framework/trunk/framework/src/main (from rev 6400, framework/trunk/src/main) Added: framework/trunk/framework/src/main/assembly/src.xml =================================================================== --- framework/trunk/framework/src/main/assembly/src.xml (rev 0) +++ framework/trunk/framework/src/main/assembly/src.xml 2008-04-13 19:49:08 UTC (rev 6401) @@ -0,0 +1,18 @@ +<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>scripts</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/main/etc</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>*.bat</include> + <include>*.sh</include> + </includes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: framework/trunk/framework/src/main/assembly/src.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: framework/trunk/hudson/build-hudson.xml =================================================================== --- framework/trunk/hudson/build-hudson.xml (rev 0) +++ framework/trunk/hudson/build-hudson.xml 2008-04-13 19:49:08 UTC (rev 6401) @@ -0,0 +1,170 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + + <target name="init-hudson" depends="init"> + + <property name="hudson.tomcat" value="${hudson.root}/jbossws-hudson-${version.id}/apache-tomcat"/> + <property name="hudson.home" value="${hudson.root}/jbossws-hudson-${version.id}/hudson-home"/> + <echo/> + <echo message="hudson.root = ${hudson.root}"/> + <echo message="hudson.home = ${hudson.home}"/> + <echo/> + + <available file="${hudson.root}" property="hudson.root.available"/> + <available file="${hudson.tomcat}" property="hudson.tomcat.available"/> + <fail message="Hudson root not available" unless="hudson.root.available"/> + + <property name="hudson.username.${hudson.username}" value="true"/> + <fail message="Cannot use default hudson username: ${hudson.username}" if="hudson.username.changeme"/> + <property name="hudson.password.${hudson.password}" value="true"/> + <fail message="Cannot use default hudson password: ${hudson.password}" if="hudson.password.changeme"/> + + <property name="thirdparty.dir" value="${framework.target.dir}/thirdparty"/> + <mkdir dir="${thirdparty.dir}"/> + + </target> + +  + <target name="hudson-tomcat-setup" depends="init-hudson" unless="hudson.tomcat.available"> + + <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> + + <mkdir dir="${hudson.root}"/> + <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/> + <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/> + <chmod perm="+x"> + <fileset dir="${hudson.tomcat}/bin"> + <include name="*.sh"/> + </fileset> + </chmod> + +  + <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> + <copy todir="${hudson.tomcat}" overwrite="true"> + <fileset dir="${framework.dir}/hudson/apache-tomcat"> + <include name="**/*.xml"/> + </fileset> + <filterset> + <filtersfile file="${framework.dir}/ant.properties"/> + <filter token="hudson.home" value="${hudson.home}"/> + </filterset> + </copy> + </target> + +  + <target name="hudson-update" depends="init-hudson"> + + <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="false" verbose="true"/> + + <delete dir="${hudson.tomcat}/webapps/hudson"/> + <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/> + </target> + +  + <target name="hudson-setup" depends="init-hudson,hudson-tomcat-setup" + description="Setup the Hudson QA environment"> + +  + <exec dir="${framework.dir}" executable="svn" failonerror="true" output="${framework.target.dir}/svn-info.xml"> + <arg line="info"/> + <arg line="--xml"/> + </exec> + <xmlproperty file="${framework.target.dir}/svn-info.xml"/> + <property name="hudson.framework.url" value="${info.entry.url}"/> + +  + <copy todir="${hudson.home}" overwrite="true"> + <fileset dir="${framework.dir}/hudson/hudson-home"> + <include name="jobs/*/config.xml"/> + <include name="users/*/config.xml"/> + <include name="*.xml"/> + </fileset> + <filterset> + <filter token="hudson.framework.url" value="${hudson.framework.url}"/> + <filter token="hudson.home" value="${hudson.home}"/> + <filter token="version.id" value="${version.id}"/> + <filtersfile file="${framework.dir}/ant.properties"/> + </filterset> + </copy> + <chmod perm="g+w"> + <fileset dir="${hudson.home}"> + <include name="jobs/*/config.xml"/> + <include name="users/*/config.xml"/> + <include name="*.xml"/> + </fileset> + </chmod> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson setup successfully *"/> + <echo message="* ant hudson-start *"/> + <echo message="*************************************"/> + <echo/> + + </target> + + <target name="hudson-stop" depends="init-hudson" description="Stops the Hudson QA environment"> + + <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true"> + <arg line="stop"/> + </exec> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson stopped successfully *"/> + <echo message="* ant hudson-start *"/> + <echo message="*************************************"/> + <echo/> + + </target> + + <target name="hudson-start" depends="init-hudson" description="Start the Hudson QA environment"> + + <property environment="env"/> + <fail message="unset JBOSS_REPOSITORY=${env.JBOSS_REPOSITORY}" if="env.JBOSS_REPOSITORY"/> + +  + + <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${framework.target.dir}/hudson.log"> + <env key="CATALINA_OPTS" value="-Xmx512m -Djava.awt.headless=true"/> + <arg line="start"/> + </exec> + <chmod perm="g+w"> + <fileset dir="${hudson.tomcat}"> + <include name="logs/**"/> + </fileset> + </chmod> + + <echo/> + <echo message="*************************************"/> + <echo message="* Hudson started successfully *"/> + <echo message="* http://localhost:${hudson.http.port}/hudson *"/> + <echo message="*************************************"/> + <echo/> + + </target> + +</project> Property changes on: framework/trunk/hudson/build-hudson.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: framework/trunk/pom.xml =================================================================== --- framework/trunk/pom.xml 2008-04-13 17:52:18 UTC (rev 6400) +++ framework/trunk/pom.xml 2008-04-13 19:49:08 UTC (rev 6401) @@ -1,52 +1,20 @@ <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 - Framework Parent</name> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <packaging>jar</packaging> + <artifactId>jbossws-framework-parent</artifactId> + <packaging>pom</packaging> + <version>3.0.2-SNAPSHOT</version> - <name>JBoss Web Services - Framework</name> + <organization> <name>JBoss, a division of Red Hat</name> <url>http://www.jboss.org</url> </organization> <url>http://maven.apache.org</url> -  - <properties> - <jbossws-common>3.0.0-SNAPSHOT</jbossws-common> - <jbossws-spi>3.0.0-SNAPSHOT</jbossws-spi> - </properties> - -  - <dependencies> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>javax.xml</groupId> - <artifactId>jaxrpc-api</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>javax.xml.soap</groupId> - <artifactId>saaj-api</artifactId> - <version>1.3</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - <version>${jbossws-common}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - <version>${jbossws-spi}</version> - </dependency> - </dependencies> -  <parent> <groupId>org.jboss</groupId> @@ -54,36 +22,9 @@ <version>3</version> </parent> -  - <build> - <resources> - <resource> - <targetPath>../etc</targetPath> - <directory>src/main/etc</directory> - <filtering>true</filtering> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> - </build> +  + <modules> + <module>framework</module> + </modules> </project>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6400 - stack/cxf/branches/tdiesler/trunk/ant-import-tests.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-13 13:52:18 -0400 (Sun, 13 Apr 2008) New Revision: 6400 Modified: stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml Log: Smoke tests ok Modified: stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml 2008-04-13 17:10:18 UTC (rev 6399) +++ stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml 2008-04-13 17:52:18 UTC (rev 6400) @@ -46,7 +46,9 @@ </path> <path id="tests.extra.classpath"> - <pathelement location="${cxf.runtime.client.dir}/target/jbossws-cxf-client-${version.id}.jar"/> + <fileset dir="${cxf.runtime.client.dir}/target"> + <include name="jbossws-cxf-client*.jar"/> + </fileset> <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> </path>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6399 - 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-13 13:10:18 -0400 (Sun, 13 Apr 2008) New Revision: 6399 Modified: stack/cxf/branches/tdiesler/trunk/.classpath stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml stack/cxf/branches/tdiesler/trunk/management/pom.xml stack/cxf/branches/tdiesler/trunk/pom.xml Log: eclipse classpath Modified: stack/cxf/branches/tdiesler/trunk/.classpath =================================================================== --- stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-13 16:25:50 UTC (rev 6398) +++ stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-13 17:10:18 UTC (rev 6399) @@ -1,14 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/test-framework/java"/> + <classpathentry excluding="org/jboss/test/ws/jaxws/complex/|org/jboss/test/ws/jaxws/holder/|org/jboss/test/ws/jaxws/jbws1840/" kind="src" path="src/test-framework/java"/> + <classpathentry kind="src" path="runtime/server/src/main/java"/> + <classpathentry kind="src" path="runtime/client/src/main/java"/> <classpathentry kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry combineaccessrules="false" kind="src" path="/spi"/> <classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-transports-http/2.0.5-incubator/cxf-rt-transports-http-2.0.5-incubator.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-frontend-jaxws/2.0.5-incubator/cxf-rt-frontend-jaxws-2.0.5-incubator.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/3.0.0-SNAPSHOT/jbossws-spi-3.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-common/3.0.0-SNAPSHOT/jbossws-common-3.0.0-SNAPSHOT.jar"/> + <classpathentry kind="var" path="JUNIT_HOME/junit.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.1/wsdl4j-1.6.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-api/2.0.5-incubator/cxf-api-2.0.5-incubator.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-rt-core/2.0.5-incubator/cxf-rt-core-2.0.5-incubator.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.0.8/spring-context-2.0.8.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.0.8/spring-beans-2.0.8.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.0.8/spring-core-2.0.8.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/jws/jsr181-api/1.0-MR1/jsr181-api-1.0-MR1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/cxf/cxf-common-utilities/2.0.5-incubator/cxf-common-utilities-2.0.5-incubator.jar"/> <classpathentry kind="output" path="target/eclipse"/> </classpath> Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-13 16:25:50 UTC (rev 6398) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-13 17:10:18 UTC (rev 6399) @@ -22,6 +22,7 @@ <delete dir="${deploy.artifacts.dir}"/> <unzip dest="${deploy.artifacts.dir}/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> + <copy file="${thirdparty.dir}/wstx-asl.jar" tofile="${thirdparty.dir}/wstx.jar"/> <copy todir="${deploy.artifacts.dir}/lib"> <fileset dir="${thirdparty.dir}"> <patternset refid="jbossws.client.patternset"/> 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-13 16:25:50 UTC (rev 6398) +++ stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-13 17:10:18 UTC (rev 6399) @@ -26,9 +26,7 @@ </patternset> <patternset id="jbossws.client.patternset"> - <include name="**/cxf-api.jar"/> - <include name="**/cxf-common-utilities.jar"/> - <include name="**/cxf-rt-core.jar"/> + <include name="**/cxf-*.jar"/> <include name="**/geronimo-javamail*.jar"/> <include name="**/geronimo-ws-metadata*.jar"/> <include name="**/jaxb-api.jar"/> Modified: stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml 2008-04-13 16:25:50 UTC (rev 6398) +++ stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml 2008-04-13 17:10:18 UTC (rev 6399) @@ -24,11 +24,30 @@ <target name="tests-init" depends="tests-classpath"> <path id="ws.stack.classpath"> - <fileset dir="${thirdparty.dir}"/> + <fileset dir="${thirdparty.dir}"> + <include name="cxf-*.jar"/> + </fileset> + <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/geronimo-javamail_1.4_spec.jar"/> + <pathelement location="${thirdparty.dir}/geronimo-ws-metadata_2.0_spec.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/neethi.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> + <pathelement location="${thirdparty.dir}/spring-beans.jar"/> + <pathelement location="${thirdparty.dir}/spring-context.jar"/> + <pathelement location="${thirdparty.dir}/spring-core.jar"/> + <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${thirdparty.dir}/wstx.jar"/> + <pathelement location="${thirdparty.dir}/xml-resolver.jar"/> + <pathelement location="${thirdparty.dir}/XmlSchema.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${cxf.rt.client.dir}/target/jbossws-cxf-client-${version.id}.jar"/> + <pathelement location="${cxf.runtime.client.dir}/target/jbossws-cxf-client-${version.id}.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> </path> </target> Modified: stack/cxf/branches/tdiesler/trunk/management/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/management/pom.xml 2008-04-13 16:25:50 UTC (rev 6398) +++ stack/cxf/branches/tdiesler/trunk/management/pom.xml 2008-04-13 17:10:18 UTC (rev 6399) @@ -2,8 +2,8 @@ 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 Managment</name> - <artifactId>jbossws-cxf-managment</artifactId> + <name>JBoss Web Services - Stack CXF Management</name> + <artifactId>jbossws-cxf-management</artifactId> <packaging>war</packaging> <parent> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-13 16:25:50 UTC (rev 6398) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-13 17:10:18 UTC (rev 6399) @@ -20,7 +20,7 @@ </properties> <modules> - <module>managment</module> + <module>management</module> <module>runtime</module> </modules>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6398 - stack/cxf/branches/tdiesler/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-13 12:25:50 -0400 (Sun, 13 Apr 2008) New Revision: 6398 Added: stack/cxf/branches/tdiesler/trunk/management/ Removed: stack/cxf/branches/tdiesler/trunk/managment/ Log: Copied: stack/cxf/branches/tdiesler/trunk/management (from rev 6397, stack/cxf/branches/tdiesler/trunk/managment)

16 years, 9 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-13 12:25:23 -0400 (Sun, 13 Apr 2008) New Revision: 6397 Added: stack/cxf/branches/tdiesler/trunk/managment/ stack/cxf/branches/tdiesler/trunk/runtime/ Removed: stack/cxf/branches/tdiesler/trunk/context/ stack/cxf/branches/tdiesler/trunk/rt/ Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-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/managment/pom.xml stack/cxf/branches/tdiesler/trunk/pom.xml stack/cxf/branches/tdiesler/trunk/runtime/client/pom.xml stack/cxf/branches/tdiesler/trunk/runtime/pom.xml stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml Log: Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -31,13 +31,13 @@ <patternset refid="jbossws.service.lib.patternset"/> <include name="juddi-service.sar"/> </fileset> - <fileset dir="${cxf.context.dir}/target"> - <include name="jbossws-cxf-context-${version.id}.war"/> + <fileset dir="${cxf.management.dir}/target"> + <include name="jbossws-cxf-management-${version.id}.war"/> </fileset> - <fileset dir="${cxf.rt.client.dir}/target"> + <fileset dir="${cxf.runtime.client.dir}/target"> <include name="jbossws-cxf-client-${version.id}.jar"/> </fileset> - <fileset dir="${cxf.rt.server.dir}/target"> + <fileset dir="${cxf.runtime.server.dir}/target"> <include name="jbossws-cxf-server-${version.id}.jar"/> </fileset> </copy> 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-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -212,9 +212,9 @@ <include name="**/wstx.jar"/> </fileset> </copy> - <unzip dest="@{targetdir}/jbossws-context.war"> + <unzip dest="@{targetdir}/jbossws-management.war"> <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf-context*.war"/> + <include name="**/jbossws-cxf-management*.war"/> </fileset> </unzip> <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true"> Modified: stack/cxf/branches/tdiesler/trunk/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -27,11 +27,13 @@   - <property name="cxf.context.dir" value="${cxf.dir}/context"/> - <property name="cxf.rt.dir" value="${cxf.dir}/rt"/> - <property name="cxf.rt.client.dir" value="${cxf.rt.dir}/client"/> - <property name="cxf.rt.server.dir" value="${cxf.rt.dir}/server"/> + <property name="cxf.management.dir" value="${cxf.dir}/management"/> + <property name="cxf.runtime.dir" value="${cxf.dir}/runtime"/> + <property name="cxf.runtime.client.dir" value="${cxf.runtime.dir}/client"/> + <property name="cxf.runtime.server.dir" value="${cxf.runtime.dir}/server"/> + <property name="thirdparty.dir" value="${cxf.runtime.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"/> @@ -47,8 +49,6 @@ <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"/> - <property name="thirdparty.dir" value="${cxf.rt.server.dir}/target/thirdparty"/> - <import file="${basedir}/ant-import-tests/build-testsuite.xml"/>  Copied: stack/cxf/branches/tdiesler/trunk/managment (from rev 6396, stack/cxf/branches/tdiesler/trunk/context) Modified: stack/cxf/branches/tdiesler/trunk/managment/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/context/pom.xml 2008-04-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/managment/pom.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -2,8 +2,8 @@ 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 Context</name> - <artifactId>jbossws-cxf-context</artifactId> + <name>JBoss Web Services - Stack CXF Managment</name> + <artifactId>jbossws-cxf-managment</artifactId> <packaging>war</packaging> <parent> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -20,8 +20,8 @@ </properties> <modules> - <module>context</module> - <module>rt</module> + <module>managment</module> + <module>runtime</module> </modules>  Copied: stack/cxf/branches/tdiesler/trunk/runtime (from rev 6396, stack/cxf/branches/tdiesler/trunk/rt) Modified: stack/cxf/branches/tdiesler/trunk/runtime/client/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/pom.xml 2008-04-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/runtime/client/pom.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -2,13 +2,13 @@ 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 Client</name> + <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-rt</artifactId> + <artifactId>jbossws-cxf-runtime</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> Modified: stack/cxf/branches/tdiesler/trunk/runtime/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/pom.xml 2008-04-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/runtime/pom.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack CXF Runtime</name> - <artifactId>jbossws-cxf-rt</artifactId> + <artifactId>jbossws-cxf-runtime</artifactId> <packaging>pom</packaging> <parent> Modified: stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/pom.xml 2008-04-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -2,13 +2,13 @@ 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 Server</name> + <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-rt</artifactId> + <artifactId>jbossws-cxf-runtime</artifactId> <version>3.0.2-SNAPSHOT</version> </parent>

16 years, 9 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-12 21:42:23 -0400 (Sat, 12 Apr 2008) New Revision: 6396 Modified: stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml stack/cxf/branches/tdiesler/trunk/pom.xml Log: Smoke tests ok Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-13 00:21:28 UTC (rev 6395) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-13 01:42:23 UTC (rev 6396) @@ -41,6 +41,7 @@ <include name="jbossws-cxf-server-${version.id}.jar"/> </fileset> </copy> + <copy file="${thirdparty.dir}/wstx-asl.jar" tofile="${deploy.artifacts.dir}/lib/wstx.jar"/> <copy todir="${deploy.artifacts.dir}/resources"> <fileset dir="${cxf.output.resources.dir}"> <include name="jbossws-cxf42-beans.xml"/> Modified: stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml 2008-04-13 00:21:28 UTC (rev 6395) +++ stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml 2008-04-13 01:42:23 UTC (rev 6396) @@ -24,31 +24,11 @@ <target name="tests-init" depends="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-api.jar"/> - <pathelement location="${thirdparty.dir}/cxf-common-utilities.jar"/> - <pathelement location="${thirdparty.dir}/cxf-rt-core.jar"/> - <pathelement location="${thirdparty.dir}/geronimo-javamail_1.4_spec.jar"/> - <pathelement location="${thirdparty.dir}/geronimo-ws-metadata_2.0_spec.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/neethi.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> - <pathelement location="${thirdparty.dir}/spring-beans.jar"/> - <pathelement location="${thirdparty.dir}/spring-context.jar"/> - <pathelement location="${thirdparty.dir}/spring-core.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/wstx.jar"/> - <pathelement location="${thirdparty.dir}/xml-resolver.jar"/> - <pathelement location="${thirdparty.dir}/XmlSchema.jar"/> + <fileset dir="${thirdparty.dir}"/> </path> <path id="tests.extra.classpath"> <pathelement location="${cxf.rt.client.dir}/target/jbossws-cxf-client-${version.id}.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> </path> </target> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-13 00:21:28 UTC (rev 6395) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-13 01:42:23 UTC (rev 6396) @@ -33,7 +33,7 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> + <artifactId>cxf-rt-bindings-soap</artifactId> <version>${cxf-version}</version> <scope>provided</scope> </dependency> @@ -44,6 +44,36 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + <version>${cxf-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http-jetty</artifactId> + <version>${cxf-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-jms</artifactId> + <version>${cxf-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-rm</artifactId> + <version>${cxf-version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + <version>${cxf-version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common</artifactId> <version>3.0.0-SNAPSHOT</version>

16 years, 9 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-12 20:21:28 -0400 (Sat, 12 Apr 2008) New Revision: 6395 Added: stack/cxf/branches/tdiesler/trunk/rt/ stack/cxf/branches/tdiesler/trunk/rt/client/ stack/cxf/branches/tdiesler/trunk/rt/client/pom.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderFactoryImpl.java stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceReferenceable.java stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/DISCLAIMER stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/LICENSE stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/MANIFEST.MF stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/NOTICE stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/NOTICE.jdom stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/bus-extensions.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/aegis.xsd stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-servlet.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf.extension stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/extensions.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/jax-ws-catalog.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/service.validator.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/services/ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/spring.handlers stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/spring.schemas stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/tools-plugin.xml stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/wsdl.plugin.xml stack/cxf/branches/tdiesler/trunk/rt/pom.xml stack/cxf/branches/tdiesler/trunk/rt/server/ stack/cxf/branches/tdiesler/trunk/rt/server/pom.xml stack/cxf/branches/tdiesler/trunk/rt/server/src/ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/META-INF/ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/META-INF/services/ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory Removed: stack/cxf/branches/tdiesler/trunk/src/main/etc/default.mf stack/cxf/branches/tdiesler/trunk/src/main/java/ stack/cxf/branches/tdiesler/trunk/src/main/resources/jbossws-cxf-client.jar/ stack/cxf/branches/tdiesler/trunk/src/main/resources/jbossws-cxf.jar/ Modified: stack/cxf/branches/tdiesler/trunk/ stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml stack/cxf/branches/tdiesler/trunk/build.xml stack/cxf/branches/tdiesler/trunk/context/pom.xml stack/cxf/branches/tdiesler/trunk/pom.xml Log: Split in modules Property changes on: stack/cxf/branches/tdiesler/trunk ___________________________________________________________________ Name: svn:ignore - ant.properties apache-cxf version.properties.md5 clipboard.* target thirdparty + ant.properties clipboard.* target version.properties.md5 Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-12 21:49:15 UTC (rev 6394) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -29,17 +29,17 @@ <patternset refid="jbossws.lib.endorsed.patternset"/> <patternset refid="jbossws.server.lib.patternset"/> <patternset refid="jbossws.service.lib.patternset"/> - <exclude name="cxf-${cxf.version}.jar"/> <include name="juddi-service.sar"/> </fileset> - <fileset dir="${cxf.output.lib.dir}"> - <patternset refid="jbossws.client.patternset"/> - <patternset refid="jbossws.lib.patternset"/> - <patternset refid="jbossws.lib.endorsed.patternset"/> - <patternset refid="jbossws.server.lib.patternset"/> - <patternset refid="jbossws.service.lib.patternset"/> - <include name="jbossws-context.war"/> + <fileset dir="${cxf.context.dir}/target"> + <include name="jbossws-cxf-context-${version.id}.war"/> </fileset> + <fileset dir="${cxf.rt.client.dir}/target"> + <include name="jbossws-cxf-client-${version.id}.jar"/> + </fileset> + <fileset dir="${cxf.rt.server.dir}/target"> + <include name="jbossws-cxf-server-${version.id}.jar"/> + </fileset> </copy> <copy todir="${deploy.artifacts.dir}/resources"> <fileset dir="${cxf.output.resources.dir}"> Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml 2008-04-12 21:49:15 UTC (rev 6394) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -13,7 +13,7 @@ <project> - <property file="${int.cxf.dir}/version.properties"/> + <property file="${cxf.dir}/version.properties"/>   @@ -24,10 +24,10 @@ <target name="thirdparty-init" depends="prepare"> - <checksum file="${int.cxf.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <checksum file="${cxf.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <property name="checksum.ok.${checksum.ok}" value="true"/> - <property name="thirdparty.dir" value="${int.cxf.dir}/thirdparty"/> + <property name="thirdparty.dir" value="${cxf.dir}/thirdparty"/> <condition property="force.thirdparty.get"> <or> <not> @@ -54,7 +54,7 @@ <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> - <checksum file="${int.cxf.dir}/version.properties" fileext=".md5"/> + <checksum file="${cxf.dir}/version.properties" fileext=".md5"/> </target> <target name="thirdparty-classpath" depends="thirdparty-get"> 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-12 21:49:15 UTC (rev 6394) +++ stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -29,14 +29,14 @@ <include name="**/cxf-api.jar"/> <include name="**/cxf-common-utilities.jar"/> <include name="**/cxf-rt-core.jar"/> - <include name="**/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <include name="**/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.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-cxf-client*.jar"/> <include name="**/jbossws-framework.jar"/> <include name="**/jbossws-spi.jar"/> <include name="**/jdom.jar"/> @@ -71,11 +71,12 @@ <patternset id="jbossws.service.lib.patternset"> <include name="**/cxf-*.jar"/> - <include name="**/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <include name="**/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.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.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"/> @@ -213,7 +214,7 @@ </copy> <unzip dest="@{targetdir}/jbossws-context.war"> <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-context.war"/> + <include name="**/jbossws-cxf-context*.war"/> </fileset> </unzip> <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true"> @@ -244,7 +245,7 @@ </copy> <unzip dest="@{targetdir}/jbossws-context.war" overwrite="true"> <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-context.war"/> + <include name="**/jbossws-cxf-context*.war"/> </fileset> </unzip> <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true"> Modified: stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml 2008-04-12 21:49:15 UTC (rev 6394) +++ stack/cxf/branches/tdiesler/trunk/ant-import-tests/build-testsuite.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -10,12 +10,12 @@ <project> - <property name="tests.output.dir" value="${int.cxf.dir}/output/tests"/> + <property name="tests.output.dir" value="${cxf.output.dir}/tests"/> - <import file="${int.cxf.dir}/src/test-framework/ant-import/build-testsuite.xml"/> + <import file="${cxf.dir}/src/test-framework/ant-import/build-testsuite.xml"/>  - <property name="excludesfile" value="${int.cxf.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + <property name="excludesfile" value="${cxf.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>   @@ -24,31 +24,31 @@ <target name="tests-init" depends="tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${int.cxf.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/cxf-api.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/cxf-common-utilities.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/cxf-rt-core.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jaxb-api.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jaxws-api.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jdom.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/neethi.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/saaj-api.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/saaj-impl.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-beans.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-context.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-core.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/wstx.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/xml-resolver.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/XmlSchema.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/cxf-api.jar"/> + <pathelement location="${thirdparty.dir}/cxf-common-utilities.jar"/> + <pathelement location="${thirdparty.dir}/cxf-rt-core.jar"/> + <pathelement location="${thirdparty.dir}/geronimo-javamail_1.4_spec.jar"/> + <pathelement location="${thirdparty.dir}/geronimo-ws-metadata_2.0_spec.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/neethi.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> + <pathelement location="${thirdparty.dir}/spring-beans.jar"/> + <pathelement location="${thirdparty.dir}/spring-context.jar"/> + <pathelement location="${thirdparty.dir}/spring-core.jar"/> + <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${thirdparty.dir}/wstx.jar"/> + <pathelement location="${thirdparty.dir}/xml-resolver.jar"/> + <pathelement location="${thirdparty.dir}/XmlSchema.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${int.cxf.dir}/thirdparty/jbossws-framework.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${cxf.rt.client.dir}/target/jbossws-cxf-client-${version.id}.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> </path> </target> @@ -74,8 +74,8 @@  <target name="tests-compile" depends="wsconsume" description="Compile sources"> - <macro-compile-classes srcdir="${int.cxf.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${int.cxf.dir}/src/test/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${cxf.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${cxf.dir}/src/test/java" excludesfile="${excludesfile}"/> </target>  @@ -84,14 +84,14 @@  <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${int.cxf.dir}/src/test-framework"/> - <macro-copy-resources srcdir="${int.cxf.dir}/src/test"/> + <macro-copy-resources srcdir="${cxf.dir}/src/test-framework"/> + <macro-copy-resources srcdir="${cxf.dir}/src/test"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${int.cxf.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-testsuite-jars"/> - <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> + <ant antfile="${cxf.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-testsuite-jars"/> + <ant antfile="${cxf.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${cxf.dir}/src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> </target> <target name="tests-main" depends="tests-jars" description="Build the deployments."/> Modified: stack/cxf/branches/tdiesler/trunk/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-12 21:49:15 UTC (rev 6394) +++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -13,7 +13,7 @@ <project default="main" basedir="." name="JBossWS-CXF"> - <property name="int.cxf.dir" value="${basedir}"/> + <property name="cxf.dir" value="${basedir}"/> <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-bin-dist.xml"/> @@ -26,19 +26,20 @@    + + <property name="cxf.context.dir" value="${cxf.dir}/context"/> + <property name="cxf.rt.dir" value="${cxf.dir}/rt"/> + <property name="cxf.rt.client.dir" value="${cxf.rt.dir}/client"/> + <property name="cxf.rt.server.dir" value="${cxf.rt.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}/target"/> - <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.deploy.dir}-artifacts"/> @@ -46,7 +47,7 @@ <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"/> - <property name="thirdparty.dir" value="${basedir}/thirdparty"/> + <property name="thirdparty.dir" value="${cxf.rt.server.dir}/target/thirdparty"/> <import file="${basedir}/ant-import-tests/build-testsuite.xml"/> @@ -55,7 +56,9 @@  <target name="init" depends="prepare,thirdparty"> - <mkdir dir="${cxf.output.apidocs.dir}"/> + <xmlproperty file="${cxf.dir}/pom.xml"/> + <property name="version.id" value="${project.version}"/> + <echo message="version.id=${version.id}"/> </target>  Modified: stack/cxf/branches/tdiesler/trunk/context/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/context/pom.xml 2008-04-12 21:49:15 UTC (rev 6394) +++ stack/cxf/branches/tdiesler/trunk/context/pom.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -2,15 +2,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.ws</groupId> + <name>JBoss Web Services - Stack CXF Context</name> <artifactId>jbossws-cxf-context</artifactId> <packaging>war</packaging> - <version>3.0.2-SNAPSHOT</version> - <name>JBoss Web Services - Stack CXF</name> - <organization> - <name>JBoss, a division of Red Hat</name> - <url>http://www.jboss.org</url> - </organization> - <url>http://maven.apache.org</url> + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + </project> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-12 21:49:15 UTC (rev 6394) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -1,11 +1,13 @@ <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> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-cxf</artifactId> - <packaging>jar</packaging> + <packaging>pom</packaging> <version>3.0.2-SNAPSHOT</version> <name>JBoss Web Services - Stack CXF</name> + <organization> <name>JBoss, a division of Red Hat</name> <url>http://www.jboss.org</url> @@ -17,6 +19,11 @@ <cxf-version>2.0.5-incubator</cxf-version> </properties> + <modules> + <module>context</module> + <module>rt</module> + </modules> +  <dependencies> <dependency> @@ -63,13 +70,6 @@  <build> - <resources> - <resource> - <targetPath>../etc</targetPath> - <directory>src/main/etc</directory> - <filtering>true</filtering> - </resource> - </resources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -81,23 +81,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>./thirdparty</outputDirectory> - <stripVersion>true</stripVersion> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -107,15 +90,6 @@ </archive> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>org/jboss/test/ws/jaxws/cxf/**</exclude> - </excludes> - </configuration> - </plugin> </plugins> </build> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client ___________________________________________________________________ Name: svn:ignore + target Added: stack/cxf/branches/tdiesler/trunk/rt/client/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/pom.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/pom.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -0,0 +1,15 @@ +<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 Client</name> + <artifactId>jbossws-cxf-client</artifactId> + <packaging>jar</packaging> + + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf-rt</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + +</project> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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; + } +} + Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceObjectFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderFactoryImpl.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderFactoryImpl.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderFactoryImpl.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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()); + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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"); + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXRPC.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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); + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceRefBinderJAXWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceReferenceable.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceReferenceable.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceReferenceable.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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(); + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/java/org/jboss/wsf/stack/cxf/client/ServiceReferenceable.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/DISCLAIMER =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/DISCLAIMER (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/DISCLAIMER 2008-04-13 00:21:28 UTC (rev 6395) @@ -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. Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/LICENSE =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/LICENSE (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/LICENSE 2008-04-13 00:21:28 UTC (rev 6395) @@ -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. Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/MANIFEST.MF =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/MANIFEST.MF (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/MANIFEST.MF 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 + Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/NOTICE =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/NOTICE (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/NOTICE 2008-04-13 00:21:28 UTC (rev 6395) @@ -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) + + Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/NOTICE.jdom =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/NOTICE.jdom (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/NOTICE.jdom 2008-04-13 00:21:28 UTC (rev 6395) @@ -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/>. Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/bus-extensions.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/bus-extensions.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/bus-extensions.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/bus-extensions.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/aegis.xsd =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/aegis.xsd (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/aegis.xsd 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/aegis.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-addr.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http-binding.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http-jetty.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-http.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-jaxws.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-jms.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-local.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-management.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-policy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-rm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-soap.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-extension-xml.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-servlet.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-servlet.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-servlet.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf-servlet.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf.extension =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf.extension (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf.extension 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/cxf/cxf.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/extensions.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/extensions.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/extensions.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/extensions.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/jax-ws-catalog.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/jax-ws-catalog.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/jax-ws-catalog.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/jax-ws-catalog.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/service.validator.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/service.validator.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/service.validator.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/service.validator.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/services/com.sun.tools.xjc.Plugin 2008-04-13 00:21:28 UTC (rev 6395) @@ -0,0 +1,2 @@ +org.apache.cxf.xjc.ts.ToStringPlugin +org.apache.cxf.xjc.dv.DefaultValuePlugin Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/services/javax.xml.ws.spi.Provider 2008-04-13 00:21:28 UTC (rev 6395) @@ -0,0 +1 @@ +org.apache.cxf.jaxws.spi.ProviderImpl Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/services/org.apache.cxf.bus.factory 2008-04-13 00:21:28 UTC (rev 6395) @@ -0,0 +1,2 @@ +org.apache.cxf.bus.spring.SpringBusFactory +org.springframework.context.ApplicationContext \ No newline at end of file Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/spring.handlers =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/spring.handlers (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/spring.handlers 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/spring.schemas =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/spring.schemas (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/spring.schemas 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/tools-plugin.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/tools-plugin.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/tools-plugin.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/tools-plugin.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/wsdl.plugin.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/wsdl.plugin.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/wsdl.plugin.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -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> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/client/src/main/resources/META-INF/wsdl.plugin.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/pom.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/pom.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -0,0 +1,20 @@ +<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</name> + <artifactId>jbossws-cxf-rt</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + + <modules> + <module>client</module> + <module>server</module> + </modules> + +</project> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server ___________________________________________________________________ Name: svn:ignore + target Added: stack/cxf/branches/tdiesler/trunk/rt/server/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/pom.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/pom.xml 2008-04-13 00:21:28 UTC (rev 6395) @@ -0,0 +1,38 @@ +<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 Server</name> + <artifactId>jbossws-cxf-server</artifactId> + <packaging>jar</packaging> + + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf-rt</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + +  + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/thirdparty</outputDirectory> + <stripVersion>true</stripVersion> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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(); + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfig.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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(); +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServerConfigMBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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; + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -0,0 +1,151 @@ +/* + * 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.stack.cxf.metadata.services.DDBeans; +import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint; + +/** + * A deployer that 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) + { + // Look for cxf.xml descriptor + ClassLoader initCL = dep.getInitialClassLoader(); + URL cxfURL = initCL.getResource("cxf.xml"); + if (cxfURL != null) + { + log.info("CXF configuration found: " + cxfURL); + } + else + { + // Look for jbossws-cxf.xml descriptor + DeploymentType depType = dep.getType(); + + String metadir; + if (depType == DeploymentType.JAXWS_EJB3) + metadir = "META-INF"; + else if (depType == DeploymentType.JAXWS_JSE) + metadir = "WEB-INF"; + else + throw new IllegalStateException("Unsupported deployment type: " + depType); + + try + { + ArchiveDeployment archdep = (ArchiveDeployment)dep; + cxfURL = archdep.getMetaDataFileURL(metadir + "/jbossws-cxf.xml"); + log.info("JBossWS-CXF configuration found: " + cxfURL); + } + catch (IOException ex) + { + // ignore, jbossws-cxf.xml not found + } + + // Generate the jbossws-cxf.xml descriptor + if (cxfURL == null) + { + 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); + } + + cxfURL = dd.createFileURL(); + log.info("JBossWS-CXF configuration generated: " + cxfURL); + + dep.addAttachment(DDBeans.class, dd); + } + + String propKey = "org.jboss.ws.webapp.ContextParameterMap"; + Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); + if (contextParams == null) + { + contextParams = new HashMap<String, String>(); + dep.setProperty(propKey, contextParams); + } + + contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm()); + } + } + + @Override + public void destroy(Deployment dep) + { + DDBeans dd = dep.getAttachment(DDBeans.class); + if (dd != null) + { + dd.destroyFileURL(); + } + } +} \ No newline at end of file Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 + ); + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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); + } + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointServlet.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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); + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerEJB3.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/InvokerJSE.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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(); + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerFactoryImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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(); + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -0,0 +1,140 @@ +/* + * 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 transport; + private CXFServlet cxfServlet; + + public ServletControllerExt(ServletTransportFactory transport, CXFServlet servlet) + { + super(transport, servlet); + this.transport = transport; + this.cxfServlet = servlet; + } + + public void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException + { + try + { + // Find destination based on request URI + String requestURI = req.getRequestURI(); + ServletDestination dest = null; + Collection<ServletDestination> destinations = transport.getDestinations(); + for (ServletDestination aux : destinations) + { + EndpointInfo ei = aux.getEndpointInfo(); + String address = ei.getAddress(); + + // Fix invalid leading slash + if (address.startsWith("/http://")) + { + address = address.substring(1); + ei.setAddress(address); + } + + String path = address; + try + { + path = new URL(address).getPath(); + } + catch (MalformedURLException ex) + { + // ignore + } + + if (requestURI.startsWith(path)) + { + dest = aux; + break; + } + } + if (dest == null) + throw new ServletException("Cannot obtain destination for: " + requestURI); + + EndpointInfo ei = dest.getEndpointInfo(); + Bus bus = cxfServlet.getBus(); + if (null != req.getQueryString() && req.getQueryString().length() > 0 && bus.getExtension(QueryHandlerRegistry.class) != null) + { + String ctxUri = requestURI; //req.getPathInfo(); + String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString(); + + for (QueryHandler qh : bus.getExtension(QueryHandlerRegistry.class).getHandlers()) + { + if (qh.isRecognizedQuery(baseUri, ctxUri, ei)) + { + + res.setContentType(qh.getResponseContentType(baseUri, ctxUri)); + OutputStream out = res.getOutputStream(); + try + { + qh.writeResponse(baseUri, ctxUri, ei, out); + out.flush(); + return; + } + catch (Exception e) + { + throw new ServletException(e); + } + } + } + } + + invokeDestination(req, res, dest); + } + catch (IOException e) + { + throw new ServletException(e); + } + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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; + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/WebAppResolver.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBean.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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 Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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(); + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java 2008-04-13 00:21:28 UTC (rev 6395) @@ -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()); + } +} Property changes on: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2008-04-13 00:21:28 UTC (rev 6395) @@ -0,0 +1 @@ +org.jboss.wsf.stack.cxf.RequestHandlerFactoryImpl \ No newline at end of file Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2008-04-13 00:21:28 UTC (rev 6395) @@ -0,0 +1 @@ +org.jboss.wsf.stack.cxf.EndpointRegistryFactoryImpl \ No newline at end of file Added: stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory (rev 0) +++ stack/cxf/branches/tdiesler/trunk/rt/server/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2008-04-13 00:21:28 UTC (rev 6395) @@ -0,0 +1 @@ +org.jboss.wsf.stack.cxf.client.ServiceRefBinderFactoryImpl \ No newline at end of file Deleted: stack/cxf/branches/tdiesler/trunk/src/main/etc/default.mf =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/etc/default.mf 2008-04-12 21:49:15 UTC (rev 6394) +++ stack/cxf/branches/tdiesler/trunk/src/main/etc/default.mf 2008-04-13 00:21:28 UTC (rev 6395) @@ -1,14 +0,0 @@ -Manifest-Version: 1.2 -Created-By: @java.vm.version@ (@java.vm.vendor@) -Specification-Title: @specification.title@ -Specification-Version: @specification.version@ -Specification-Vendor: @specification.vendor@ -Implementation-Title: @implementation.title@ -Implementation-URL: @implementation.url@ -Implementation-Version: @implementation.version@ (build=(a)build.id@) -Implementation-Vendor: @implementation.vendor@ -Implementation-Vendor-Id: @implementation.vendor.id@ -Class-Path: cxf-rt-core.jar geronimo-javamail_@cxf.geronimo.javamail@.jar geronimo-ws-metadata_@cxf.geronimo.ws.metadata@.jar - jaxb-api.jar jaxb-impl.jar jaxws-api.jar jbossws-common.jar jbossws-framework.jar jbossws-spi.jar - neethi.jar saaj-api.jar saaj-impl.jar spring-beans.jar spring-context.jar spring-core.jar - stax-api.jar wsdl4j.jar wstx.jar xml-resolver.jar XmlSchema.jar \ No newline at end of file

16 years, 9 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2008