JBossWS SVN: r11237 - in stack/metro/trunk: modules/management and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-09 15:41:08 -0500 (Wed, 09 Dec 2009)
New Revision: 11237
Added:
stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt
Removed:
stack/metro/trunk/modules/testsuite/test-excludes-jboss520.txt
Modified:
stack/metro/trunk/build.xml
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/pom.xml
stack/metro/trunk/profiles.xml.example
stack/metro/trunk/src/main/distro/Install.txt
stack/metro/trunk/src/main/distro/ant.properties.example
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/distro/build-setup.xml
stack/metro/trunk/src/main/distro/build.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2848] fixing Metro
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/build.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -63,27 +63,27 @@
<condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}">
<isset property="profiles.profile.properties.jboss510.home"/>
</condition>
- <condition property="jboss520.home" value="${profiles.profile.properties.jboss520.home}">
- <isset property="profiles.profile.properties.jboss520.home"/>
- </condition>
<condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
<isset property="profiles.profile.properties.jboss600.home"/>
</condition>
+ <condition property="jboss601.home" value="${profiles.profile.properties.jboss601.home}">
+ <isset property="profiles.profile.properties.jboss601.home"/>
+ </condition>
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
<property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/>
<property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
<property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/>
- <property name="jboss520.home" value="${profiles.profile.properties.jboss520.home}"/>
<property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
+ <property name="jboss601.home" value="${profiles.profile.properties.jboss601.home}"/>
<echo/>
<echo message="jboss500.home=${jboss500.home}"/>
<echo message="jboss501.home=${jboss501.home}"/>
<echo message="jboss510.home=${jboss510.home}"/>
- <echo message="jboss520.home=${jboss520.home}"/>
<echo message="jboss600.home=${jboss600.home}"/>
+ <echo message="jboss601.home=${jboss601.home}"/>
</target>
<target name="init" depends="mvn-settings,prepare,os-init">
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/modules/management/pom.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -49,7 +49,7 @@
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
+ <artifactId>jbossws-jboss600</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/modules/server/pom.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -173,19 +173,19 @@
<!--
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
- <version>${jbossws.jboss520.version}</version>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss520</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
+ <version>${jbossws.jboss601.version}</version>
<classifier>resources</classifier>
<type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss601</outputDirectory>
</artifactItem>
-->
<!-- END -->
Modified: stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -33,12 +33,12 @@
<copy
file="${src.dir}/jbossws-metro-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss520/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
<copy
file="${src.dir}/jbossws-metro-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+ tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
/>
</target>
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -503,14 +503,14 @@
</profile>
<!--
- Name: jboss520
- Descr: JBoss-5.2.0 specific options
+ Name: jboss600
+ Descr: JBoss-6.0.0 specific options
-->
<profile>
- <id>jboss520</id>
+ <id>jboss600</id>
<properties>
- <jboss.version>5.2.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss520</jbossws.integration.target>
+ <jboss.version>6.0.0.M1</jboss.version>
+ <jbossws.integration.target>jboss600</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -546,13 +546,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss520.txt</testExcludeFile>
+ <testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss520.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
@@ -564,14 +564,14 @@
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
+ Name: jboss601
+ Descr: JBoss-6.0.1 specific options
-->
<profile>
- <id>jboss600</id>
+ <id>jboss601</id>
<properties>
<jboss.version>6.0.0-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
+ <jbossws.integration.target>jboss601</jbossws.integration.target>
</properties>
<dependencies>
<dependency>
@@ -607,13 +607,13 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile>
+ <testExcludeFile>../test-excludes-jboss601.txt</testExcludeFile>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
+ <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</argLine>
<!-- TODO: replace with maven dependencies -->
<additionalClasspathElements>
<additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement>
Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss520.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss520.txt 2009-12-09 20:41:08 UTC (rev 11237)
@@ -1,51 +0,0 @@
-# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-
-# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-
-# [JBWS-1949] Metro MTOM ignores content-type on attachment part
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
-org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.*
-
-# [JBWS-2102] JSR-261 impl not available in Metro
-org/jboss/test/ws/jaxws/samples/addressing/**
-
-# [JBWS-2596] Resource injection in jaxws endpoints and handlers
-org/jboss/test/ws/jaxws/jbws2074/**
-org/jboss/test/ws/jaxws/jbws2634/**
-
-# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws2183/**
-
-# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
-org/jboss/test/ws/jaxws/jbws1702/**
-
-# [JBWS-2308] faultCode argument for createFault was passed NULL
-org/jboss/test/ws/jaxws/jbws2308/*TestCase.*
-
-# [JBWS-2329] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
-
-# [JBWS-2347] Rewrite @WebFault related tests
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/webfault/**
-
-# [JBWS-2348] Fix jbws1969 testcase
-org/jboss/test/ws/jaxws/jbws1969/**
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2400] Rewrite large attachment testcase
-org/jboss/test/ws/jaxws/jbws2000/**
-
-# [JBWS-2462] Address rewrite test fails in Metro integration
-org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2715] JAXBIntroductions support
-org/jboss/test/ws/jaxws/jaxbcust/**
-org/jboss/test/ws/jaxws/samples/jaxbintros/**
Added: stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt (rev 0)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt 2009-12-09 20:41:08 UTC (rev 11237)
@@ -0,0 +1,51 @@
+# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
+org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
+
+# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
+# [JBWS-1949] Metro MTOM ignores content-type on attachment part
+org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
+org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
+org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.*
+
+# [JBWS-2102] JSR-261 impl not available in Metro
+org/jboss/test/ws/jaxws/samples/addressing/**
+
+# [JBWS-2596] Resource injection in jaxws endpoints and handlers
+org/jboss/test/ws/jaxws/jbws2074/**
+org/jboss/test/ws/jaxws/jbws2634/**
+
+# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
+org/jboss/test/ws/jaxws/binding/**
+org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/jbws2183/**
+
+# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
+org/jboss/test/ws/jaxws/jbws1702/**
+
+# [JBWS-2308] faultCode argument for createFault was passed NULL
+org/jboss/test/ws/jaxws/jbws2308/*TestCase.*
+
+# [JBWS-2329] Failed to deploy service with multiple bindings
+org/jboss/test/ws/jaxws/jbws2278/**
+
+# [JBWS-2347] Rewrite @WebFault related tests
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/webfault/**
+
+# [JBWS-2348] Fix jbws1969 testcase
+org/jboss/test/ws/jaxws/jbws1969/**
+
+# [JBWS-2397] Fix jbws1797 testcase
+org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBWS-2400] Rewrite large attachment testcase
+org/jboss/test/ws/jaxws/jbws2000/**
+
+# [JBWS-2462] Address rewrite test fails in Metro integration
+org/jboss/test/ws/jaxws/jbws2150/**
+
+# [JBWS-2715] JAXBIntroductions support
+org/jboss/test/ws/jaxws/jaxbcust/**
+org/jboss/test/ws/jaxws/samples/jaxbintros/**
Property changes on: stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt
___________________________________________________________________
Name: svn:executable
+ *
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/pom.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -53,8 +53,8 @@
<!-- JBWS-2505 -->
<!-- START -->
<!--
- <jbossws.jboss520.version>3.2.1.GA</jbossws.jboss520.version>
<jbossws.jboss600.version>3.2.1.GA</jbossws.jboss600.version>
+ <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
<jboss.common.version>1.2.1.GA</jboss.common.version>
@@ -145,25 +145,25 @@
<!--
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
- <version>${jbossws.jboss520.version}</version>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss520x</artifactId>
- <version>${jbossws.jboss520.version}</version>
+ <artifactId>jbossws-jboss600</artifactId>
+ <version>${jbossws.jboss600.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
+ <version>${jbossws.jboss601.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600x</artifactId>
- <version>${jbossws.jboss600.version}</version>
+ <version>${jbossws.jboss601.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
@@ -512,26 +512,26 @@
</profile>
<!--
- Name: jboss520
- Descr: JBoss-5.2.0 specific options
+ Name: jboss600
+ Descr: JBoss-6.0.0 specific options
-->
<profile>
- <id>jboss520</id>
+ <id>jboss600</id>
<properties>
- <jbossws.integration.target>jboss520</jbossws.integration.target>
- <jboss.home>${jboss520.home}</jboss.home>
+ <jbossws.integration.target>jboss600</jbossws.integration.target>
+ <jboss.home>${jboss600.home}</jboss.home>
</properties>
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
+ Name: jboss601
+ Descr: JBoss-6.0.1 specific options
-->
<profile>
- <id>jboss600</id>
+ <id>jboss601</id>
<properties>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
- <jboss.home>${jboss600.home}</jboss.home>
+ <jbossws.integration.target>jboss601</jbossws.integration.target>
+ <jboss.home>${jboss601.home}</jboss.home>
</properties>
</profile>
Modified: stack/metro/trunk/profiles.xml.example
===================================================================
--- stack/metro/trunk/profiles.xml.example 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/profiles.xml.example 2009-12-09 20:41:08 UTC (rev 11237)
@@ -14,8 +14,8 @@
<jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
<jboss501.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home>
<jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home>
- <jboss520.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.2.0.Beta</jboss520.home>
- <jboss600.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss600.home>
+ <jboss600.home>/home/opalka/svn/jbossas/tags/JBoss_6_0_0_M1/build/output/jboss-6.0.0.M1</jboss600.home>
+ <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss601.home>
</properties>
</profile>
Modified: stack/metro/trunk/src/main/distro/Install.txt
===================================================================
--- stack/metro/trunk/src/main/distro/Install.txt 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/src/main/distro/Install.txt 2009-12-09 20:41:08 UTC (rev 11237)
@@ -16,8 +16,8 @@
ant deploy-jboss500
ant deploy-jboss501
ant deploy-jboss510
- ant deploy-jboss520
ant deploy-jboss600
+ ant deploy-jboss601
4.) Execute the samples to verify your installation
Modified: stack/metro/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties.example 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/src/main/distro/ant.properties.example 2009-12-09 20:41:08 UTC (rev 11237)
@@ -6,10 +6,10 @@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
jboss510.home=(a)jboss510.home@
-jboss520.home=(a)jboss520.home@
jboss600.home=(a)jboss600.home@
+jboss601.home=(a)jboss601.home@
-# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss520|jboss600]
+# The JBoss server under test. This can be [jboss500|jboss501|jboss510|jboss600|jboss601]
jbossws.integration.target=jboss510
# The JBoss settings
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -116,10 +116,10 @@
</target>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-5.2.x -->
+ <!-- Prepare Deployment Structure JBoss-6.0.0 -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss52" depends="prepare-deploy">
+ <target name="deploy-structure-jboss600" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-metro" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
@@ -132,34 +132,34 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss520 -->
+ <!-- Deployment JBoss600 -->
<!-- ================================================================== -->
- <target name="target-jboss520">
+ <target name="target-jboss600">
<property name="jboss.server.instance" value="default"/>
- <property name="jbossws.integration.target" value="jboss520"/>
+ <property name="jbossws.integration.target" value="jboss600"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}${line.separator}" file="${target.properties.file}"/>
<echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/>
</target>
- <target name="deploy-jboss520" depends="undeploy-jboss520,deploy-structure-jboss52" description="Deploy jbossws to jboss520">
- <fail message="Not available: ${jboss520.available.file}" unless="jboss520.available"/>
- <copy todir="${jboss520.home}" overwrite="true">
+ <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600" description="Deploy jbossws to jboss600">
+ <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
+ <copy todir="${jboss600.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
</copy>
- <chmod dir="${jboss520.home}/bin" perm="+x" includes="*.sh"/>
+ <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss520" depends="target-jboss520,init" description="Remove jbossws from jboss520">
- <fail message="Not available: ${jboss520.available.file}" unless="jboss520.available"/>
- <macro-undeploy-jbossws targetdir="${jboss520.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] -->
+ <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
+ <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-6.0.x -->
<!-- ================================================================== -->
- <target name="deploy-structure-jboss60" depends="prepare-deploy">
+ <target name="deploy-structure-jboss601" depends="prepare-deploy">
<delete dir="${deploy.structure}"/>
<antcall target="deploy-jbossws-metro" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
@@ -172,27 +172,27 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss600 -->
+ <!-- Deployment JBoss601 -->
<!-- ================================================================== -->
- <target name="target-jboss600">
+ <target name="target-jboss601">
<property name="jboss.server.instance" value="default"/>
- <property name="jbossws.integration.target" value="jboss600"/>
+ <property name="jbossws.integration.target" value="jboss601"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}${line.separator}" file="${target.properties.file}"/>
<echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/>
</target>
- <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss60" description="Deploy jbossws to jboss600">
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <copy todir="${jboss600.home}" overwrite="true">
+ <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601" description="Deploy jbossws to jboss601">
+ <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
+ <copy todir="${jboss601.home}" overwrite="true">
<fileset dir="${deploy.structure}"/>
</copy>
- <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/>
+ <chmod dir="${jboss601.home}/bin" perm="+x" includes="*.sh"/>
</target>
- <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <macro-undeploy-jbossws targetdir="${jboss600.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] -->
+ <target name="undeploy-jboss601" depends="target-jboss601,init" description="Remove jbossws from jboss601">
+ <fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss601.server}" defaultconf="${jbossws.default.deploy.conf}" modifyjbossintegration="false"/><!-- [JBWS-2505] -->
</target>
<!-- ================================================================== -->
Modified: stack/metro/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-setup.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/src/main/distro/build-setup.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -41,13 +41,6 @@
<property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/>
<property name="jboss510.server.deployers" value="${jboss510.server}/deployers"/>
- <property name="jboss520.lib" value="${jboss520.home}/lib"/>
- <property name="jboss520.client" value="${jboss520.home}/client"/>
- <property name="jboss520.server" value="${jboss520.home}/server/${jboss.server.instance}"/>
- <property name="jboss520.server.lib" value="${jboss520.home}/common/lib"/>
- <property name="jboss520.server.deploy" value="${jboss520.server}/deploy"/>
- <property name="jboss520.server.deployers" value="${jboss520.server}/deployers"/>
-
<property name="jboss600.lib" value="${jboss600.home}/lib"/>
<property name="jboss600.client" value="${jboss600.home}/client"/>
<property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/>
@@ -55,17 +48,24 @@
<property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
<property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
+ <property name="jboss601.lib" value="${jboss601.home}/lib"/>
+ <property name="jboss601.client" value="${jboss601.home}/client"/>
+ <property name="jboss601.server" value="${jboss601.home}/server/${jboss.server.instance}"/>
+ <property name="jboss601.server.lib" value="${jboss601.home}/common/lib"/>
+ <property name="jboss601.server.deploy" value="${jboss601.server}/deploy"/>
+ <property name="jboss601.server.deployers" value="${jboss601.server}/deployers"/>
+
<property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
<property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/>
- <property name="jboss520.available.file" value="${jboss520.client}/jboss-client.jar"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
+ <property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
- <available property="jboss520.available" file="${jboss520.available.file}"/>
<available property="jboss600.available" file="${jboss600.available.file}"/>
+ <available property="jboss601.available" file="${jboss601.available.file}"/>
<tstamp>
<format property="build.id" pattern="yyyyMMddHHmm"/>
Modified: stack/metro/trunk/src/main/distro/build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/src/main/distro/build.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -56,14 +56,10 @@
<equals arg1="${jbossws.integration.target}" arg2="jboss510"/>
</or>
</condition>
- <condition property="jbossws.integration.jboss52" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss520"/>
- </or>
- </condition>
<condition property="jbossws.integration.jboss60" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss601"/>
</or>
</condition>
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 20:38:07 UTC (rev 11236)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 20:41:08 UTC (rev 11237)
@@ -110,17 +110,17 @@
<!--
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss520.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss520x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss600:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>false</unpack>
15 years, 1 month
JBossWS SVN: r11236 - common/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-09 15:38:07 -0500 (Wed, 09 Dec 2009)
New Revision: 11236
Modified:
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
[JBWS-2848] fixing common
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2009-12-09 19:53:28 UTC (rev 11235)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2009-12-09 20:38:07 UTC (rev 11236)
@@ -211,11 +211,6 @@
return JBossWSTestHelper.isTargetJBoss51();
}
- public static boolean isTargetJBoss52()
- {
- return JBossWSTestHelper.isTargetJBoss52();
- }
-
public static boolean isTargetJBoss50()
{
return JBossWSTestHelper.isTargetJBoss50();
Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2009-12-09 19:53:28 UTC (rev 11235)
+++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2009-12-09 20:38:07 UTC (rev 11236)
@@ -85,7 +85,7 @@
/** True, if -Djbossws.integration.target=jboss5x */
public static boolean isTargetJBoss5()
{
- return isTargetJBoss52() || isTargetJBoss51() || isTargetJBoss50();
+ return isTargetJBoss51() || isTargetJBoss50();
}
/** True, if -Djbossws.integration.target=jboss50x */
@@ -102,19 +102,12 @@
return target.startsWith("jboss51");
}
- /** True, if -Djbossws.integration.target=jboss52x */
- public static boolean isTargetJBoss52()
- {
- String target = getIntegrationTarget();
- return target.startsWith("jboss52");
- }
-
/** True, if -Djbossws.integration.target=jboss6x */
public static boolean isTargetJBoss6()
{
return isTargetJBoss61() || isTargetJBoss60();
}
-
+
/** True, if -Djbossws.integration.target=jboss60x */
public static boolean isTargetJBoss60()
{
@@ -155,10 +148,10 @@
implVendor = obj.getClass().getPackage().getImplementationVendor();
if (implVendor == null)
implVendor = getImplementationPackage();
-
+
implTitle = obj.getClass().getPackage().getImplementationTitle();
implVersion = obj.getClass().getPackage().getImplementationVersion();
-
+
System.out.println(implVendor + ", " + implTitle + ", " + implVersion);
}
return implVendor;
@@ -233,9 +226,7 @@
if (jbossVersion == null)
throw new IllegalStateException("Cannot obtain jboss version");
- if (jbossVersion.startsWith("5.2"))
- jbossVersion = "jboss52";
- else if (jbossVersion.startsWith("5.1"))
+ if (jbossVersion.startsWith("5.1"))
jbossVersion = "jboss51";
else if (jbossVersion.startsWith("5.0"))
jbossVersion = "jboss50";
@@ -253,7 +244,7 @@
if (integrationTarget.startsWith(jbossVersion) == false)
throw new IllegalStateException("Integration target mismatch: " + integrationTarget + ".startsWith(" + jbossVersion + ")");
}
-
+
return integrationTarget;
}
15 years, 1 month
JBossWS SVN: r11235 - spi/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-12-09 14:53:28 -0500 (Wed, 09 Dec 2009)
New Revision: 11235
Removed:
spi/trunk/doc/
Log:
removing doc directory
15 years, 1 month
JBossWS SVN: r11234 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws: core and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-12-09 13:14:28 -0500 (Wed, 09 Dec 2009)
New Revision: 11234
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/core/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/core/client/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/core/client/WSResponseHandlerTestCase.java
Log:
[JBWS-2849] Adding testcase
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/core/client/WSResponseHandlerTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/core/client/WSResponseHandlerTestCase.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/core/client/WSResponseHandlerTestCase.java 2009-12-09 18:14:28 UTC (rev 11234)
@@ -0,0 +1,150 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.core.client;
+
+import java.net.SocketAddress;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelHandler;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
+import org.jboss.netty.handler.codec.http.HttpResponse;
+import org.jboss.netty.handler.codec.http.HttpResponseStatus;
+import org.jboss.netty.handler.codec.http.HttpVersion;
+import org.jboss.ws.core.client.transport.NettyClient;
+import org.jboss.ws.core.client.transport.WSResponseHandler;
+import org.jboss.ws.core.client.transport.WSResponseHandler.Result;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 03-Dic-2009
+ *
+ */
+public class WSResponseHandlerTestCase extends JBossWSTest
+{
+
+ public void testJBWS2849() throws Exception
+ {
+ WSResponseHandler handler = new WSResponseHandler();
+ ChannelHandlerContext ctx = new MyContext();
+ MyMessageEvent e = new MyMessageEvent();
+ HttpResponse response = new DefaultHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK);
+ response.setHeader(NettyClient.RESPONSE_CODE, "123456");
+ e.setMessage(response);
+ handler.messageReceived(ctx, e);
+ Result result = handler.getFutureResult().get();
+ Map<String, Object> headers = result.getResponseHeaders();
+ assertEquals("123456", ((List<?>)headers.get(NettyClient.RESPONSE_CODE)).iterator().next());
+ assertEquals(200, result.getMetadata().get(NettyClient.RESPONSE_CODE));
+ }
+
+ private class MyMessageEvent implements MessageEvent
+ {
+
+ private HttpResponse message;
+
+ public Object getMessage()
+ {
+ return message;
+ }
+
+ public void setMessage(HttpResponse message)
+ {
+ this.message = message;
+ }
+
+ public SocketAddress getRemoteAddress()
+ {
+ return null;
+ }
+
+ public Channel getChannel()
+ {
+ return null;
+ }
+
+ public ChannelFuture getFuture()
+ {
+ return null;
+ }
+
+ }
+
+ private class MyContext implements ChannelHandlerContext
+ {
+ public boolean canHandleDownstream()
+ {
+ return false;
+ }
+
+ public boolean canHandleUpstream()
+ {
+ return false;
+ }
+
+ public Object getAttachment()
+ {
+ return null;
+ }
+
+ public Channel getChannel()
+ {
+ return null;
+ }
+
+ public ChannelHandler getHandler()
+ {
+ return null;
+ }
+
+ public String getName()
+ {
+ return null;
+ }
+
+ public ChannelPipeline getPipeline()
+ {
+ return null;
+ }
+
+ public void sendDownstream(ChannelEvent e)
+ {
+ }
+
+ public void sendUpstream(ChannelEvent e)
+ {
+ }
+
+ public void setAttachment(Object attachment)
+ {
+ }
+
+ }
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/core/client/WSResponseHandlerTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 1 month
JBossWS SVN: r11233 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core: soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-12-09 13:02:14 -0500 (Wed, 09 Dec 2009)
New Revision: 11233
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
Log:
[JBWS-2853] Using new normalizer
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java 2009-12-09 17:59:28 UTC (rev 11232)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/binding/SerializerSupport.java 2009-12-09 18:02:14 UTC (rev 11233)
@@ -32,6 +32,7 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
import org.jboss.ws.core.soap.SOAPContentElement;
+import org.jboss.wsf.common.Normalizer;
import org.jboss.xb.binding.NamespaceRegistry;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -137,7 +138,9 @@
else
{
if (normalize)
- valueStr = normalize(valueStr);
+ {
+ valueStr = Normalizer.normalize(valueStr);
+ }
xmlFragment = "<" + elName + nsAttr + ">" + valueStr + "</" + elName + ">";
}
@@ -150,54 +153,4 @@
throw new NotImplementedException();
}
- private String normalize(String valueStr)
- {
- // We assume most strings will not contain characters that need "escaping",
- // and optimize for this case.
- boolean found = false;
- int i = 0;
-
- outer: for (; i < valueStr.length(); i++)
- {
- switch (valueStr.charAt(i))
- {
- case '<':
- case '>':
- case '&':
- case '"':
- found = true;
- break outer;
- }
- }
-
- if (!found)
- return valueStr;
-
- // Resume where we left off
- StringBuilder builder = new StringBuilder();
- builder.append(valueStr.substring(0, i));
- for (; i < valueStr.length(); i++)
- {
- char c = valueStr.charAt(i);
- switch (c)
- {
- case '<':
- builder.append("<");
- break;
- case '>':
- builder.append(">");
- break;
- case '&':
- builder.append("&");
- break;
- case '"':
- builder.append(""");
- break;
- default:
- builder.append(c);
- }
- }
-
- return builder.toString();
- }
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2009-12-09 17:59:28 UTC (rev 11232)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderStax.java 2009-12-09 18:02:14 UTC (rev 11233)
@@ -41,6 +41,7 @@
import javax.xml.transform.stream.StreamSource;
import org.jboss.util.NotImplementedException;
+import org.jboss.wsf.common.Normalizer;
import org.w3c.dom.Element;
/**
@@ -166,7 +167,7 @@
private void consumeCharacters() throws SOAPException
{
- String text = normalize(reader.getText());
+ String text = Normalizer.normalize(reader.getText());
if (!atPartMargin() && !reader.isWhiteSpace())
{
@@ -418,57 +419,6 @@
return previousPart != currentPart;
}
- private static String normalize(String valueStr)
- {
- // We assume most strings will not contain characters that need "escaping",
- // and optimize for this case.
- boolean found = false;
- int i = 0;
-
- outer: for (; i < valueStr.length(); i++)
- {
- switch (valueStr.charAt(i))
- {
- case '<':
- case '>':
- case '&':
- case '"':
- found = true;
- break outer;
- }
- }
-
- if (!found)
- return valueStr;
-
- // Resume where we left off
- StringBuilder builder = new StringBuilder();
- builder.append(valueStr.substring(0, i));
- for (; i < valueStr.length(); i++)
- {
- char c = valueStr.charAt(i);
- switch (c)
- {
- case '<':
- builder.append("<");
- break;
- case '>':
- builder.append(">");
- break;
- case '&':
- builder.append("&");
- break;
- case '"':
- builder.append(""");
- break;
- default:
- builder.append(c);
- }
- }
-
- return builder.toString();
- }
-
public SOAPEnvelope build(SOAPMessage soapMessage, Reader reader, boolean ignoreParseError) throws IOException, SOAPException
{
throw new NotImplementedException();
15 years, 1 month
JBossWS SVN: r11232 - common/trunk/src/main/java/org/jboss/wsf/common.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-12-09 12:59:28 -0500 (Wed, 09 Dec 2009)
New Revision: 11232
Added:
common/trunk/src/main/java/org/jboss/wsf/common/Normalizer.java
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java
Log:
[JBWS-2853] New string normalizer
Modified: common/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java 2009-12-09 16:36:36 UTC (rev 11231)
+++ common/trunk/src/main/java/org/jboss/wsf/common/DOMWriter.java 2009-12-09 17:59:28 UTC (rev 11232)
@@ -574,61 +574,10 @@
}
return (array);
}
-
+
/** Normalizes the given string. */
public static String normalize(String s, boolean canonical)
{
- int len = (s != null) ? s.length() : 0;
- StringBuilder str = new StringBuilder();
-
- for (int i = 0; i < len; i++)
- {
- char ch = s.charAt(i);
- switch (ch)
- {
- case '<':
- {
- str.append("<");
- break;
- }
- case '>':
- {
- str.append(">");
- break;
- }
- case '&':
- {
- str.append("&");
- break;
- }
- case '"':
- {
- str.append(""");
- break;
- }
- case '\'':
- {
- str.append("'");
- break;
- }
- case '\r':
- case '\n':
- {
- if (canonical)
- {
- str.append("&#");
- str.append(Integer.toString(ch));
- str.append(';');
- break;
- }
- // else, default append char
- }
- default:
- {
- str.append(ch);
- }
- }
- }
- return (str.toString());
+ return Normalizer.normalize(s, canonical);
}
}
Added: common/trunk/src/main/java/org/jboss/wsf/common/Normalizer.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/Normalizer.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/wsf/common/Normalizer.java 2009-12-09 17:59:28 UTC (rev 11232)
@@ -0,0 +1,130 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.common;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+*
+* @author <a href="mailto:mvecera@redhat.com">Martin Vecera</a>
+* @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
+* @since 09-Dic-2009
+*
+*/
+final public class Normalizer
+{
+ private static final Pattern PATTERN = Pattern.compile("[&<>'\"\r\n]");
+
+ public static String normalize(String strValue)
+ {
+ return normalize(strValue, false);
+ }
+
+ public static String normalize(String strValue, boolean canonical)
+ {
+ Matcher m = PATTERN.matcher(strValue);
+ if (m.find())
+ {
+ int pos = m.start(); // we can use previous match to skip some part at the string beginning
+ int len = strValue.length(); // just a single call to length()
+ char[] input = new char[len]; // this is to ommit calls to String.charAt()
+ strValue.getChars(0, len, input, 0);
+ StringBuilder sb = new StringBuilder(len * 3); // faster than StringBuffer, not thread safe
+
+ int copyStart = 0;
+
+ for (int i = pos; i < len; i++)
+ {
+ char ch = input[i];
+ switch (ch)
+ {
+ case '<':
+ if (copyStart < i)
+ {
+ sb.append(input, copyStart, i - copyStart);
+ }
+ copyStart = i + 1;
+ sb.append("<");
+ break;
+ case '>':
+ if (copyStart < i)
+ {
+ sb.append(input, copyStart, i - copyStart);
+ }
+ copyStart = i + 1;
+ sb.append(">");
+ break;
+ case '"':
+ if (copyStart < i)
+ {
+ sb.append(input, copyStart, i - copyStart);
+ }
+ copyStart = i + 1;
+ sb.append(""");
+ break;
+ case '\'':
+ if (copyStart < i)
+ {
+ sb.append(input, copyStart, i - copyStart);
+ }
+ copyStart = i + 1;
+ sb.append("'");
+ break;
+ case '&':
+ if (copyStart < i)
+ {
+ sb.append(input, copyStart, i - copyStart);
+ }
+ copyStart = i + 1;
+ sb.append("&");
+ break;
+ case '\r':
+ case '\n':
+ if (canonical)
+ {
+ if (copyStart < i)
+ {
+ sb.append(input, copyStart, i - copyStart);
+ }
+ copyStart = i + 1;
+ sb.append("&#");
+ sb.append(Integer.toString(ch));
+ sb.append(';');
+ break;
+ }
+
+ }
+ }
+ if (copyStart < len)
+ {
+ sb.append(input, copyStart, len - copyStart);
+ }
+
+ return sb.toString();
+ }
+ else
+ {
+ return strValue;
+ }
+ }
+}
Property changes on: common/trunk/src/main/java/org/jboss/wsf/common/Normalizer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 1 month
JBossWS SVN: r11231 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-09 11:36:36 -0500 (Wed, 09 Dec 2009)
New Revision: 11231
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
Log:
Remove lines that currently have no effect, but do not leave copy empty so that the dir is created
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-09 16:36:27 UTC (rev 11230)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-09 16:36:36 UTC (rev 11231)
@@ -261,8 +261,9 @@
</copy>
<copy todir="@{targetdir}" flatten="true" overwrite="true" verbose="true">
<fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
+ <include name="**/nothing-to-deploy"/>
+ <!-- <include name="**/jbossws-common.jar"/> -->
+ <!-- <include name="**/jbossws-framework.jar"/> -->
<!-- [JBWS-2505] -->
<!-- START -->
<!--
15 years, 1 month
JBossWS SVN: r11230 - common/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-12-09 11:36:27 -0500 (Wed, 09 Dec 2009)
New Revision: 11230
Modified:
common/trunk/pom.xml
Log:
Moving to jaxbintro 1.0.2-SNAPSHOT
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2009-12-09 15:59:05 UTC (rev 11229)
+++ common/trunk/pom.xml 2009-12-09 16:36:27 UTC (rev 11230)
@@ -26,7 +26,7 @@
<!-- Properties -->
<properties>
- <jboss.jaxbintros.version>1.0.1.GA</jboss.jaxbintros.version>
+ <jboss.jaxbintros.version>1.0.2-SNAPSHOT</jboss.jaxbintros.version>
<jaxws.api.version>2.1</jaxws.api.version>
<jboss.common.core.version>2.2.14.GA</jboss.common.core.version>
<jboss.ejb.api.version>3.0.0.GA</jboss.ejb.api.version>
15 years, 1 month
JBossWS SVN: r11229 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-09 10:59:05 -0500 (Wed, 09 Dec 2009)
New Revision: 11229
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
Log:
Makke commeting more clear
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-09 15:16:02 UTC (rev 11228)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-09 15:59:05 UTC (rev 11229)
@@ -61,11 +61,10 @@
<patternset id="jbossws.server.lib.patternset">
<include name="**/nothing-to-deploy"/>
<!-- Do not replace these until they are really different
- from the ones shipped with the JBoss ative EAP AS
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-spi.jar"/>
- -->
+ from the ones shipped with the JBoss ative EAP AS -->
+ <!-- <include name="**/jbossws-common.jar"/> -->
+ <!-- <include name="**/jbossws-framework.jar"/> -->
+ <!-- <include name="**/jbossws-spi.jar"/> -->
</patternset>
<patternset id="jbossws.service.lib.patternset">
15 years, 1 month
JBossWS SVN: r11228 - in stack/cxf/branches/jbossws-cxf-3.1.2: modules/resources/src/main/resources/bin and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: fnasser(a)redhat.com
Date: 2009-12-09 10:16:02 -0500 (Wed, 09 Dec 2009)
New Revision: 11228
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-project-gen.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Replace geronimo-ws-metadata with a jsr181-api.jar from Sun (CDDL)
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat 2009-12-09 14:31:06 UTC (rev 11227)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.bat 2009-12-09 15:16:02 UTC (rev 11228)
@@ -68,7 +68,7 @@
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-tools-wsdlto-frontend-jaxws.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-dv.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/cxf-xjc-ts.jar
-set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
+set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSCONSUME_CLASSPATH=%WSCONSUME_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh 2009-12-09 14:31:06 UTC (rev 11227)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsconsume.sh 2009-12-09 15:16:02 UTC (rev 11228)
@@ -107,7 +107,7 @@
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-tools-wsdlto-frontend-jaxws.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-dv.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/cxf-xjc-ts.jar"
-WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar"
+WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jsr181-api.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jaxws-api.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/jboss-javaee.jar"
WSCONSUME_CLASSPATH="$WSCONSUME_CLASSPATH:$LIBDIR/velocity.jar"
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2009-12-09 14:31:06 UTC (rev 11227)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.bat 2009-12-09 15:16:02 UTC (rev 11228)
@@ -68,7 +68,7 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-lang.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2009-12-09 14:31:06 UTC (rev 11227)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsprovide.sh 2009-12-09 15:16:02 UTC (rev 11228)
@@ -109,7 +109,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-lang.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/commons-logging.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/FastInfoset.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jsr181-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-javaee.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/neethi.jar"
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-12-09 14:31:06 UTC (rev 11227)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.bat 2009-12-09 15:16:02 UTC (rev 11228)
@@ -93,7 +93,7 @@
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-lang.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/commons-logging.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
+set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jsr181-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-12-09 14:31:06 UTC (rev 11227)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/bin/wsrunclient.sh 2009-12-09 15:16:02 UTC (rev 11228)
@@ -111,7 +111,7 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/commons-lang.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/commons-logging.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/FastInfoset.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/geronimo-ws-metadata_2.0_spec.jar"
+WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jsr181-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jaxws-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/jboss-javaee.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/neethi.jar"
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-12-09 14:31:06 UTC (rev 11227)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-12-09 15:16:02 UTC (rev 11228)
@@ -31,7 +31,8 @@
<include name="**/commons-lang.jar"/>
<include name="**/cxf-*.jar"/>
<include name="**/geronimo-javamail*.jar"/>
- <include name="**/geronimo-ws-metadata*.jar"/>
+ <!-- ws-metadata -->
+ <include name="**/jsr181-api.jar"/>
<include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
<include name="**/jaxb-xjc.jar"/>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-09 14:31:06 UTC (rev 11227)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-tp-installer-macros.xml 2009-12-09 15:16:02 UTC (rev 11228)
@@ -70,7 +70,8 @@
<patternset id="jbossws.service.lib.patternset">
<include name="**/cxf-*.jar"/>
- <include name="**/geronimo-ws-metadata*.jar"/>
+ <!-- ws-metadata -->
+ <include name="**/jsr181-api.jar"/>
<include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
<include name="**/jbossws-cxf-client*.jar"/>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-09 14:31:06 UTC (rev 11227)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2009-12-09 15:16:02 UTC (rev 11228)
@@ -137,11 +137,11 @@
<version>5.0.1.GA</version>
<scope>provided</scope>
</dependency>
+ <!-- ws-metadata -->
<dependency>
<groupId>javax.jws</groupId>
<artifactId>jsr181-api</artifactId>
<version>1.0-MR1</version>
- <scope>provided</scope>
</dependency>
<!-- CXF dependencies -->
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-project-gen.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-project-gen.xml 2009-12-09 14:31:06 UTC (rev 11227)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/distro/build-project-gen.xml 2009-12-09 15:16:02 UTC (rev 11228)
@@ -122,7 +122,8 @@
<pathelement location="${jboss.client}/jbossws-common.jar"/>
<pathelement location="${jboss.client}/jbossws-spi.jar"/>
<pathelement location="${jboss.client}/jbossws-cxf-client.jar"/>
- <pathelement location="${jboss.client}/geronimo-ws-metadata_2.0_spec.jar"/>
+ <!-- ws-metadata -->
+ <pathelement location="${jboss.client}/jsr181-api.jar"/>
<path refid="integration.target.javac.classpath" />
</path>
<eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" />
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 14:31:06 UTC (rev 11227)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-deploy-artifacts.xml 2009-12-09 15:16:02 UTC (rev 11228)
@@ -24,7 +24,8 @@
<includes>
<include>org.apache.cxf:cxf-*</include>
<!-- <include>javax.mail:mail*</include> -->
- <include>org.apache.geronimo.specs:geronimo-ws-metadata*</include>
+ <!-- ws-metadata -->
+ <include>javax.jws:jsr181-api:jar</include>
<include>javax.xml.bind:jaxb-api:jar</include>
<include>com.sun.xml.bind:jaxb-impl:jar</include>
<include>com.sun.xml.bind:jaxb-xjc:jar</include>
15 years, 1 month