JBossWS SVN: r10259 - stack/cxf/branches/ropalka/modules/server/src/main/resources.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-30 05:27:55 -0400 (Tue, 30 Jun 2009)
New Revision: 10259
Modified:
stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - removing the notion of two phase deployers (WIP)
Modified: stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/…
[View More]server/src/main/resources/jbossws-cxf-config.xml 2009-06-30 09:27:24 UTC (rev 10258)
+++ stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-06-30 09:27:55 UTC (rev 10259)
@@ -59,28 +59,16 @@
<!-- Deployment aspect installers -->
- <!-- Phase 2 -->
- <bean name="WSCXFPhaseOneDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSPhaseOneDeploymentAspectManager"/></property>
+ <bean name="WSCXFDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSCXFContextPropertiesDeploymentAspect"/>
<inject bean="WSCXFDescriptorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSPhaseOneDeploymentAspectInstaller</depends>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSCXFPhaseTwoDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSPhaseTwoDeploymentAspectManager"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
<inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
</set>
</property>
- <depends>WSPhaseTwoDeploymentAspectInstaller</depends>
+ <depends>WSDeploymentAspectInstaller</depends>
</bean>
[View Less]
15 years, 9 months
JBossWS SVN: r10258 - stack/metro/branches/ropalka/modules/server/src/main/resources.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-30 05:27:24 -0400 (Tue, 30 Jun 2009)
New Revision: 10258
Modified:
stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - removing the notion of two phase deployers (WIP)
Modified: stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
===================================================================
--- stack/metro/branches/ropalka/…
[View More]modules/server/src/main/resources/jbossws-metro-config.xml 2009-06-30 09:26:39 UTC (rev 10257)
+++ stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2009-06-30 09:27:24 UTC (rev 10258)
@@ -60,32 +60,20 @@
<property name="requires">RuntimeLoader, StackDescriptor</property>
<property name="provides">RuntimeModel</property>
</bean>
- <!-- Deployment aspect installers -->
- <!-- Phase 1 -->
- <bean name="WSMetroPhaseOneDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSPhaseOneDeploymentAspectManager"/></property>
+ <!-- Deployment aspect installers -->
+
+ <bean name="WSMetroDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSMetroContextPropertiesDeploymentAspect"/>
<inject bean="WSMetroDescriptorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSPhaseOneDeploymentAspectInstaller</depends>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSMetroPhaseTwoDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSPhaseTwoDeploymentAspectManager"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
<inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
<inject bean="WSRuntimeModelDeploymentAspect"/>
</set>
</property>
- <depends>WSPhaseTwoDeploymentAspectInstaller</depends>
+ <depends>WSDeploymentAspectInstaller</depends>
</bean>
-
[View Less]
15 years, 9 months
JBossWS SVN: r10257 - in stack/native/branches/ropalka/modules/core/src/main: resources and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-30 05:26:39 -0400 (Tue, 30 Jun 2009)
New Revision: 10257
Modified:
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - removing the notion of two phase deployers (WIP)
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/…
[View More]jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-06-30 09:21:16 UTC (rev 10256)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2009-06-30 09:26:39 UTC (rev 10257)
@@ -415,7 +415,6 @@
throw new IllegalStateException("Cannot obtain endpoint meta data");
long beginProcessing = 0;
- ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader();
try
{
EndpointState state = ep.getState();
@@ -461,10 +460,6 @@
// debug the incomming message
MessageTrace.traceMessage("Incoming Request Message", reqMessage);
- // Set the thread context class loader
- ClassLoader classLoader = sepMetaData.getClassLoader();
- Thread.currentThread().setContextClassLoader(classLoader);
-
// Get the Invoker
ServiceEndpointInvoker epInvoker = ep.getAttachment(ServiceEndpointInvoker.class);
if (epInvoker == null)
@@ -523,8 +518,6 @@
log.error("Cannot process metrics", ex);
}
- // Reset the thread context class loader
- Thread.currentThread().setContextClassLoader(ctxClassLoader);
log.debug("END handleRequest: " + ep.getName());
}
}
Modified: stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-30 09:21:16 UTC (rev 10256)
+++ stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-30 09:26:39 UTC (rev 10257)
@@ -78,22 +78,12 @@
<!-- Deployment aspect installers -->
<!-- Phase 1 -->
- <bean name="WSNativePhaseOneDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSPhaseOneDeploymentAspectManager"/></property>
+ <bean name="WSNativeDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSNativeContextPropertiesDeploymentAspect"/>
- </set>
- </property>
- <depends>WSPhaseOneDeploymentAspectInstaller</depends>
- </bean>
- <!-- Phase 2 -->
- <bean name="WSNativePhaseTwoDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSPhaseTwoDeploymentAspectManager"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
<inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
<inject bean="WSNativeEventingDeploymentAspect"/>
@@ -105,6 +95,5 @@
<inject bean="WSJAXBIntroDeploymentAspect"/>
</set>
</property>
- <depends>WSPhaseTwoDeploymentAspectInstaller</depends>
+ <depends>WSDeploymentAspectInstaller</depends>
</bean>
-
[View Less]
15 years, 9 months
JBossWS SVN: r10256 - in container/jboss50/branches/ropalka-jboss510/src/main: java/org/jboss/wsf/container/jboss50/deployment and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-30 05:21:16 -0400 (Tue, 30 Jun 2009)
New Revision: 10256
Added:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentAspectDeployer.java
Removed:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/…
[View More]WSPhaseOneDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseTwoDeployer.java
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - removing the notion of two phase deployers (WIP)
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java 2009-06-30 09:12:54 UTC (rev 10255)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java 2009-06-30 09:21:16 UTC (rev 10256)
@@ -1,68 +0,0 @@
-/*
- * 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.container.jboss50.deployer;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.logging.Logger;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * This is the deployer that calls the registered DeployerHooks
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 24-Apr-2007
- */
-public abstract class AbstractWebServiceDeployer<T> extends AbstractComponentDeployer
-{
- // provide logging
- private static final Logger log = Logger.getLogger(AbstractWebServiceDeployer.class);
-
- private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>();
-
- public void addDeployerHook(DeployerHook deployer)
- {
- log.debug("Add deployer hook: " + deployer);
- deployerHooks.add(deployer);
- }
-
- public void removeDeployerHook(DeployerHook deployer)
- {
- log.debug("Remove deployer hook: " + deployer);
- deployerHooks.remove(deployer);
- }
-
- @Override
- public void internalDeploy(DeploymentUnit unit) throws DeploymentException
- {
- for (DeployerHook deployer : deployerHooks) deployer.deploy(unit);
- }
-
- @Override
- public void internalUndeploy(DeploymentUnit unit)
- {
- for (DeployerHook deployer : deployerHooks) deployer.undeploy(unit);
- }
-}
Added: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentAspectDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentAspectDeployer.java (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentAspectDeployer.java 2009-06-30 09:21:16 UTC (rev 10256)
@@ -0,0 +1,86 @@
+/*
+ * 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.container.jboss50.deployer;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+
+/**
+ * The phase one web service deployer.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public class WSDeploymentAspectDeployer extends AbstractRealDeployer
+{
+
+ private static final Logger log = Logger.getLogger(WSDeploymentAspectDeployer.class);
+
+ private List<DeployerHook> deployerHooks = new LinkedList<DeployerHook>();
+
+ /**
+ * Constructor.
+ */
+ public WSDeploymentAspectDeployer()
+ {
+ super();
+
+ // inputs
+ this.addInput( JBossWebMetaData.class );
+ this.addInput( Deployment.class );
+
+ // outputs
+ this.addOutput( JBossWebMetaData.class );
+ }
+
+ public void addDeployerHook(DeployerHook deployer)
+ {
+ log.debug("Add deployer hook: " + deployer);
+ deployerHooks.add(deployer);
+ }
+
+ public void removeDeployerHook(DeployerHook deployer)
+ {
+ log.debug("Remove deployer hook: " + deployer);
+ deployerHooks.remove(deployer);
+ }
+
+ @Override
+ public void internalDeploy(DeploymentUnit unit) throws DeploymentException
+ {
+ for (DeployerHook deployer : deployerHooks) deployer.deploy(unit);
+ }
+
+ @Override
+ public void internalUndeploy(DeploymentUnit unit)
+ {
+ for (DeployerHook deployer : deployerHooks) deployer.undeploy(unit);
+ }
+
+}
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseOneDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseOneDeployer.java 2009-06-30 09:12:54 UTC (rev 10255)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseOneDeployer.java 2009-06-30 09:21:16 UTC (rev 10256)
@@ -1,52 +0,0 @@
-/*
- * 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.container.jboss50.deployer;
-
-import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.wsf.spi.deployment.Deployment;
-
-/**
- * The phase one web service deployer.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
- */
-@SuppressWarnings("unchecked")
-public class WSPhaseOneDeployer extends AbstractWebServiceDeployer
-{
-
- /**
- * Constructor.
- */
- public WSPhaseOneDeployer()
- {
- super();
-
- // inputs
- this.addInput( JBossWebMetaData.class );
- this.addInput( Deployment.class );
-
- // outputs
- this.addOutput( JBossWebMetaData.class );
- }
-
-}
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseTwoDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseTwoDeployer.java 2009-06-30 09:12:54 UTC (rev 10255)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseTwoDeployer.java 2009-06-30 09:21:16 UTC (rev 10256)
@@ -1,49 +0,0 @@
-/*
- * 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.container.jboss50.deployer;
-
-import org.jboss.web.deployers.WarDeployment;
-import org.jboss.wsf.spi.deployment.Deployment;
-
-/**
- * The phase two web service deployer.
- *
- * @author Heiko.Braun(a)jboss.com
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
- */
-@SuppressWarnings("unchecked")
-public class WSPhaseTwoDeployer extends AbstractWebServiceDeployer
-{
-
- /**
- * Constructor.
- */
- public WSPhaseTwoDeployer()
- {
- super();
-
- // inputs
- this.addInput( Deployment.class );
- this.addInput( WarDeployment.class );
- }
-
-}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java 2009-06-30 09:12:54 UTC (rev 10255)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java 2009-06-30 09:21:16 UTC (rev 10256)
@@ -21,48 +21,21 @@
*/
package org.jboss.wsf.container.jboss50.deployment;
-import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
-import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
/**
- * Determines the correct runtime loader for per deployment type
- * and makes it available through the {@link Deployment}.
+ * Determines the correct runtime loader and makes it available through the {@link Deployment}.
*
* @author Heiko.Braun(a)jboss.com
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
*/
public class RuntimeLoaderDeploymentAspect extends DeploymentAspect
{
- public void create(Deployment dep)
+
+ public void create( final Deployment dep )
{
- // EJB3 endpoints
- if (dep.getAttachment(WebServiceDeployment.class) != null)
- {
- dep.setRuntimeClassLoader(dep.getInitialClassLoader());
- }
- // EJB21 endpoints
- else if (dep.getAttachment(JBossMetaData.class) != null)
- {
- dep.setRuntimeClassLoader(dep.getInitialClassLoader());
- }
- // JSE endpoints
- else if (dep.getAttachment(JBossWebMetaData.class) != null)
- {
- JBossWebMetaData webMetaData = dep.getAttachment(JBossWebMetaData.class);
- ClassLoader classLoader = webMetaData.getContextLoader();
- if (classLoader == null)
- {
- // [JBWS-2246] hack for .sar deployments incorporating web services deployments on AS bootstrap.
- classLoader = dep.getInitialClassLoader();
- }
- dep.setRuntimeClassLoader(classLoader);
- }
- else
- {
- throw new IllegalArgumentException("Unable to determine runtime loader");
- }
+ dep.setRuntimeClassLoader( dep.getInitialClassLoader() );
}
+
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-30 09:12:54 UTC (rev 10255)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-30 09:21:16 UTC (rev 10256)
@@ -53,57 +53,36 @@
<property name="relativeOrder">2</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
- <bean name="WSPhaseOneDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSPhaseOneDeployer">
+ <bean name="WSDeploymentAspectsDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
<property name="relativeOrder">3</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
- <bean name="WSPhaseTwoDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSPhaseTwoDeployer"/>
-
<!--
Register DeployerHooks with JBoss deployers
-->
<!-- Phase 1 deployer hook -->
- <bean name="WSPhaseOneDeployerHook" class="org.jboss.wsf.container.jboss50.deployer.DeployerHookImpl">
- <property name="deploymentManagerName">WSPhaseOneDeploymentAspectManager</property>
- <install bean="WSPhaseOneDeployer" method="addDeployerHook">
+ <bean name="WSDeployerHook" class="org.jboss.wsf.container.jboss50.deployer.DeployerHookImpl">
+ <property name="deploymentManagerName">WSDeploymentAspectManager</property>
+ <install bean="WSDeploymentAspectsDeployer" method="addDeployerHook">
<parameter>
<this/>
</parameter>
</install>
- <uninstall bean="WSPhaseOneDeployer" method="removeDeployerHook">
+ <uninstall bean="WSDeploymentAspectsDeployer" method="removeDeployerHook">
<parameter>
<this/>
</parameter>
</uninstall>
- <depends>WSPhaseOneDeployer</depends>
+ <depends>WSDeploymentAspectsDeployer</depends>
</bean>
- <!-- Phase 2 deployer hook -->
- <bean name="WSPhaseTwoDeployerHook" class="org.jboss.wsf.container.jboss50.deployer.DeployerHookImpl">
- <property name="deploymentManagerName">WSPhaseTwoDeploymentAspectManager</property>
- <install bean="WSPhaseTwoDeployer" method="addDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="WSPhaseTwoDeployer" method="removeDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
- <depends>WSPhaseTwoDeployer</depends>
- </bean>
<!--
Each DeploymentAspectManger maintains a list of DeploymentAspects
-->
- <bean name="WSPhaseOneDeploymentAspectManager" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSPhaseOneDeploymentAspectManager</property>
+ <bean name="WSDeploymentAspectManager" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property name="name">WSDeploymentAspectManager</property>
</bean>
- <bean name="WSPhaseTwoDeploymentAspectManager" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="parent"><inject bean="WSPhaseOneDeploymentAspectManager"/></property>
- <property name="name">WSPhaseTwoDeploymentAspectManager</property>
- </bean>
<!--
The container deployment aspects
@@ -186,9 +165,8 @@
<!-- Deployment aspect installers -->
- <!-- Phase 1 -->
- <bean name="WSPhaseOneDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSPhaseOneDeploymentAspectManager"/></property>
+ <bean name="WSDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
@@ -204,20 +182,10 @@
<inject bean="WSURLPatternDeploymentAspect"/>
<inject bean="WSWebAppDeploymentAspect"/>
<inject bean="WSWebAppGeneratorDeploymentAspect"/>
- </set>
- </property>
- </bean>
-
- <!-- Phase 2 -->
- <bean name="WSPhaseTwoDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSPhaseTwoDeploymentAspectManager"/></property>
- <property name="sortAspectsOnCreate">false</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSEndpointLifecycleDeploymentAspect"/>
<inject bean="WSRuntimeLoaderDeploymentAspect"/>
</set>
</property>
</bean>
-
+
</deployment>
[View Less]
15 years, 9 months
JBossWS SVN: r10255 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf: endpoint and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-30 05:12:54 -0400 (Tue, 30 Jun 2009)
New Revision: 10255
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointBean.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointInterface.java
stack/cxf/trunk/modules/testsuite/cxf-tests/…
[View More]src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java
Log:
[JBWS-2112] Adding an Endpoint API testcase with CXF. This does not use the jbossws-spi endpoint api, just the jaxws defined api (and CXF brings up a Jetty server instnace on the fly)
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointBean.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointBean.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointBean.java 2009-06-30 09:12:54 UTC (rev 10255)
@@ -0,0 +1,44 @@
+/*
+ * 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.test.ws.jaxws.cxf.endpoint;
+
+import javax.jws.WebService;
+
+/**
+ * Test Endpoint deployment
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 29-Apr-2005
+ */
+@WebService
+(
+ serviceName = "EndpointService",
+ endpointInterface = "org.jboss.test.ws.jaxws.cxf.endpoint.EndpointInterface",
+ targetNamespace = "http://org.jboss.ws/jaxws/cxf/endpoint"
+)
+public class EndpointBean implements EndpointInterface
+{
+ public String echo(String input)
+ {
+ return input;
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointInterface.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointInterface.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointInterface.java 2009-06-30 09:12:54 UTC (rev 10255)
@@ -0,0 +1,41 @@
+/*
+ * 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.test.ws.jaxws.cxf.endpoint;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * Test the JSR-181 annotation: javax.jws.WebService
+ * This interface is only used in the client deployment.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 29-Apr-2005
+ */
+@WebService(targetNamespace = "http://org.jboss.ws/jaxws/cxf/endpoint")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface EndpointInterface extends Remote
+{
+ String echo(String input) throws RemoteException;
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointInterface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java 2009-06-30 09:12:54 UTC (rev 10255)
@@ -0,0 +1,62 @@
+/*
+ * 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.test.ws.jaxws.cxf.endpoint;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.Service;
+import javax.xml.ws.soap.SOAPBinding;
+
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Test JAXWS Endpoint deployment in a JSE environment
+ *
+ * @author alessio.soldano(a)jboss.org
+ * @since 30-Jun-2009
+ */
+public class EndpointTestCase extends JBossWSTest
+{
+ private static final int port = 8878;
+
+ public void testJSEEndpointPublish() throws Exception
+ {
+ EndpointBean epImpl = new EndpointBean();
+ Endpoint endpoint = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, epImpl);
+ String publishURL = "http://" + getServerHost() + ":" + port + "/jaxws-endpoint";
+ endpoint.publish(publishURL);
+
+ URL wsdlURL = new URL(publishURL + "?wsdl");
+ QName qname = new QName("http://org.jboss.ws/jaxws/cxf/endpoint", "EndpointService");
+ Service service = Service.create(wsdlURL, qname);
+ EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class);
+
+ // Invoke the endpoint
+ String helloWorld = "Hello world!";
+ Object retObj = port.echo(helloWorld);
+ assertEquals(helloWorld, retObj);
+
+ endpoint.stop();
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endpoint/EndpointTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
[View Less]
15 years, 9 months
JBossWS SVN: r10254 - stack/cxf/branches/ropalka/modules/server/src/main/resources.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-29 09:37:38 -0400 (Mon, 29 Jun 2009)
New Revision: 10254
Modified:
stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring (WIP)
Modified: stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.…
[View More]xml 2009-06-29 13:23:28 UTC (rev 10253)
+++ stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-06-29 13:37:38 UTC (rev 10254)
@@ -60,8 +60,8 @@
<!-- Deployment aspect installers -->
<!-- Phase 2 -->
- <bean name="WSCXFDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
+ <bean name="WSCXFPhaseOneDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSPhaseOneDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
@@ -69,12 +69,12 @@
<inject bean="WSCXFDescriptorDeploymentAspect"/>
</set>
</property>
- <depends>WSDeploymentAspectInstallerPreJSE</depends>
+ <depends>WSPhaseOneDeploymentAspectInstaller</depends>
</bean>
<!-- Phase 2 -->
- <bean name="WSCXFDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
+ <bean name="WSCXFPhaseTwoDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSPhaseTwoDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
@@ -82,20 +82,5 @@
<inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
</set>
</property>
- <depends>WSDeploymentAspectInstallerPostJSE</depends>
+ <depends>WSPhaseTwoDeploymentAspectInstaller</depends>
</bean>
-
- <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSCXFContextPropertiesDeploymentAspect"/>
- <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
- <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSCXFDescriptorDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerEJB</depends>
- </bean>
-
[View Less]
15 years, 9 months
JBossWS SVN: r10253 - stack/metro/branches/ropalka/modules/server/src/main/resources.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-29 09:23:28 -0400 (Mon, 29 Jun 2009)
New Revision: 10253
Modified:
stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring (WIP)
Modified: stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-…
[View More]metro-config.xml 2009-06-29 13:10:47 UTC (rev 10252)
+++ stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2009-06-29 13:23:28 UTC (rev 10253)
@@ -63,8 +63,8 @@
<!-- Deployment aspect installers -->
<!-- Phase 1 -->
- <bean name="WSMetroDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
+ <bean name="WSMetroPhaseOneDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSPhaseOneDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
@@ -72,12 +72,12 @@
<inject bean="WSMetroDescriptorDeploymentAspect"/>
</set>
</property>
- <depends>WSDeploymentAspectInstallerPreJSE</depends>
+ <depends>WSPhaseOneDeploymentAspectInstaller</depends>
</bean>
<!-- Phase 2 -->
- <bean name="WSMetroDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
+ <bean name="WSMetroPhaseTwoDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSPhaseTwoDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
@@ -86,20 +86,6 @@
<inject bean="WSRuntimeModelDeploymentAspect"/>
</set>
</property>
- <depends>WSDeploymentAspectInstallerPostJSE</depends>
+ <depends>WSPhaseTwoDeploymentAspectInstaller</depends>
</bean>
- <bean name="WSMetroDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
- <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
- <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSMetroDescriptorDeploymentAspect"/>
- <inject bean="WSRuntimeModelDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerEJB</depends>
- </bean>
[View Less]
15 years, 9 months
JBossWS SVN: r10252 - stack/native/branches/ropalka/modules/core/src/main/resources.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-29 09:10:47 -0400 (Mon, 29 Jun 2009)
New Revision: 10252
Modified:
stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring (WIP)
Modified: stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-…
[View More]native-config.xml 2009-06-29 13:01:16 UTC (rev 10251)
+++ stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-29 13:10:47 UTC (rev 10252)
@@ -78,19 +78,19 @@
<!-- Deployment aspect installers -->
<!-- Phase 1 -->
- <bean name="WSNativeDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
+ <bean name="WSNativePhaseOneDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSPhaseOneDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSNativeContextPropertiesDeploymentAspect"/>
</set>
</property>
- <depends>WSDeploymentAspectInstallerPreJSE</depends>
+ <depends>WSPhaseOneDeploymentAspectInstaller</depends>
</bean>
<!-- Phase 2 -->
- <bean name="WSNativeDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
+ <bean name="WSNativePhaseTwoDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSPhaseTwoDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">true</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
@@ -105,26 +105,6 @@
<inject bean="WSJAXBIntroDeploymentAspect"/>
</set>
</property>
- <depends>WSDeploymentAspectInstallerPostJSE</depends>
+ <depends>WSPhaseTwoDeploymentAspectInstaller</depends>
</bean>
- <bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
- <property name="sortAspectsOnCreate">true</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
- <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
- <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
- <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
- <inject bean="WSNativeEventingDeploymentAspect"/>
- <inject bean="WSNativePublishContractDeploymentAspect"/>
- <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
- <inject bean="WSNativeRMDeploymentAspect"/>
- <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
- <inject bean="WSJAXBIntroDeploymentAspect"/>
- </set>
- </property>
- <depends>WSDeploymentAspectInstallerEJB</depends>
- </bean>
-
[View Less]
15 years, 9 months
JBossWS SVN: r10251 - in container/jboss50/branches/ropalka-jboss510/src/main: resources/jbossws-jboss50.deployer/META-INF and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-29 09:01:16 -0400 (Mon, 29 Jun 2009)
New Revision: 10251
Added:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseOneDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseTwoDeployer.java
Removed:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.…
[View More]java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSTypeDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2332][JBWS-2382] refactoring (WIP)
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentDeployer.java 2009-06-29 11:46:27 UTC (rev 10250)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSDeploymentDeployer.java 2009-06-29 13:01:16 UTC (rev 10251)
@@ -80,9 +80,6 @@
// outputs
this.addOutput( JBossWebMetaData.class );
this.addOutput( Deployment.class );
-
- // [JBDEPLOY-201] workaround
- this.setRelativeOrder( 2 );
}
@Override
Added: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseOneDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseOneDeployer.java (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseOneDeployer.java 2009-06-29 13:01:16 UTC (rev 10251)
@@ -0,0 +1,52 @@
+/*
+ * 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.container.jboss50.deployer;
+
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.spi.deployment.Deployment;
+
+/**
+ * The phase one web service deployer.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ */
+@SuppressWarnings("unchecked")
+public class WSPhaseOneDeployer extends AbstractWebServiceDeployer
+{
+
+ /**
+ * Constructor.
+ */
+ public WSPhaseOneDeployer()
+ {
+ super();
+
+ // inputs
+ this.addInput( JBossWebMetaData.class );
+ this.addInput( Deployment.class );
+
+ // outputs
+ this.addOutput( JBossWebMetaData.class );
+ }
+
+}
Added: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseTwoDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseTwoDeployer.java (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSPhaseTwoDeployer.java 2009-06-29 13:01:16 UTC (rev 10251)
@@ -0,0 +1,49 @@
+/*
+ * 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.container.jboss50.deployer;
+
+import org.jboss.web.deployers.WarDeployment;
+import org.jboss.wsf.spi.deployment.Deployment;
+
+/**
+ * The phase two web service deployer.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ */
+@SuppressWarnings("unchecked")
+public class WSPhaseTwoDeployer extends AbstractWebServiceDeployer
+{
+
+ /**
+ * Constructor.
+ */
+ public WSPhaseTwoDeployer()
+ {
+ super();
+
+ // inputs
+ this.addInput( Deployment.class );
+ this.addInput( WarDeployment.class );
+ }
+
+}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSTypeDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSTypeDeployer.java 2009-06-29 11:46:27 UTC (rev 10250)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WSTypeDeployer.java 2009-06-29 13:01:16 UTC (rev 10251)
@@ -59,9 +59,6 @@
// outputs
this.addOutput( DeploymentType.class );
this.addOutput( JBossWebMetaData.class );
-
- // [JBDEPLOY-201] workaround
- this.setRelativeOrder( 1 );
}
/**
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2009-06-29 11:46:27 UTC (rev 10250)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2009-06-29 13:01:16 UTC (rev 10251)
@@ -1,58 +0,0 @@
-/*
- * 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.container.jboss50.deployer;
-
-import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.wsf.spi.deployment.Deployment;
-
-/**
- * This it the web service deployer for EJB. It gets
- * {@link org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration} an passes it to a chain of
- * {@link org.jboss.wsf.container.jboss50.deployer.DeployerHook}'s.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author Heiko.Braun(a)jboss.com
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
- */
-@SuppressWarnings("unchecked")
-public class WebServiceDeployerEJB extends AbstractWebServiceDeployer
-{
-
- /**
- * Constructor.
- */
- public WebServiceDeployerEJB()
- {
- super();
-
- // inputs
- this.addInput( JBossWebMetaData.class );
- this.addInput( Deployment.class );
-
- // outputs
- this.addOutput( JBossWebMetaData.class );
-
- // [JBDEPLOY-201] workaround
- this.setRelativeOrder( 3 );
- }
-
-}
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2009-06-29 11:46:27 UTC (rev 10250)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2009-06-29 13:01:16 UTC (rev 10251)
@@ -1,49 +0,0 @@
-/*
- * 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.container.jboss50.deployer;
-
-import org.jboss.web.deployers.WarDeployment;
-import org.jboss.wsf.spi.deployment.Deployment;
-
-/**
- * The phase two web service deployer for JSE.
- *
- * @author Heiko.Braun(a)jboss.com
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
- */
-@SuppressWarnings("unchecked")
-public class WebServiceDeployerPostJSE extends AbstractWebServiceDeployer
-{
-
- /**
- * Constructor.
- */
- public WebServiceDeployerPostJSE()
- {
- super();
-
- // inputs
- this.addInput( Deployment.class );
- this.addInput( WarDeployment.class );
- }
-
-}
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2009-06-29 11:46:27 UTC (rev 10250)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2009-06-29 13:01:16 UTC (rev 10251)
@@ -1,55 +0,0 @@
-/*
- * 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.container.jboss50.deployer;
-
-import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.wsf.spi.deployment.Deployment;
-
-/**
- * The phase one web service deployer for JSE.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
- */
-@SuppressWarnings("unchecked")
-public class WebServiceDeployerPreJSE extends AbstractWebServiceDeployer
-{
-
- /**
- * Constructor.
- */
- public WebServiceDeployerPreJSE()
- {
- super();
-
- // inputs
- this.addInput( JBossWebMetaData.class );
- this.addInput( Deployment.class );
-
- // outputs
- this.addOutput( JBossWebMetaData.class );
-
- // [JBDEPLOY-201] workaround
- this.setRelativeOrder( 4 );
- }
-
-}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-29 11:46:27 UTC (rev 10250)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-29 13:01:16 UTC (rev 10251)
@@ -45,64 +45,65 @@
<bean name="WSEJBAdapterDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSEJBAdapterDeployer"/>
- <bean name="WSTypeDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSTypeDeployer"/>
+ <bean name="WSTypeDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSTypeDeployer">
+ <property name="relativeOrder">1</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
- <bean name="WSDeploymentDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentDeployer"/>
+ <bean name="WSDeploymentDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentDeployer">
+ <property name="relativeOrder">2</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
- <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerEJB"/>
+ <bean name="WSPhaseOneDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSPhaseOneDeployer">
+ <property name="relativeOrder">3</property> <!-- [JBDEPLOY-201] workaround -->
+ </bean>
- <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPreJSE"/>
+ <bean name="WSPhaseTwoDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSPhaseTwoDeployer"/>
- <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.deployer.WebServiceDeployerPostJSE"/>
-
<!--
Register DeployerHooks with JBoss deployers
-->
- <!-- Phase 1 of JSE JAX-RPC -->
- <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss50.deployer.DeployerHookImpl">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
- <install bean="WebServiceDeployerPreJSE" method="addDeployerHook">
+ <!-- Phase 1 deployer hook -->
+ <bean name="WSPhaseOneDeployerHook" class="org.jboss.wsf.container.jboss50.deployer.DeployerHookImpl">
+ <property name="deploymentManagerName">WSPhaseOneDeploymentAspectManager</property>
+ <install bean="WSPhaseOneDeployer" method="addDeployerHook">
<parameter>
<this/>
</parameter>
</install>
- <uninstall bean="WebServiceDeployerPreJSE" method="removeDeployerHook">
+ <uninstall bean="WSPhaseOneDeployer" method="removeDeployerHook">
<parameter>
<this/>
</parameter>
</uninstall>
- <depends>WebServiceDeployerPreJSE</depends>
+ <depends>WSPhaseOneDeployer</depends>
</bean>
- <!-- Phase 2 of JSE JAX-RPC -->
- <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss50.deployer.DeployerHookImpl">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
- <install bean="WebServiceDeployerPostJSE" method="addDeployerHook">
+ <!-- Phase 2 deployer hook -->
+ <bean name="WSPhaseTwoDeployerHook" class="org.jboss.wsf.container.jboss50.deployer.DeployerHookImpl">
+ <property name="deploymentManagerName">WSPhaseTwoDeploymentAspectManager</property>
+ <install bean="WSPhaseTwoDeployer" method="addDeployerHook">
<parameter>
<this/>
</parameter>
</install>
- <uninstall bean="WebServiceDeployerPostJSE" method="removeDeployerHook">
+ <uninstall bean="WSPhaseTwoDeployer" method="removeDeployerHook">
<parameter>
<this/>
</parameter>
</uninstall>
- <depends>WebServiceDeployerPostJSE</depends>
+ <depends>WSPhaseTwoDeployer</depends>
</bean>
<!--
Each DeploymentAspectManger maintains a list of DeploymentAspects
-->
- <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSDeploymentAspectManagerPreJSE</property>
+ <bean name="WSPhaseOneDeploymentAspectManager" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property name="name">WSPhaseOneDeploymentAspectManager</property>
</bean>
- <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
- <property name="name">WSDeploymentAspectManagerPostJSE</property>
+ <bean name="WSPhaseTwoDeploymentAspectManager" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property name="parent"><inject bean="WSPhaseOneDeploymentAspectManager"/></property>
+ <property name="name">WSPhaseTwoDeploymentAspectManager</property>
</bean>
- <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSDeploymentAspectManagerEJB</property>
- </bean>
<!--
The container deployment aspects
@@ -186,8 +187,8 @@
<!-- Deployment aspect installers -->
<!-- Phase 1 -->
- <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property>
+ <bean name="WSPhaseOneDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSPhaseOneDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
@@ -208,8 +209,8 @@
</bean>
<!-- Phase 2 -->
- <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property>
+ <bean name="WSPhaseTwoDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSPhaseTwoDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">false</property>
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
@@ -219,27 +220,4 @@
</property>
</bean>
- <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
- <property name="sortAspectsOnCreate">false</property>
- <property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSContainerMetaDataDeploymentAspect"/>
- <inject bean="WSInjectionMetaDataDeploymentAspect"/>
- <inject bean="WSContextRootDeploymentAspect"/>
- <inject bean="WSVirtualHostDeploymentAspect"/>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointHandlerDeploymentAspect"/>
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSURLPatternDeploymentAspect"/>
- <inject bean="WSRuntimeLoaderDeploymentAspect"/>
- <inject bean="WSWebAppDeploymentAspect"/>
- <inject bean="WSWebAppGeneratorDeploymentAspect"/>
- </set>
- </property>
- </bean>
-
</deployment>
[View Less]
15 years, 9 months
JBossWS SVN: r10250 - in container/jboss50/branches/ropalka-jboss510/src/main: resources/jbossws-jboss50.deployer/META-INF and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-29 07:46:27 -0400 (Mon, 29 Jun 2009)
New Revision: 10250
Added:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookImpl.java
Removed:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/…
[View More]JAXRPCDeployerHookEJB21.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2332][JBWS-2382] refactoring (WIP)
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java 2009-06-29 10:05:41 UTC (rev 10249)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java 2009-06-29 11:46:27 UTC (rev 10250)
@@ -1,99 +0,0 @@
-/*
- * 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.container.jboss50.deployer;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.logging.Logger;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.deployment.*;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-
-/**
- * An abstract web service deployer.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author Heiko.Braun(a)jboss.com
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
- */
-public abstract class AbstractDeployerHook implements DeployerHook
-{
-
- protected final Logger log = Logger.getLogger(getClass());
-
- private DeploymentAspectManager deploymentAspectManager;
-
- protected String deploymentManagerName;
-
- /** MC provided property **/
- public void setDeploymentManagerName(String deploymentManagerName)
- {
- this.deploymentManagerName = deploymentManagerName;
- }
-
- public DeploymentAspectManager getDeploymentAspectManager()
- {
- if(null == deploymentAspectManager)
- {
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).getDeploymentAspectManager( deploymentManagerName );
- }
-
- return deploymentAspectManager;
- }
-
- public void deploy( final DeploymentUnit unit ) throws DeploymentException
- {
- if ( this.isWebServiceDeployment( unit ) )
- {
- log.debug( "deploy: " + unit.getName() );
- final Deployment dep = this.getDeployment( unit );
- unit.addAttachment( Deployment.class, dep );
- this.getDeploymentAspectManager().deploy( dep );
- }
- }
-
- public void undeploy( final DeploymentUnit unit )
- {
- final Deployment dep = this.getDeployment( unit );
- if ( dep != null )
- {
- log.debug( "undeploy: " + unit.getName() );
- this.getDeploymentAspectManager().undeploy( dep );
- }
- }
-
- private boolean isWebServiceDeployment( final DeploymentUnit unit )
- {
- final DeploymentType deploymentType = unit.getAttachment( DeploymentType.class );
- return this.getDeploymentType().equals( deploymentType );
- }
-
- private Deployment getDeployment( final DeploymentUnit unit )
- {
- return this.isWebServiceDeployment( unit ) ? unit.getAttachment( Deployment.class ) : null;
- }
-
- public abstract Deployment.DeploymentType getDeploymentType();
-
-}
Added: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookImpl.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookImpl.java (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/DeployerHookImpl.java 2009-06-29 11:46:27 UTC (rev 10250)
@@ -0,0 +1,91 @@
+/*
+ * 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.container.jboss50.deployer;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.*;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+
+/**
+ * An abstract web service deployer.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @author Heiko.Braun(a)jboss.com
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class DeployerHookImpl implements DeployerHook
+{
+
+ protected final Logger log = Logger.getLogger(getClass());
+
+ private DeploymentAspectManager deploymentAspectManager;
+
+ protected String deploymentManagerName;
+
+ /** MC provided property **/
+ public void setDeploymentManagerName(String deploymentManagerName)
+ {
+ this.deploymentManagerName = deploymentManagerName;
+ }
+
+ public DeploymentAspectManager getDeploymentAspectManager()
+ {
+ if(null == deploymentAspectManager)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).getDeploymentAspectManager( deploymentManagerName );
+ }
+
+ return deploymentAspectManager;
+ }
+
+ public void deploy( final DeploymentUnit unit ) throws DeploymentException
+ {
+ if ( this.isWebServiceDeployment( unit ) )
+ {
+ log.debug( "deploy: " + unit.getName() );
+ final Deployment dep = unit.getAttachment( Deployment.class );
+ unit.addAttachment( Deployment.class, dep );
+ this.getDeploymentAspectManager().deploy( dep );
+ }
+ }
+
+ public void undeploy( final DeploymentUnit unit )
+ {
+ final Deployment dep = unit.getAttachment( Deployment.class );
+ if ( dep != null )
+ {
+ log.debug( "undeploy: " + unit.getName() );
+ this.getDeploymentAspectManager().undeploy( dep );
+ }
+ }
+
+ private boolean isWebServiceDeployment( final DeploymentUnit unit )
+ {
+ return unit.getAttachment( DeploymentType.class ) != null;
+ }
+
+}
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java 2009-06-29 10:05:41 UTC (rev 10249)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java 2009-06-29 11:46:27 UTC (rev 10250)
@@ -1,43 +0,0 @@
-/*
- * 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.container.jboss50.deployer;
-
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-
-/**
- * A deployer hook for JAXRPC EJB21 Endpoints.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
- */
-public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHook
-{
-
- /**
- * Get the deployment type this deployer hook can handle.
- */
- public DeploymentType getDeploymentType()
- {
- return DeploymentType.JAXRPC_EJB21;
- }
-
-}
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java 2009-06-29 10:05:41 UTC (rev 10249)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java 2009-06-29 11:46:27 UTC (rev 10250)
@@ -1,43 +0,0 @@
-/*
- * 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.container.jboss50.deployer;
-
-import org.jboss.wsf.spi.deployment.Deployment;
-
-/**
- * A phase two deployer hook for JAXRPC JSE Endpoints.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
- */
-public class JAXRPCDeployerHookPostJSE extends AbstractDeployerHook
-{
-
- /**
- * Get the deployment type this deployer hook can handle.
- */
- public Deployment.DeploymentType getDeploymentType()
- {
- return Deployment.DeploymentType.JAXRPC_JSE;
- }
-
-}
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java 2009-06-29 10:05:41 UTC (rev 10249)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java 2009-06-29 11:46:27 UTC (rev 10250)
@@ -1,43 +0,0 @@
-/*
- * 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.container.jboss50.deployer;
-
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-
-/**
- * A phase one deployer hook for JAXRPC JSE Endpoints.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
- */
-public class JAXRPCDeployerHookPreJSE extends AbstractDeployerHook
-{
-
- /**
- * Get the deployment type this deployer hook can handle.
- */
- public DeploymentType getDeploymentType()
- {
- return DeploymentType.JAXRPC_JSE;
- }
-
-}
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java 2009-06-29 10:05:41 UTC (rev 10249)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java 2009-06-29 11:46:27 UTC (rev 10250)
@@ -1,43 +0,0 @@
-/*
- * 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.container.jboss50.deployer;
-
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-
-/**
- * A deployer hook for JAXWS EJB3 Endpoints.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
- */
-public class JAXWSDeployerHookEJB3 extends AbstractDeployerHook
-{
-
- /**
- * Get the deployment type this deployer hook can handle.
- */
- public DeploymentType getDeploymentType()
- {
- return DeploymentType.JAXWS_EJB3;
- }
-
-}
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java 2009-06-29 10:05:41 UTC (rev 10249)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java 2009-06-29 11:46:27 UTC (rev 10250)
@@ -1,43 +0,0 @@
-/*
- * 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.container.jboss50.deployer;
-
-import org.jboss.wsf.spi.deployment.Deployment;
-
-/**
- * A phase two deployer hook for JAXWS JSE Endpoints.
- *
- * @author Heiko.Braun(a)jboss.com
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
- */
-public class JAXWSDeployerHookPostJSE extends AbstractDeployerHook
-{
-
- /**
- * Get the deployment type this deployer hook can handle.
- */
- public Deployment.DeploymentType getDeploymentType()
- {
- return Deployment.DeploymentType.JAXWS_JSE;
- }
-
-}
Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java 2009-06-29 10:05:41 UTC (rev 10249)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java 2009-06-29 11:46:27 UTC (rev 10250)
@@ -1,43 +0,0 @@
-/*
- * 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.container.jboss50.deployer;
-
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-
-/**
- * A phase one deployer hook for JAXWS JSE Endpoints.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
- */
-public class JAXWSDeployerHookPreJSE extends AbstractDeployerHook
-{
-
- /**
- * Get the deployment type this deployer hook can handle.
- */
- public DeploymentType getDeploymentType()
- {
- return DeploymentType.JAXWS_JSE;
- }
-
-}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-29 10:05:41 UTC (rev 10249)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-29 11:46:27 UTC (rev 10250)
@@ -36,46 +36,8 @@
<property name="webServicePort">8080</property>
-->
</bean>
-
- <!-- *********************************************************************************************************************
- Web Service deployment
-
- There are two deployers registered with the JBoss Main Deployer.
- The order of which is important
-
- 1) EJBDeployer < WebServiceDeployerEJB < WarDeployer
- 2) WebServiceDeployerPreJSE < WarDeployer
- 3) WarDeployer < WebServiceDeployerPostJSE
-
- Each WebServiceDeployer has a number of DeployerHooks registered with it
-
- - WebServiceDeployerEJB
- - WSDeployerHook_JAXRPC_EJB21
- - WSDeployerHook_JAXWS_EJB3
-
- - WebServiceDeployerPreJSE
- - WSDeployerHook_JAXRPC_JSE
- - WSDeployerHook_JAXWS_JSE
-
- Conceptually, each of these hooks implements the following pattern:
-
- DeployerHook.deploy(unit)
- if(isWebServiceDeployment)
- Deployment dep = createDeployment(unit)
- DeploymentAspectManager.deploy(dep)
-
- DeployerHook.undeploy(unit)
- Deployment dep = getDeployment(unit)
- DeploymentAspectManager.undeploy(dep)
-
- Each deployer hook has a web service DeploymentAspectManager injected into it.
- A web service DeploymentAspectManager maintains a list of DeploymentAspects, each of which
- handles a single aspect of web service deployment.
-
- Finally, each Endpoint is registered with the EndpointRegistry.
-
- ********************************************************************************************************************* -->
+ <!-- deployers -->
<bean name="WSDescriptorDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDescriptorDeployer">
<property name="name">webservices.xml</property>
<property name="useSchemaValidation">true</property>
@@ -98,7 +60,7 @@
-->
<!-- Phase 1 of JSE JAX-RPC -->
- <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookPreJSE">
+ <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss50.deployer.DeployerHookImpl">
<property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
<install bean="WebServiceDeployerPreJSE" method="addDeployerHook">
<parameter>
@@ -113,7 +75,7 @@
<depends>WebServiceDeployerPreJSE</depends>
</bean>
<!-- Phase 2 of JSE JAX-RPC -->
- <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookPostJSE">
+ <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss50.deployer.DeployerHookImpl">
<property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
<install bean="WebServiceDeployerPostJSE" method="addDeployerHook">
<parameter>
@@ -128,67 +90,6 @@
<depends>WebServiceDeployerPostJSE</depends>
</bean>
- <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.deployer.JAXRPCDeployerHookEJB21">
- <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property>
- <install bean="WebServiceDeployerEJB" method="addDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
- <depends>WebServiceDeployerEJB</depends>
- </bean>
-
- <!-- Phase 1 of JSE JAX-WS-->
- <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookPreJSE">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
- <install bean="WebServiceDeployerPreJSE" method="addDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="WebServiceDeployerPreJSE" method="removeDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
- <depends>WebServiceDeployerPreJSE</depends>
- </bean>
- <!-- Phase 2 of JSE JAX-WS -->
- <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookPostJSE">
- <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
- <install bean="WebServiceDeployerPostJSE" method="addDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="WebServiceDeployerPostJSE" method="removeDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
- <depends>WebServiceDeployerPostJSE</depends>
- </bean>
-
- <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.deployer.JAXWSDeployerHookEJB3">
- <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property>
- <install bean="WebServiceDeployerEJB" method="addDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </install>
- <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook">
- <parameter>
- <this/>
- </parameter>
- </uninstall>
- <depends>WebServiceDeployerEJB</depends>
- </bean>
-
<!--
Each DeploymentAspectManger maintains a list of DeploymentAspects
-->
[View Less]
15 years, 9 months