JBossWS SVN: r8351 - in stack/native/trunk/modules/core/src/main: resources/META-INF/services and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-06 12:04:51 -0400 (Mon, 06 Oct 2008)
New Revision: 8351
Added:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java
stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
Log:
[JBWS-2246][JBWS-2264][JBAS-5732] provide aspectized servlet + enhance BC compatible servlet
Added: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java (rev 0)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/AspectizedEndpointServlet.java 2008-10-06 16:04:51 UTC (rev 8351)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, 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.stack.jbws;
+
+import org.jboss.wsf.spi.DeploymentAspectManagerLocator;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
+
+/**
+ * Endpoint servlet that has WS framework aspects support
+ * @author richard.opalka(a)jboss.com
+ */
+public class AspectizedEndpointServlet extends EndpointServlet
+{
+
+ protected DeploymentAspectManager aspectsManager;
+
+ protected void initDeploymentAspectManager()
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ DeploymentAspectManagerLocator locator = spiProvider.getSPI(DeploymentAspectManagerLocator.class);
+ aspectsManager = locator.locateDeploymentAspectManager("WSServletAspectManager");
+ }
+
+ protected void callRuntimeAspects()
+ {
+ Deployment dep = endpoint.getService().getDeployment();
+ aspectsManager.create(dep, null);
+ aspectsManager.start(dep, null);
+ }
+
+ public void destroy()
+ {
+ try
+ {
+ Deployment dep = endpoint.getService().getDeployment();
+ aspectsManager.stop(dep, null);
+ aspectsManager.destroy(dep, null);
+ }
+ finally
+ {
+ super.destroy();
+ }
+ }
+
+}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2008-10-06 15:20:52 UTC (rev 8350)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2008-10-06 16:04:51 UTC (rev 8351)
@@ -47,7 +47,7 @@
/**
* A servlet that is installed for every web service endpoint.
- *
+ * @author richard.opalka(a)jboss.com
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
@@ -62,18 +62,36 @@
public void init(ServletConfig servletConfig) throws ServletException
{
super.init(servletConfig);
+ this.initRegistry();
+ this.initDeploymentAspectManager();
+ String contextPath = servletConfig.getServletContext().getContextPath();
+ initServiceEndpoint(contextPath);
+ }
+
+ protected void initRegistry()
+ {
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
}
-
+
+ /**
+ * Template method
+ */
+ protected void initDeploymentAspectManager()
+ {
+ // does nothing (because of BC)
+ }
+
+ /**
+ * Template method
+ */
+ protected void callRuntimeAspects()
+ {
+ // does nothing (because of BC)
+ }
+
public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
- if (endpoint == null)
- {
- String contextPath = req.getContextPath();
- initServiceEndpoint(contextPath);
- }
-
try
{
EndpointAssociation.setEndpoint(endpoint);
@@ -90,10 +108,23 @@
*/
protected void initServiceEndpoint(String contextPath)
{
- initEndpoint(contextPath, getServletName());
- initEndpointConfig();
- startEndpoint();
+ this.initEndpoint(contextPath, getServletName());
+ this.setRuntimeLoader();
+ this.callRuntimeAspects();
+ this.initEndpointConfig();
+ this.startEndpoint();
}
+
+ private void setRuntimeLoader()
+ {
+ // Set the runtime classloader for JSE endpoints, this should be the tomcat classloader
+ Deployment dep = endpoint.getService().getDeployment();
+ if (dep.getType() == Deployment.DeploymentType.JAXRPC_JSE || dep.getType() == Deployment.DeploymentType.JAXWS_JSE)
+ {
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ dep.setRuntimeClassLoader(classLoader);
+ }
+ }
private void startEndpoint()
{
Added: stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator
===================================================================
--- stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator (rev 0)
+++ stack/native/trunk/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.DeploymentAspectManagerLocator 2008-10-06 16:04:51 UTC (rev 8351)
@@ -0,0 +1 @@
+org.jboss.wsf.framework.DeploymentAspectManagerLocatorImpl
\ No newline at end of file
17 years, 2 months
JBossWS SVN: r8350 - in common: tags and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-06 11:20:52 -0400 (Mon, 06 Oct 2008)
New Revision: 8350
Added:
common/tags/jbossws-common-1.0.0.GA_CP02/
Removed:
common/branches/jbossws-common-1.0.0.GA_CP02/
Log:
[JBPAPP-1030] Release JBossWS Common 1.0.0.GA_CP02
Copied: common/tags/jbossws-common-1.0.0.GA_CP02 (from rev 8349, common/branches/jbossws-common-1.0.0.GA_CP02)
17 years, 2 months
JBossWS SVN: r8349 - common/branches/jbossws-common-1.0.0.GA_CP02.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-06 11:20:01 -0400 (Mon, 06 Oct 2008)
New Revision: 8349
Modified:
common/branches/jbossws-common-1.0.0.GA_CP02/version.properties
Log:
[JBPAPP-1030] Set the version.
Modified: common/branches/jbossws-common-1.0.0.GA_CP02/version.properties
===================================================================
--- common/branches/jbossws-common-1.0.0.GA_CP02/version.properties 2008-10-06 15:18:39 UTC (rev 8348)
+++ common/branches/jbossws-common-1.0.0.GA_CP02/version.properties 2008-10-06 15:20:01 UTC (rev 8349)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=1.0.0.GA_CP-SNAPSHOT
-repository.id=1.0.0.GA_CP-SNAPSHOT
+version.id=1.0.0.GA_CP02
+repository.id=1.0.0.GA_CP02
implementation.title=JBoss Web Services - Common
implementation.url=http://www.jboss.org/products/jbossws
17 years, 2 months
JBossWS SVN: r8348 - in common: tags and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-06 11:18:39 -0400 (Mon, 06 Oct 2008)
New Revision: 8348
Added:
common/branches/jbossws-common-1.0.0.GA_CP02/
Removed:
common/tags/jbossws-common-1.0.0.GA_CP02/
Log:
[JBPAPP-1030] Release JBossWS Common 1.0.0.GA_CP02
Copied: common/branches/jbossws-common-1.0.0.GA_CP02 (from rev 8347, common/tags/jbossws-common-1.0.0.GA_CP02)
17 years, 2 months
JBossWS SVN: r8347 - in common: tags and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-06 11:17:37 -0400 (Mon, 06 Oct 2008)
New Revision: 8347
Added:
common/tags/jbossws-common-1.0.0.GA_CP02/
Removed:
common/branches/jbossws-common-1.0.0.GA_CP02/
Log:
[JBPAPP-1030] Release JBossWS Common 1.0.0.GA_CP02
Copied: common/tags/jbossws-common-1.0.0.GA_CP02 (from rev 8346, common/branches/jbossws-common-1.0.0.GA_CP02)
17 years, 2 months
JBossWS SVN: r8346 - common/branches.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-06 11:14:56 -0400 (Mon, 06 Oct 2008)
New Revision: 8346
Added:
common/branches/jbossws-common-1.0.0.GA_CP02/
Log:
[JBPAPP-1030] Branch ready to tag.
Copied: common/branches/jbossws-common-1.0.0.GA_CP02 (from rev 8345, common/branches/jbossws-common-1.0.0.GA_CP)
17 years, 2 months
JBossWS SVN: r8345 - common/branches/jbossws-common-1.0.0.GA_CP.
by jbossws-commits@lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-10-06 11:13:39 -0400 (Mon, 06 Oct 2008)
New Revision: 8345
Modified:
common/branches/jbossws-common-1.0.0.GA_CP/version.properties
Log:
[JBPAPP-1030] Update thirdparty versions.
Modified: common/branches/jbossws-common-1.0.0.GA_CP/version.properties
===================================================================
--- common/branches/jbossws-common-1.0.0.GA_CP/version.properties 2008-10-06 13:34:35 UTC (rev 8344)
+++ common/branches/jbossws-common-1.0.0.GA_CP/version.properties 2008-10-06 15:13:39 UTC (rev 8345)
@@ -14,7 +14,7 @@
implementation.vendor.id=http://www.jboss.org
# Thirdparty library versions
-jbossws-spi=1.0.0.GA_CP-SNAPSHOT
+jbossws-spi=1.0.0.GA_CP01-brew
jboss-common-core=2.0.2.GA
jboss-common-logging-spi=2.0.2.GA
17 years, 2 months
JBossWS SVN: r8344 - in stack/native/trunk: modules/core and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-06 09:34:35 -0400 (Mon, 06 Oct 2008)
New Revision: 8344
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
enable AS 5 integration layers
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2008-10-06 13:20:42 UTC (rev 8343)
+++ stack/native/trunk/modules/core/pom.xml 2008-10-06 13:34:35 UTC (rev 8344)
@@ -210,8 +210,8 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory>
</artifactItem>
- <!-- JBWS-2263 -->
- <!--
+ <!-- [JBWS-2263] -->
+ <!-- START -->
<artifactItem>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500CR2</artifactId>
@@ -228,7 +228,7 @@
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
</artifactItem>
- -->
+ <!-- END -->
</artifactItems>
</configuration>
</execution>
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2008-10-06 13:20:42 UTC (rev 8343)
+++ stack/native/trunk/modules/management/pom.xml 2008-10-06 13:34:35 UTC (rev 8344)
@@ -46,7 +46,8 @@
<scope>runtime</scope>
</dependency>
<!-- [JBWS-2263] -->
- <!--dependency>
+ <!-- START -->
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500CR2</artifactId>
<scope>runtime</scope>
@@ -67,7 +68,8 @@
<artifactId>jbossws-jboss500x</artifactId>
<classifier>container</classifier>
<scope>runtime</scope>
- </dependency-->
+ </dependency>
+ <!-- END -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
<artifactId>juddi-service</artifactId>
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-06 13:20:42 UTC (rev 8343)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-06 13:34:35 UTC (rev 8344)
@@ -181,7 +181,9 @@
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.client.patternset"/>
<!-- JBWS-2263 -->
- <!-- <include name="**/jbossws-(a){jbossid}.jar"/> -->
+ <!-- START -->
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ <!-- END -->
</fileset>
</copy>
</sequential>
@@ -322,15 +324,19 @@
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
<!-- [JBWS-2263] -->
- <!--include name="**/jbossws-(a){jbossid}.jar"/--> <!-- see #1 below -->
+ <!-- START -->
+ <include name="**/jbossws-(a){jbossid}.jar"/>
+ <!-- END -->
</fileset>
</copy>
<!-- [JBWS-2263] -->
- <!--copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <!-- START -->
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-beans.xml"/>
+ <include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
- </copy-->
+ </copy>
+ <!-- END -->
</sequential>
</macrodef>
@@ -339,7 +345,8 @@
<!-- ================================================================== -->
<!-- [JBWS-2263] -->
- <!--macrodef name="macro-deploy-jbossws-deploy50">
+ <!-- START -->
+ <macrodef name="macro-deploy-jbossws-deploy50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<attribute name="jbossid"/>
@@ -351,14 +358,15 @@
</copy>
<unzip dest="@{targetdir}" src="@{targetdir}/jbossws-(a){jbossid}-container.jar">
<patternset>
- <include name="META-INF/jbossws-container-beans.xml"/>
+ <include name="META-INF/jbossws-container-jboss-beans.xml"/>
</patternset>
</unzip>
- <move file="@{targetdir}/META-INF/jbossws-container-beans.xml" tofile="@{targetdir}/jbossws-container-beans.xml"/>
+ <move file="@{targetdir}/META-INF/jbossws-container-jboss-beans.xml" tofile="@{targetdir}/jbossws-container-jboss-beans.xml"/>
<delete file="@{targetdir}/jbossws-(a){jbossid}-container.jar"/>
<delete dir="@{targetdir}/META-INF"/>
</sequential>
- </macrodef-->
+ </macrodef>
+ <!-- END -->
<!-- ================================================================== -->
<!-- Deploy JBossWS -->
@@ -384,7 +392,9 @@
<macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<!-- [JBWS-2263] -->
- <!--macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/-->
+ <!-- START -->
+ <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <!-- END -->
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
@@ -451,15 +461,17 @@
<fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
<!-- [JBWS-2263] -->
+ <!-- START -->
<!-- delete stale container integration jars -->
- <!--delete>
+ <delete>
<fileset dir="${jboss.server.home}">
<include name="**/jbossws-jboss*.jar"/>
</fileset>
<fileset dir="${jboss.home}/client">
<include name="jbossws-jboss*.jar"/>
</fileset>
- </delete-->
+ </delete>
+ <!-- END -->
<!-- delete content of last deployment -->
<delete>
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-10-06 13:20:42 UTC (rev 8343)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-10-06 13:34:35 UTC (rev 8344)
@@ -410,11 +410,18 @@
<jbossws.integration.target>jboss500</jbossws.integration.target>
</properties>
<dependencies>
+ <!-- [JBWS-2263] -->
+ <!-- START -->
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500CR2</artifactId>
+ </dependency>
+ <!--dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
- </dependency>
+ </dependency-->
+ <!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
@@ -471,11 +478,18 @@
<jbossws.integration.target>jboss501</jbossws.integration.target>
</properties>
<dependencies>
+ <!-- [JBWS-2263] -->
+ <!-- START -->
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500x</artifactId>
+ </dependency>
+ <!--dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
<version>${jboss.version}</version>
- </dependency>
+ </dependency-->
+ <!-- END -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-10-06 13:20:42 UTC (rev 8343)
+++ stack/native/trunk/pom.xml 2008-10-06 13:34:35 UTC (rev 8344)
@@ -55,11 +55,11 @@
<jbossws.jboss422.version>3.0.4-SNAPSHOT</jbossws.jboss422.version>
<jbossws.jboss423.version>3.0.4-SNAPSHOT</jbossws.jboss423.version>
<jbossws.jboss424.version>3.0.4-SNAPSHOT</jbossws.jboss424.version>
- <!-- JBWS-2263 -->
- <!--
+ <!-- [JBWS-2263] -->
+ <!-- START -->
<jbossws.jboss500.version>3.0.4-SNAPSHOT</jbossws.jboss500.version>
<jbossws.jboss501.version>3.0.4-SNAPSHOT</jbossws.jboss501.version>
- -->
+ <!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
<javassist.version>3.6.0.GA</javassist.version>
@@ -144,8 +144,8 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <!-- JBWS-2263 -->
- <!--
+ <!-- [JBWS-2263] -->
+ <!-- START -->
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500CR2</artifactId>
@@ -182,7 +182,7 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- -->
+ <!-- END -->
<!-- provided apis -->
<dependency>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-10-06 13:20:42 UTC (rev 8343)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-10-06 13:34:35 UTC (rev 8344)
@@ -106,7 +106,9 @@
<include>*:jbossws-jboss424x:jar</include>
</includes>
</dependencySet>
- <!--dependencySet>
+ <!-- [JBWS-2263] -->
+ <!-- START -->
+ <dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
@@ -145,7 +147,8 @@
<includes>
<include>*:jbossws-jboss500x:jar:container</include>
</includes>
- </dependencySet-->
+ </dependencySet>
+ <!-- END -->
</dependencySets>
</binaries>
</moduleSet>
17 years, 2 months
JBossWS SVN: r8343 - stack/metro/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-06 09:20:42 -0400 (Mon, 06 Oct 2008)
New Revision: 8343
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
all jboss MC files renamed to jboss-beans.xml
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-06 13:19:18 UTC (rev 8342)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-06 13:20:42 UTC (rev 8343)
@@ -341,7 +341,7 @@
<!-- START -->
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-beans.xml"/>
+ <include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
<!-- END -->
17 years, 2 months
JBossWS SVN: r8342 - stack/cxf/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-06 09:19:18 -0400 (Mon, 06 Oct 2008)
New Revision: 8342
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
all jboss MC files renamed to jboss-beans.xml
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-06 12:55:30 UTC (rev 8341)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-10-06 13:19:18 UTC (rev 8342)
@@ -317,7 +317,7 @@
<!-- START -->
<copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-beans.xml"/>
+ <include name="**/jbossws-deployer-jboss-beans.xml"/>
</fileset>
</copy>
<!-- END -->
17 years, 2 months