Author: thomas.diesler(a)jboss.com Date: 2007-06-03 07:15:43 -0400 (Sun, 03 Jun 2007) New Revision: 3403 Added: trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL/ trunk/build/hudson/hudson-home/jobs/Core-Tests-ALL/ trunk/build/hudson/hudson-home/jobs/Distro-ALL/ trunk/build/hudson/hudson-home/jobs/Integration-ALL/ Removed: trunk/build/hudson/hudson-home/jobs/AS-Tests-All/ trunk/build/hudson/hudson-home/jobs/Core-Tests-All/ trunk/build/hudson/hudson-home/jobs/Distro-All/ trunk/build/hudson/hudson-home/jobs/Integration-All/ Modified: trunk/build/hudson/hudson-home/config.xml trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml Log: Fix jboss42 sunri,xfire Modified: trunk/build/hudson/hudson-home/config.xml =================================================================== --- trunk/build/hudson/hudson-home/config.xml 2007-06-03 11:01:36 UTC (rev 3402) +++ trunk/build/hudson/hudson-home/config.xml 2007-06-03 11:15:43 UTC (rev 3403) @@ -31,7 +31,7 @@ <owner reference="../../.."/> <jobNames class="tree-set"> <no-comparator/> - <string>AS-Tests-All</string> + <string>AS-Tests-ALL</string> <string>AS-Tests-AS-5.0</string> <string>AS-Tests-AS-4.2</string> <string>AS-Tests-AS-4.0</string> @@ -51,7 +51,7 @@ <owner reference="../../.."/> <jobNames class="tree-set"> <no-comparator/> - <string>Core-Tests-All</string> + <string>Core-Tests-ALL</string> <string>Core-Tests-AS-5.0</string> <string>Core-Tests-AS-4.2</string> <string>Core-Tests-AS-4.0</string> @@ -71,7 +71,7 @@ <owner reference="../../.."/> <jobNames class="tree-set"> <no-comparator/> - <string>Distro-All</string> + <string>Distro-ALL</string> <string>Distro-Native-AS-5.0</string> <string>Distro-Native-AS-4.2</string> <string>Distro-Native-AS-4.0</string> @@ -95,7 +95,7 @@ <owner reference="../../.."/> <jobNames class="tree-set"> <no-comparator/> - <string>Integration-All</string> + <string>Integration-ALL</string> <string>Integration-Native-AS-5.0</string> <string>Integration-Native-AS-4.2</string> <string>Integration-Native-AS-4.0</string> Copied: trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL (from rev 3400, trunk/build/hudson/hudson-home/jobs/AS-Tests-All) Copied: trunk/build/hudson/hudson-home/jobs/Core-Tests-ALL (from rev 3400, trunk/build/hudson/hudson-home/jobs/Core-Tests-All) Copied: trunk/build/hudson/hudson-home/jobs/Distro-ALL (from rev 3400, trunk/build/hudson/hudson-home/jobs/Distro-All) Copied: trunk/build/hudson/hudson-home/jobs/Integration-ALL (from rev 3400, trunk/build/hudson/hudson-home/jobs/Integration-All) Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-03 11:01:36 UTC (rev 3402) +++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-06-03 11:15:43 UTC (rev 3403) @@ -27,7 +27,7 @@ $JBWSDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # -# Build sunri-jboss50 +# Build sunri # cd $JBWSDIR/integration/sunri ant $ENVIRONMENT deploy-jboss42 Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-06-03 11:01:36 UTC (rev 3402) +++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-06-03 11:15:43 UTC (rev 3403) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-Tests-All, Core-Tests-All, Integration-All, Distro-All</childProjects> + <childProjects>AS-Tests-ALL, Core-Tests-ALL, Integration-ALL, Distro-ALL</childProjects> </hudson.tasks.BuildTrigger> </publishers> <buildWrappers class="vector"/> Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:01:36 UTC (rev 3402) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:15:43 UTC (rev 3403) @@ -130,7 +130,9 @@ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> </bean> <bean name="WSSunJaxwsDeployer" class="org.jboss.wsf.stack.sunri.SunJaxwsDeployer"/> - <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"/> + <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"> + <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property> + </bean> <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/> <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer"> <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> @@ -140,12 +142,20 @@ </bean> <!-- Deployer helper beans --> + <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB21"/> + <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/> + <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter"> + <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property> + <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property> + <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> + </bean> <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.sunri.WebAppDesciptorModifierImpl"> <property name="listenerClass">org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS</property> <property name="servletClass">org.jboss.wsf.spi.invocation.EndpointServlet</property> </bean> + <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> </bean> Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:01:36 UTC (rev 3402) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-06-03 11:15:43 UTC (rev 3403) @@ -129,7 +129,9 @@ <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeployer"> <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> </bean> - <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"/> + <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeployer"> + <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property> + </bean> <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/> <bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer"> <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> @@ -144,11 +146,19 @@ </bean> <!-- Deployer helper beans --> + <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB21"/> + <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/> + <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter"> + <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property> + <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property> + <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> + </bean> <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.xfire.WebAppDesciptorModifierImpl"> <property name="servletClass">org.jboss.wsf.stack.xfire.XFireConfigurableServletExt</property> </bean> + <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> </bean>