JBossWS SVN: r12705 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-30 13:04:24 -0400 (Fri, 30 Jul 2010)
New Revision: 12705
Added:
stack/cxf/branches/cxf-2.3/
Log:
Branching cxf stack to "early" try changes for upgrading to Apache CXF 2.3
Copied: stack/cxf/branches/cxf-2.3 (from rev 12704, stack/cxf/trunk)
14 years, 5 months
JBossWS SVN: r12704 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-30 12:59:32 -0400 (Fri, 30 Jul 2010)
New Revision: 12704
Removed:
stack/cxf/branches/no-spring-support/
Log:
Removing branch not used anymore
14 years, 5 months
JBossWS SVN: r12703 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-30 12:51:25 -0400 (Fri, 30 Jul 2010)
New Revision: 12703
Modified:
stack/cxf/trunk/profiles.xml.example
Log:
Updating profiles.xml.example due to AS6 M4 release
Modified: stack/cxf/trunk/profiles.xml.example
===================================================================
--- stack/cxf/trunk/profiles.xml.example 2010-07-30 16:48:20 UTC (rev 12702)
+++ stack/cxf/trunk/profiles.xml.example 2010-07-30 16:51:25 UTC (rev 12703)
@@ -13,7 +13,7 @@
<properties>
<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>
- <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20100429-M3/build/target/jboss-6.0.0.20100429-M3</jboss600.home>
+ <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20100721-M4/build/target/6.0.0.20100721-M4</jboss600.home>
<jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss601.home>
</properties>
</profile>
14 years, 5 months
JBossWS SVN: r12702 - stack/cxf/branches/jbossws-cxf-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-30 12:48:20 -0400 (Fri, 30 Jul 2010)
New Revision: 12702
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
Moving to Spring 2.5.6.SEC02
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-07-29 17:40:16 UTC (rev 12701)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2010-07-30 16:48:20 UTC (rev 12702)
@@ -53,7 +53,7 @@
-->
<!-- END -->
<cxf.version>2.2.6</cxf.version>
- <cxf.spring.version>2.5.6.SEC01</cxf.spring.version>
+ <cxf.spring.version>2.5.6.SEC02</cxf.spring.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>3.1</cxf.asm.version>
<jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
14 years, 5 months
JBossWS SVN: r12701 - framework/branches/jbossws-framework-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-29 13:40:16 -0400 (Thu, 29 Jul 2010)
New Revision: 12701
Modified:
framework/branches/jbossws-framework-3.1.2/pom.xml
Log:
Use jboss-common-core instead of legacy jboss-common
Modified: framework/branches/jbossws-framework-3.1.2/pom.xml
===================================================================
--- framework/branches/jbossws-framework-3.1.2/pom.xml 2010-07-29 08:22:20 UTC (rev 12700)
+++ framework/branches/jbossws-framework-3.1.2/pom.xml 2010-07-29 17:40:16 UTC (rev 12701)
@@ -26,7 +26,7 @@
<properties>
<jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.version>
<jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
- <jboss.common.version>1.2.1.GA</jboss.common.version>
+ <jboss.common.core.version>2.2.16.GA</jboss.common.core.version>
<jbossxb.version>1.0.0.SP1</jbossxb.version>
<jms.api.version>1.1</jms.api.version>
</properties>
@@ -92,9 +92,9 @@
<!-- jboss provided -->
<dependency>
- <groupId>jboss.common</groupId>
- <artifactId>jboss-common</artifactId>
- <version>${jboss.common.version}</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>${jboss.common.core.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
14 years, 5 months
JBossWS SVN: r12700 - in stack/cxf/branches/jbossws-cxf-3.1.2/src/main: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-07-29 04:22:20 -0400 (Thu, 29 Jul 2010)
New Revision: 12700
Added:
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/jboss-web.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/web.xml
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build-deploy.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml
Log:
- [JBPAPP-3823] Applying Yiqiao / Fernando 's patch for supporting EWP
- securing console after installer run and adding ant target for noauth version
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build-deploy.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build-deploy.xml 2010-07-28 16:42:24 UTC (rev 12699)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build-deploy.xml 2010-07-29 08:22:20 UTC (rev 12700)
@@ -14,39 +14,45 @@
<!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.1.x -->
<!-- ================================================================== -->
-
- <target name="deploy-structure-jboss51" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <!-- all -->
- <antcall target="deploy-jbossws-cxf51" inheritall="false">
+
+ <target name="deploy-jbossws-cxf51-all" if="jbossws.all.available">
+ <antcall target="deploy-jbossws-cxf51" inheritall="false" >
<param name="installserver" value="${deploy.structure}/server/all"/>
<param name="jbossid" value="jboss510"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
</antcall>
- <!-- standard -->
- <antcall target="deploy-jbossws-cxf51" inheritall="false">
+ </target>
+
+ <target name="deploy-jbossws-cxf51-standard" if="jbossws.standard.available">
+ <antcall target="deploy-jbossws-cxf51" inheritall="false" >
<param name="installserver" value="${deploy.structure}/server/standard"/>
<param name="jbossid" value="jboss510"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
</antcall>
- <!-- production -->
- <antcall target="deploy-jbossws-cxf51" inheritall="false">
+ </target>
+
+ <target name="deploy-jbossws-cxf51-production" if="jbossws.production.available">
+ <antcall target="deploy-jbossws-cxf51" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/production"/>
<param name="jbossid" value="jboss510"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
</antcall>
- <!-- web -->
- <antcall target="deploy-jbossws-cxf51" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/web"/>
- <param name="jbossid" value="jboss510"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- <!-- default -->
- <antcall target="deploy-jbossws-cxf51" inheritall="false">
+ </target>
+
+ <target name="deploy-jbossws-cxf51-web" if="jbossws.web.available">
+ <antcall target="deploy-jbossws-cxf51" inheritall="false" >
+ <param name="installserver" value="${deploy.structure}/server/web"/>
+ <param name="jbossid" value="jboss510"/>
+ <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ </target>
+
+ <target name="deploy-jbossws-cxf51-default" if="jbossws.default.available">
+ <antcall target="deploy-jbossws-cxf51" inheritall="false">
<param name="installserver" value="${deploy.structure}/server/default"/>
<param name="jbossid" value="jboss510"/>
<param name="artifactsdir" value="${deploy.artifacts.dir}"/>
@@ -54,10 +60,24 @@
</antcall>
</target>
+ <target name="deploy-structure-jboss51" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <!-- all -->
+ <antcall target="deploy-jbossws-cxf51-all"/>
+ <!-- standard -->
+ <antcall target="deploy-jbossws-cxf51-standard"/>
+ <!-- production -->
+ <antcall target="deploy-jbossws-cxf51-production"/>
+ <!-- web -->
+ <antcall target="deploy-jbossws-cxf51-web"/>
+ <!-- default -->
+ <antcall target="deploy-jbossws-cxf51-default"/>
+ </target>
+
<!-- ================================================================== -->
<!-- Deployment JBoss510 -->
<!-- ================================================================== -->
-
+
<target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51">
<fail message="Please make sure you're running this script from $JBOSS_HOME/jbossws-cxf-installer" unless="jboss510.available"/>
<copy todir="${jboss510.home}" overwrite="true">
@@ -68,11 +88,27 @@
<target name="undeploy-jboss510" depends="init">
<fail message="Please make sure you're running this script from your $JBOSS_HOME/jbossws-cxf-installer" unless="jboss510.available"/>
+ <antcall target="undeploy-jboss510-all"/>
+ <antcall target="undeploy-jboss510-production"/>
+ <antcall target="undeploy-jboss510-web"/>
+ <antcall target="undeploy-jboss510-standard"/>
+ <antcall target="undeploy-jboss510-default"/>
+ </target>
+
+ <target name="undeploy-jboss510-all" if="jbossws.all.available">
<macro-undeploy-jbossws51 targetdir="${jboss510.home}/server/all/deploy/jbossws.sar" defaultconf="${jbossws.all.deploy.conf}"/>
+ </target>
+ <target name="undeploy-jboss510-production" if="jbossws.production.available">
<macro-undeploy-jbossws51 targetdir="${jboss510.home}/server/production/deploy/jbossws.sar" defaultconf="${jbossws.production.deploy.conf}"/>
- <macro-undeploy-jbossws51 targetdir="${jboss510.home}/server/web/deploy/jbossws.sar" defaultconf="${jbossws.web.deploy.conf}"/>
+ </target>
+ <target name="undeploy-jboss510-web" if="jbossws.web.available">
+ <macro-undeploy-jbossws51 targetdir="${jboss510.home}/server/web/deploy/jbossws.sar" defaultconf="${jbossws.web.deploy.conf}"/>
+ </target>
+ <target name="undeploy-jboss510-standard" if="jbossws.standard.available">
<macro-undeploy-jbossws51 targetdir="${jboss510.home}/server/standard/deploy/jbossws.sar" defaultconf="${jbossws.standard.deploy.conf}"/>
- <macro-undeploy-jbossws51 targetdir="${jboss510.home}/server/default/deploy/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
+ <target name="undeploy-jboss510-default" if="jbossws.default.available">
+ <macro-undeploy-jbossws51 targetdir="${jboss510.home}/server/default/deploy/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
</project>
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml 2010-07-28 16:42:24 UTC (rev 12699)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/build.xml 2010-07-29 08:22:20 UTC (rev 12700)
@@ -29,11 +29,39 @@
<property name="jbossws.integration.target" value="jboss510"/>
<property name="jboss510.home" value="${basedir}/.."/>
-
+ <available property="jbossws.default.available" file="${jboss510.home}/server/default"/>
+ <available property="jbossws.standard.available" file="${jboss510.home}/server/standard"/>
+ <available property="jbossws.production.available" file="${jboss510.home}/server/production"/>
+ <available property="jbossws.web.available" file="${jboss510.home}/server/web"/>
+ <available property="jbossws.all.available" file="${jboss510.home}/server/all"/>
+
<import file="${build.dir}/build-setup.xml"/>
<import file="${build.dir}/build-deploy.xml"/>
<import file="${build.dir}/jbossws-installer-macros.xml"/>
+
+ <target name="secure-console">
+ <!-- all -->
+ <copy file="build/web.xml" tofile="${jboss510.home}/server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml" overwrite="true"/>
+ <copy file="build/jboss-web.xml" tofile="${jboss510.home}/server/all/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml" overwrite="true"/>
+
+ <!-- production -->
+ <copy file="build/web.xml" tofile="${jboss510.home}/server/production/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml" overwrite="true"/>
+ <copy file="build/jboss-web.xml" tofile="${jboss510.home}/server/production/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml" overwrite="true"/>
+
+ <!-- web -->
+ <copy file="build/web.xml" tofile="${jboss510.home}/server/web/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml" overwrite="true"/>
+ <copy file="build/jboss-web.xml" tofile="${jboss510.home}/server/web/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml" overwrite="true"/>
+
+ <!-- standard -->
+ <copy file="build/web.xml" tofile="${jboss510.home}/server/standard/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml" overwrite="true"/>
+ <copy file="build/jboss-web.xml" tofile="${jboss510.home}/server/standard/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml" overwrite="true"/>
+
+ <!-- default -->
+ <copy file="build/web.xml" tofile="${jboss510.home}/server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml" overwrite="true"/>
+ <copy file="build/jboss-web.xml" tofile="${jboss510.home}/server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/jboss-web.xml" overwrite="true"/>
+ </target>
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
@@ -52,10 +80,15 @@
<!-- dummy targets -->
<target name="prepare-deploy" depends="init"/>
- <target name="install" depends="clean, deploy-jboss510" description="Install JBossWS-CXF">
+ <target name="install" depends="clean, deploy-jboss510, secure-console" description="Install JBossWS-CXF">
<echo message="-----------------------------------------------------------------------"/>
</target>
+ <!-- copy noauth xml files over to server/<config> dir to disable authentication when "ant noauth" is called -->
+ <target name="install-noauth" depends="clean, deploy-jboss510" description="Install JBossWS-CXF with no authentication">
+ <echo message="-----------------------------------------------------------------------"/>
+ </target>
+
<target name="clean" depends="prepare">
<delete dir="${output.dir}"/>
</target>
Added: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/jboss-web.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/jboss-web.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/jboss-web.xml 2010-07-29 08:22:20 UTC (rev 12700)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE jboss-web
+ PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
+
+<jboss-web>
+
+ <!-- A security domain that restricts access -->
+ <security-domain>java:/jaas/jmx-console</security-domain>
+
+ <context-root>jbossws</context-root>
+
+</jboss-web>
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/web.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/web.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/web.xml 2010-07-29 08:22:20 UTC (rev 12700)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ A web application that installs the JBossWS servlets
+-->
+
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>JBossWS</display-name>
+
+ <servlet>
+ <servlet-name>ContextServlet</servlet-name>
+ <servlet-class>org.jboss.wsf.framework.management.ContextServlet</servlet-class>
+ </servlet>
+
+ <!-- now the mappings -->
+
+ <servlet-mapping>
+ <servlet-name>ContextServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- A security constraint that restricts access -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>ContextServlet</web-resource-name>
+ <description>An example security config that only allows users with the
+ role 'JBossAdmin' to access the JBossWS console web application
+ </description>
+ <url-pattern>/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>JBossWS Management Console</realm-name>
+ </login-config>
+
+ <security-role>
+ <role-name>JBossAdmin</role-name>
+ </security-role>
+
+ <!--
+ currently the W3C haven't settled on a media type for WSDL;
+ http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
+ for now we go with the basic 'it's XML' response
+ -->
+ <mime-mapping>
+ <extension>wsdl</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <mime-mapping>
+ <extension>xsd</extension>
+ <mime-type>text/xml</mime-type>
+ </mime-mapping>
+
+ <welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml 2010-07-28 16:42:24 UTC (rev 12699)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/scripts/assembly-installer.xml 2010-07-29 08:22:20 UTC (rev 12700)
@@ -25,7 +25,18 @@
<include>build-setup.xml</include>
</includes>
</fileSet>
+
+ <!-- include secure version of files web.xml, jboss-web.xml -->
<fileSet>
+ <directory>src/main/installer</directory>
+ <outputDirectory>build</outputDirectory>
+ <includes>
+ <include>web.xml</include>
+ <include>jboss-web.xml</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
<directory>modules/resources/src/main/resources/resources</directory>
<outputDirectory>build</outputDirectory>
<includes>
14 years, 5 months
JBossWS SVN: r12699 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-28 12:42:24 -0400 (Wed, 28 Jul 2010)
New Revision: 12699
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
JBossAS M3 -> M4 switch
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2010-07-28 16:42:11 UTC (rev 12698)
+++ stack/native/trunk/modules/testsuite/pom.xml 2010-07-28 16:42:24 UTC (rev 12699)
@@ -457,6 +457,27 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
</exclusion>
+ <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF -->
+ <exclusion>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-management</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ </exclusion>
+ <exclusion>
+ <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>
14 years, 5 months
JBossWS SVN: r12698 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-28 12:42:11 -0400 (Wed, 28 Jul 2010)
New Revision: 12698
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
JBossAS M3 -> M4 switch
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2010-07-28 16:41:56 UTC (rev 12697)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2010-07-28 16:42:11 UTC (rev 12698)
@@ -532,6 +532,27 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
</exclusion>
+ <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF -->
+ <exclusion>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-management</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ </exclusion>
+ <exclusion>
+ <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>
14 years, 5 months
JBossWS SVN: r12697 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-28 12:41:56 -0400 (Wed, 28 Jul 2010)
New Revision: 12697
Modified:
stack/metro/trunk/modules/testsuite/pom.xml
Log:
JBossAS M3 -> M4 switch
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2010-07-28 16:05:21 UTC (rev 12696)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2010-07-28 16:41:56 UTC (rev 12697)
@@ -505,6 +505,27 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
</exclusion>
+ <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF -->
+ <exclusion>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-management</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ </exclusion>
+ <exclusion>
+ <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>
14 years, 5 months
JBossWS SVN: r12696 - in stack/native/trunk: modules/core and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-07-28 12:05:21 -0400 (Wed, 28 Jul 2010)
New Revision: 12696
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
JBossAS M3 -> M4 switch
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2010-07-28 15:49:32 UTC (rev 12695)
+++ stack/native/trunk/modules/core/pom.xml 2010-07-28 16:05:21 UTC (rev 12696)
@@ -221,8 +221,8 @@
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600M3</artifactId>
- <version>${jbossws.jboss600M3.version}</version>
+ <artifactId>jbossws-jboss600M4</artifactId>
+ <version>${jbossws.jboss600M4.version}</version>
<classifier>resources</classifier>
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2010-07-28 15:49:32 UTC (rev 12695)
+++ stack/native/trunk/modules/management/pom.xml 2010-07-28 16:05:21 UTC (rev 12696)
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600M3</artifactId>
+ <artifactId>jbossws-jboss600M4</artifactId>
<scope>provided</scope>
</dependency>
<!-- [JBWS-2505] -->
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2010-07-28 15:49:32 UTC (rev 12695)
+++ stack/native/trunk/modules/testsuite/pom.xml 2010-07-28 16:05:21 UTC (rev 12696)
@@ -441,7 +441,7 @@
<profile>
<id>jboss600</id>
<properties>
- <jboss.version>6.0.0.20100429-M3</jboss.version>
+ <jboss.version>6.0.0.20100721-M4</jboss.version>
<jbossws.integration.target>jboss600</jbossws.integration.target>
</properties>
<dependencies>
@@ -457,7 +457,7 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
</exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-Native (AS 6.0.0.M3) -->
+ <!-- Exclusions for preventing cyclic dependency on JBossWS-Native -->
<exclusion>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-client</artifactId>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-07-28 15:49:32 UTC (rev 12695)
+++ stack/native/trunk/pom.xml 2010-07-28 16:05:21 UTC (rev 12696)
@@ -51,7 +51,7 @@
<jbossws.framework.version>3.4.0-SNAPSHOT</jbossws.framework.version>
<jbossws.jboss501.version>3.4.0-SNAPSHOT</jbossws.jboss501.version>
<jbossws.jboss510.version>3.4.0-SNAPSHOT</jbossws.jboss510.version>
- <jbossws.jboss600M3.version>3.4.0-SNAPSHOT</jbossws.jboss600M3.version>
+ <jbossws.jboss600M4.version>3.4.0-SNAPSHOT</jbossws.jboss600M4.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
@@ -134,13 +134,13 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600M3</artifactId>
- <version>${jbossws.jboss600M3.version}</version>
+ <artifactId>jbossws-jboss600M4</artifactId>
+ <version>${jbossws.jboss600M4.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600M3</artifactId>
- <version>${jbossws.jboss600M3.version}</version>
+ <artifactId>jbossws-jboss600M4</artifactId>
+ <version>${jbossws.jboss600M4.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-28 15:49:32 UTC (rev 12695)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-28 16:05:21 UTC (rev 12696)
@@ -152,7 +152,7 @@
<scope>provided</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss600M3:jar</include>
+ <include>org.jboss.ws:jbossws-jboss600M4:jar</include>
</includes>
</dependencySet>
<!-- [JBWS-2505] -->
14 years, 5 months