[jbossws-commits] JBossWS SVN: r3865 - in branches/tdiesler/trunk: integration/jboss42/src/main/resources and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu Jul 12 12:50:27 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-07-12 12:50:26 -0400 (Thu, 12 Jul 2007)
New Revision: 3865
Added:
branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.sar/
branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.sar/META-INF/
branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.sar/jbossws-deployer.beans/
Removed:
branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-deployer.beans/
branches/tdiesler/trunk/integration/native/src/main/resources/jbossws-native42.sar/
Modified:
branches/tdiesler/trunk/build/ant.properties.example
branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.sar/jbossws-deployer.beans/META-INF/jboss-beans.xml
branches/tdiesler/trunk/integration/native/build.xml
Log:
Modified: branches/tdiesler/trunk/build/ant.properties.example
===================================================================
--- branches/tdiesler/trunk/build/ant.properties.example 2007-07-12 16:28:46 UTC (rev 3864)
+++ branches/tdiesler/trunk/build/ant.properties.example 2007-07-12 16:50:26 UTC (rev 3865)
@@ -5,8 +5,8 @@
# Optional JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
-#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA
-#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
+#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_0_GA/build/output/jboss-4.2.0.GA
+#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40]
jbossws.integration.target=jboss50
Copied: branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.sar/META-INF (from rev 3862, branches/tdiesler/trunk/integration/native/src/main/resources/jbossws-native42.sar/META-INF)
Copied: branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.sar/jbossws-deployer.beans (from rev 3863, branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-deployer.beans)
Modified: branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.sar/jbossws-deployer.beans/META-INF/jboss-beans.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-deployer.beans/META-INF/jboss-beans.xml 2007-07-12 16:23:59 UTC (rev 3863)
+++ branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42.sar/jbossws-deployer.beans/META-INF/jboss-beans.xml 2007-07-12 16:50:26 UTC (rev 3865)
@@ -45,7 +45,7 @@
<bean name="WSDeployerHook_JAXRPC_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookJSE">
<property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
<property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
- <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property>
+ <property name="deployerManager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
<property name="phaseOneInterceptors">
<list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
<value>jboss.ws:service=DeployerInterceptorJSE</value>
@@ -55,7 +55,7 @@
<bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21">
<property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
<property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
- <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property>
+ <property name="deployerManager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
<property name="phaseOneInterceptors">
<list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
<value>jboss.ws:service=DeployerInterceptorEJB21</value>
@@ -65,7 +65,7 @@
<bean name="WSDeployerHook_JAXWS_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookJSE">
<property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
<property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
- <property name="deployerManager"><inject bean="WSDeployerManagerJSE"/></property>
+ <property name="deployerManager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
<property name="phaseOneInterceptors">
<list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
<value>jboss.ws:service=DeployerInterceptorJSE</value>
@@ -75,7 +75,7 @@
<bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3">
<property name="deploymentClass">org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployment</property>
<property name="endpointClass">org.jboss.wsf.spi.deployment.BasicEndpoint</property>
- <property name="deployerManager"><inject bean="WSDeployerManagerEJB"/></property>
+ <property name="deployerManager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
<property name="phaseOneInterceptors">
<list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
<value>jboss.ws:service=DeployerInterceptorEJB3</value>
@@ -83,7 +83,7 @@
</property>
</bean>
<bean name="WSMainDeployerHook" class="org.jboss.wsf.container.jboss42.MainDeployerHook">
- <property name="deployerManager"><inject bean="WSMainDeployerManager"/></property>
+ <property name="deployerManager"><inject bean="WSMainDeploymentAspectManager"/></property>
<property name="phaseTwoInterceptors">
<list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
<value>jboss.ws:service=DeployerInterceptorJSE</value>
@@ -186,7 +186,7 @@
<bean name="WSEndpointMetrics" class="org.jboss.wsf.spi.management.BasicEndpointMetrics"/>
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
- <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.stack.jbws.WebAppDesciptorModifierImpl"/>
+ <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.spi.deployment.WebAppDesciptorModifierImpl"/>
<bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/>
<bean name="WSWebXMLRewriter" class="org.jboss.wsf.spi.deployment.WebXMLRewriter">
<property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
Modified: branches/tdiesler/trunk/integration/native/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/native/build.xml 2007-07-12 16:28:46 UTC (rev 3864)
+++ branches/tdiesler/trunk/integration/native/build.xml 2007-07-12 16:50:26 UTC (rev 3865)
@@ -160,12 +160,8 @@
<ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/>
<!-- Build jbossws-native42.sar -->
- <mkdir dir="${native.output.lib.dir}/jbossws-native42/jbossws.beans"/>
- <copy tofile="${native.output.lib.dir}/jbossws-native42/jbossws.beans" file="${native.resources.dir}/jbossws-native.sar/jbossws-beans.xml"/>
- <mkdir dir="${native.output.lib.dir}/jbossws-native42/jbossws-deployer.beans"/>
- <copy todir="${native.output.lib.dir}/jbossws-native42/jbossws-deployer.beans">
- <fileset dir="${int.jboss42.dir}/resources/jbossws-deployer.beans"/>
- </copy>
+ <mkdir dir="${native.output.lib.dir}/jbossws-native42/jbossws.beans/META-INF"/>
+ <copy todir="${native.output.lib.dir}/jbossws-native42/jbossws.beans/META-INF" file="${native.resources.dir}/jbossws-native.sar/jboss-beans.xml"/>
<jar jarfile="${native.output.lib.dir}/jbossws-native42.sar" manifest="${native.output.etc.dir}/default.mf">
<fileset dir="${native.output.lib.dir}">
<include name="jbossws-context.war/**"/>
@@ -177,6 +173,9 @@
<include name="jboss-saaj.jar"/>
<include name="jbossws-core.jar"/>
</fileset>
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
<fileset dir="${core.dir}/thirdparty">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
@@ -186,9 +185,12 @@
<include name="xmlsec.jar"/>
<include name="wstx.jar"/>
</fileset>
- <fileset dir="${native.output.lib.dir}/jbossws-native42">
+ <!--fileset dir="${native.output.lib.dir}/jbossws-native42">
+ <include name="jbossws.beans/**"/>
+ </fileset-->
+ <fileset dir="${int.jboss42.dir}/src/main/resources/jbossws-jboss42.sar">
<include name="jbossws-deployer.beans/**"/>
- <include name="jbossws.beans/**"/>
+ <include name="META-INF/**"/>
</fileset>
<metainf dir="${core.dir}/src/main/resources/standard-config">
<include name="standard-*-config.xml"/>
More information about the jbossws-commits
mailing list