[jbossws-commits] JBossWS SVN: r14891 - in stack/native/trunk: modules/core and 6 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Wed Aug 17 06:54:00 EDT 2011


Author: richard.opalka at jboss.com
Date: 2011-08-17 06:54:00 -0400 (Wed, 17 Aug 2011)
New Revision: 14891

Modified:
   stack/native/trunk/build.xml
   stack/native/trunk/modules/core/pom.xml
   stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
   stack/native/trunk/modules/dist/management/pom.xml
   stack/native/trunk/modules/dist/pom.xml
   stack/native/trunk/modules/dist/src/main/distro/Install.txt
   stack/native/trunk/modules/dist/src/main/distro/ant.properties.example
   stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
   stack/native/trunk/modules/dist/src/main/distro/build-setup.xml
   stack/native/trunk/modules/dist/src/main/distro/build.xml
   stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
   stack/native/trunk/modules/testsuite/pom.xml
   stack/native/trunk/pom.xml
Log:
support for AS 6.1.0.Final

Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml	2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/build.xml	2011-08-17 10:54:00 UTC (rev 14891)
@@ -57,8 +57,8 @@
     <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 property="jboss610.home" value="${profiles.profile.properties.jboss610.home}">
+      <isset property="profiles.profile.properties.jboss610.home"/>
     </condition>
     <condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}">
       <isset property="profiles.profile.properties.jboss700.home"/>
@@ -68,14 +68,14 @@
       <isset property="profiles.profile.properties.jboss710.home"/>
     </condition>
 
-    <fail message="jboss home not set, use -Djboss600.home=value or -Djboss601.home=value, -Djboss700.home=value or -Djboss710.home=value to set">
+    <fail message="jboss home not set, use -Djboss600.home=value or -Djboss610.home=value, -Djboss700.home=value or -Djboss710.home=value to set">
      <condition>
       <and>
        <not>
          <isset property="jboss600.home"/>
        </not>
        <not>
-         <isset property="jboss601.home"/>
+         <isset property="jboss610.home"/>
        </not>
        <not>
          <isset property="jboss700.home"/>
@@ -89,7 +89,7 @@
 
     <echo/>
     <echo message="jboss600.home=${jboss600.home}"/>
-    <echo message="jboss601.home=${jboss601.home}"/>
+    <echo message="jboss610.home=${jboss610.home}"/>
     <echo message="jboss700.home=${jboss700.home}"/>
     <echo message="jboss710.home=${jboss710.home}"/>
   </target>

Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml	2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/core/pom.xml	2011-08-17 10:54:00 UTC (rev 14891)
@@ -221,34 +221,17 @@
                   <type>zip</type>
                   <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
                 </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <!-- [JBWS-2505] -->
-          <!-- START -->
-          <!--
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems>
-              <artifactItems>
                 <artifactItem>
                   <groupId>org.jboss.ws</groupId>
-                  <artifactId>jbossws-jboss600x</artifactId>
-                  <version>${jbossws.jboss601.version}</version>
+                  <artifactId>jbossws-jboss610</artifactId>
+                  <version>${jbossws.jboss610.version}</version>
                   <classifier>resources</classifier>
                   <type>zip</type>
-                  <outputDirectory>${project.build.directory}/resources/jbossws-jboss601</outputDirectory>
+                  <outputDirectory>${project.build.directory}/resources/jbossws-jboss610</outputDirectory>
                 </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
-          -->
-          <!-- END -->
         </executions>
       </plugin>
       <!-- http://jira.codehaus.org/browse/MANTRUN-89 -->

Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml	2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml	2011-08-17 10:54:00 UTC (rev 14891)
@@ -23,7 +23,7 @@
 
     <copy
       file="${src.dir}/jbossws-native-config-as6.xml"
-      tofile="${dest.dir}/jbossws-jboss601/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
+      tofile="${dest.dir}/jbossws-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
     />
 
     <copy

Modified: stack/native/trunk/modules/dist/management/pom.xml
===================================================================
--- stack/native/trunk/modules/dist/management/pom.xml	2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/management/pom.xml	2011-08-17 10:54:00 UTC (rev 14891)
@@ -43,16 +43,21 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <!-- [JBWS-2505] -->
-    <!-- START -->
-    <!--
     <dependency>
       <groupId>org.jboss.ws</groupId>
-      <artifactId>jbossws-jboss600x</artifactId>
+      <artifactId>jbossws-jboss610</artifactId>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>sun-jaxb</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
-    -->
-    <!-- END -->
     <dependency>
       <groupId>org.jboss.jaxr</groupId>
       <artifactId>juddi-service</artifactId>

Modified: stack/native/trunk/modules/dist/pom.xml
===================================================================
--- stack/native/trunk/modules/dist/pom.xml	2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/pom.xml	2011-08-17 10:54:00 UTC (rev 14891)
@@ -92,7 +92,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <!--jboss600-->
     <dependency>
       <groupId>org.jboss.ws</groupId>
       <artifactId>jbossws-jboss600</artifactId>
@@ -109,6 +108,22 @@
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>org.jboss.ws</groupId>
+      <artifactId>jbossws-jboss610</artifactId>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>sun-jaxb</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <!--junit-->
     <dependency>
       <groupId>junit</groupId>
@@ -167,8 +182,8 @@
                 </xslt>
                 <xslt style="${basedir}/src/main/distro/test-exclude.xsl"
                   in="../testsuite/pom.xml"
-                  out="${basedir}/target/exclude-file/test-excludes-jboss601.txt">
-                  <param name="targetName" expression="jboss601" />
+                  out="${basedir}/target/exclude-file/test-excludes-jboss610.txt">
+                  <param name="targetName" expression="jboss610" />
                 </xslt>
                 <xslt style="${basedir}/src/main/distro/test-exclude.xsl"
                   in="../testsuite/pom.xml"

Modified: stack/native/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/Install.txt	2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/src/main/distro/Install.txt	2011-08-17 10:54:00 UTC (rev 14891)
@@ -14,14 +14,14 @@
 3.) Execute one of the following
 
 	ant deploy-jboss600
-	ant deploy-jboss601
+	ant deploy-jboss610
 
     By default the SOAP stack will be installed to 'default' configuration.
 If users want to install SOAP stack to different JBossAS configuration then
 they have to specify -Djboss.server.instance=foo JVM property.
 Supported configurations of the installer are 'default', 'all' and 'standard'.
 
-	ant -Djboss.server.instance=standard deploy-jboss600
+	ant -Djboss.server.instance=standard deploy-jboss610
 
 4.) Execute the samples to verify your installation
 

Modified: stack/native/trunk/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/ant.properties.example	2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/src/main/distro/ant.properties.example	2011-08-17 10:54:00 UTC (rev 14891)
@@ -4,12 +4,12 @@
 
 # Optional JBoss Home
 jboss600.home=@jboss600.home@
-jboss601.home=@jboss601.home@
+jboss610.home=@jboss610.home@
 jboss700.home=@jboss700.home@
 jboss710.home=@jboss710.home@
 
-# The JBoss server under test. This can be [jboss600|jboss601|jboss700|jboss710]
-jbossws.integration.target=jboss601
+# The JBoss server under test. This can be [jboss600|jboss610|jboss700|jboss710]
+jbossws.integration.target=jboss610
 
 # The JBoss settings
 jboss.server.instance=default

Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml	2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml	2011-08-17 10:54:00 UTC (rev 14891)
@@ -53,44 +53,44 @@
   </target>
 
   <!-- ================================================================== -->
-  <!-- Prepare Deployment Structure JBoss-6.0.x                           -->
+  <!-- Prepare Deployment Structure JBoss-6.1.0                           -->
   <!-- ================================================================== -->
 
-  <target name="deploy-structure-jboss601" depends="prepare-deploy">
+  <target name="deploy-structure-jboss610" depends="prepare-deploy">
     <delete dir="${deploy.structure}"/>
     <antcall target="deploy-jbossws-native" inheritall="false">
       <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
       <param name="jbossid" value="${jbossws.integration.target}"/>
       <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
       <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
-      <param name="modifyjbossintegration" value="false"/><!-- [JBWS-2505] -->
+      <param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] -->
     </antcall>
     <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
   </target>
 
   <!-- ================================================================== -->
-  <!-- Deployment JBoss601                                                -->
+  <!-- Deployment JBoss610                                                -->
   <!-- ================================================================== -->
 
-  <target name="target-jboss601">
-    <property name="jbossws.integration.target" value="jboss601"/>
+  <target name="target-jboss610">
+    <property name="jbossws.integration.target" value="jboss610"/>
     <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
   </target>
 
-  <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" verbose="true">
+  <target name="deploy-jboss610" depends="undeploy-jboss610,deploy-structure-jboss610" description="Deploy jbossws to jboss610">
+    <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
+    <copy todir="${jboss610.home}" overwrite="true" verbose="true">
       <fileset dir="${deploy.structure}"/>
     </copy>
-    <chmod dir="${jboss601.home}/bin" perm="+x" includes="*.sh"/>
+    <chmod dir="${jboss610.home}/bin" perm="+x" includes="*.sh"/>
   </target>
 
-  <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}"
+  <target name="undeploy-jboss610" depends="target-jboss610,init" description="Remove jbossws from jboss610">
+    <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
+    <macro-undeploy-jbossws targetdir="${jboss610.server}"
     	                    defaultconf="${jbossws.default.deploy.conf}"
     	                    defaultserverconf="${jbossws.default.server.deploy.conf}"
-    	                    modifyjbossintegration="false"/><!-- [JBWS-2505] -->
+    	                    modifyjbossintegration="true"/><!-- [JBWS-2505] -->
   </target>
 
   <!-- ================================================================== -->

Modified: stack/native/trunk/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build-setup.xml	2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/src/main/distro/build-setup.xml	2011-08-17 10:54:00 UTC (rev 14891)
@@ -28,24 +28,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="jboss610.lib" value="${jboss610.home}/lib"/>
+    <property name="jboss610.client" value="${jboss610.home}/client"/>
+    <property name="jboss610.server" value="${jboss610.home}/server/${jboss.server.instance}"/>
+    <property name="jboss610.server.lib" value="${jboss610.home}/common/lib"/>
+    <property name="jboss610.server.deploy" value="${jboss610.server}/deploy"/>
+    <property name="jboss610.server.deployers" value="${jboss610.server}/deployers"/>
 
     <property name="jboss700.modules" value="${jboss700.home}/modules"/>
     <property name="jboss710.modules" value="${jboss710.home}/modules"/>
 
     <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
-    <property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/>
+    <property name="jboss610.available.file" value="${jboss610.client}/jboss-client.jar"/>
     <property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/>
     <property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/>
 
 
     <available property="jboss600.available" file="${jboss600.available.file}"/>
-    <available property="jboss601.available" file="${jboss601.available.file}"/>
+    <available property="jboss610.available" file="${jboss610.available.file}"/>
     <available property="jboss700.available" file="${jboss700.available.file}"/>
     <available property="jboss710.available" file="${jboss710.available.file}"/>
 

Modified: stack/native/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/build.xml	2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/src/main/distro/build.xml	2011-08-17 10:54:00 UTC (rev 14891)
@@ -50,7 +50,7 @@
     <condition property="jbossws.integration.jboss60" value="true">
       <or>
         <equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
-        <equals arg1="${jbossws.integration.target}" arg2="jboss601"/>
+        <equals arg1="${jbossws.integration.target}" arg2="jboss610"/>
       </or>
     </condition>
     <condition property="jbossws.integration.jboss70" value="true">

Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml	2011-08-17 10:54:00 UTC (rev 14891)
@@ -91,6 +91,7 @@
         <include>juddi:juddi:jar</include>
         <include>org.jboss.ws:jbossws-common-tools:jar</include>
         <include>org.jboss.ws:jbossws-jboss600:jar</include>
+        <include>org.jboss.ws:jbossws-jboss610:jar</include>
         <include>org.jboss:jbossxb:jar</include>
         <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include>
       </includes>
@@ -194,18 +195,6 @@
       <useProjectArtifact>false</useProjectArtifact>
     </dependencySet>
 
-    <!-- [JBWS-2505] -->
-    <!-- START -->
-    <!--
-      <dependencySet>
-      <outputDirectory>deploy-artifacts/lib</outputDirectory>
-      <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>
-      <useStrictFiltering>true</useStrictFiltering>
-      <scope>provided</scope> <unpack>false</unpack> <includes>
-      <include>org.jboss.ws:jbossws-jboss600x:jar</include> </includes>
-      </dependencySet>
-    -->
-    <!-- END -->
   </dependencySets>
 
 

Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml	2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/modules/testsuite/pom.xml	2011-08-17 10:54:00 UTC (rev 14891)
@@ -513,7 +513,6 @@
               <groupId>org.slf4j</groupId>
               <artifactId>slf4j-log4j12</artifactId>
             </exclusion>
-            
             <!-- Exclude Sun's stax implementation : com.sun.xml.stream:sjsxp:jar:1.0.1 --> 
             <exclusion>
               <groupId>org.jboss.resteasy</groupId>
@@ -561,15 +560,15 @@
     </profile>
 
     <!--
-    Name:  jboss601
-    Descr: JBoss-6.0.1 specific options
+    Name:  jboss610
+    Descr: JBoss-6.1.0 specific options
     -->
     <profile>
-      <id>jboss601</id>
+      <id>jboss610</id>
       <properties>
-        <jboss.version>6.0.1-SNAPSHOT</jboss.version>
-        <jbossws.integration.target>jboss601</jbossws.integration.target>
-        <endorsed.dirs>${jboss601.home}/lib/endorsed</endorsed.dirs>
+        <jboss.version>6.1.0.Final</jboss.version>
+        <jbossws.integration.target>jboss610</jbossws.integration.target>
+        <endorsed.dirs>${jboss610.home}/lib/endorsed</endorsed.dirs>
       </properties>
       <dependencies>
         <dependency>
@@ -584,7 +583,7 @@
               <groupId>org.jboss.jbossas</groupId>
               <artifactId>jboss-as-webservices</artifactId>
             </exclusion>
-            <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF (AS 6.0.0) -->
+            <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF -->
             <exclusion>
               <groupId>org.jboss.ws.cxf</groupId>
               <artifactId>jbossws-cxf-client</artifactId>
@@ -605,20 +604,37 @@
               <groupId>org.jboss.ws.cxf</groupId>
               <artifactId>jbossws-cxf-resources</artifactId>
             </exclusion>
+            <!-- Exclusions for preventing cyclic dependency on JBossWS-Native -->
             <exclusion>
               <groupId>org.jboss.ws.native</groupId>
+              <artifactId>jbossws-native-client</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.jboss.ws.native</groupId>
+              <artifactId>jbossws-native-core</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.jboss.ws.native</groupId>
               <artifactId>jbossws-native-factories</artifactId>
             </exclusion>
             <exclusion>
               <groupId>org.jboss.ws.native</groupId>
-              <artifactId>jbossws-native-client</artifactId>
+              <artifactId>jbossws-native-jaxrpc</artifactId>
             </exclusion>
             <exclusion>
               <groupId>org.jboss.ws.native</groupId>
-              <artifactId>jbossws-native-core</artifactId>
+              <artifactId>jbossws-native-saaj</artifactId>
             </exclusion>
             <exclusion>
               <groupId>org.jboss.ws.native</groupId>
+              <artifactId>jbossws-native-management</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.jboss.ws.native</groupId>
+              <artifactId>jbossws-native-resources</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.jboss.ws.native</groupId>
               <artifactId>jbossws-native-services</artifactId>
             </exclusion>
             <exclusion>
@@ -657,7 +673,7 @@
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs}</argLine>
+              <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs} -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine>
               <excludes>
                 <!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
                 <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude>

Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml	2011-08-17 10:11:09 UTC (rev 14890)
+++ stack/native/trunk/pom.xml	2011-08-17 10:54:00 UTC (rev 14891)
@@ -50,12 +50,7 @@
     <jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.version>
     <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version>
     <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
-    <!-- [JBWS-2505] -->
-    <!-- START -->
-    <!--
-    <jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-    -->
-    <!-- END -->
+    <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
     <jboss700.version>7.0.0.Final</jboss700.version>
     <ant.version>1.7.1</ant.version>
     <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
@@ -118,27 +113,22 @@
         <type>zip</type>
       </dependency>
       <dependency>
-        <groupId>org.jboss.as</groupId>
-        <artifactId>jboss-as-webservices-tests-integration</artifactId>
-        <version>${jboss700.version}</version>
-      </dependency>
-      <!-- [JBWS-2505] -->
-      <!-- START -->
-      <!--
-      <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss600x</artifactId>
-        <version>${jbossws.jboss601.version}</version>
+        <artifactId>jbossws-jboss610</artifactId>
+        <version>${jbossws.jboss610.version}</version>
       </dependency>
       <dependency>
         <groupId>org.jboss.ws</groupId>
-        <artifactId>jbossws-jboss600x</artifactId>
-        <version>${jbossws.jboss601.version}</version>
+        <artifactId>jbossws-jboss610</artifactId>
+        <version>${jbossws.jboss610.version}</version>
         <classifier>resources</classifier>
         <type>zip</type>
       </dependency>
-      -->
-      <!-- END -->
+      <dependency>
+        <groupId>org.jboss.as</groupId>
+        <artifactId>jboss-as-webservices-tests-integration</artifactId>
+        <version>${jboss700.version}</version>
+      </dependency>
       <!-- provided apis -->
       <dependency>
         <groupId>org.apache.ant</groupId>
@@ -546,14 +536,14 @@
     </profile>
 
     <!--
-    Name:  jboss601
-    Descr: JBoss-6.0.1 specific options
+    Name:  jboss610
+    Descr: JBoss-6.1.0 specific options
     -->
     <profile>
-      <id>jboss601</id>
+      <id>jboss610</id>
       <properties>
-        <jbossws.integration.target>jboss601</jbossws.integration.target>
-        <jboss.home>${jboss601.home}</jboss.home>
+        <jbossws.integration.target>jboss610</jbossws.integration.target>
+        <jboss.home>${jboss610.home}</jboss.home>
       </properties>
     </profile>
 



More information about the jbossws-commits mailing list