JBossWS SVN: r8649 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-04 10:10:17 -0500 (Tue, 04 Nov 2008)
New Revision: 8649
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java
Log:
fix hudson regression
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2008-11-04 14:02:48 UTC (rev 8648)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/EJB3Bean.java 2008-11-04 15:10:17 UTC (rev 8649)
@@ -31,7 +31,7 @@
import org.jboss.wsf.spi.annotation.WebContext;
/**
- *
+ * Endpoint implementation
* @author darran.lofthouse(a)jboss.com
* @since Nov 2, 2006
*/
@@ -45,16 +45,24 @@
public String hello(final String message)
{
+ MBeanServer mbeanServer = (MBeanServer)MBeanServerFactory.findMBeanServer(null).get(0);
try
{
- MBeanServer mbeanServer = (MBeanServer)MBeanServerFactory.findMBeanServer(null).get(0);
ObjectName on = new ObjectName("jboss.web:J2EEApplication=none,J2EEServer=none,WebModule=//www.jboss.org/...");
mbeanServer.getMBeanInfo(on);
}
catch (Exception e)
{
- log.error("Unable to lookup deployment", e);
- return "Unable to get WebModule MBean for virtual host - virtual-host not handled from @WebContext";
+ try
+ {
+ ObjectName on = new ObjectName("jboss.web:J2EEApplication=none,J2EEServer=none,WebModule=//localhost/jaxws-jbws981,j2eeType=Servlet,name=EJB3Bean");
+ mbeanServer.getMBeanInfo(on);
+ }
+ catch (Exception ee)
+ {
+ log.error("Unable to lookup deployment", e);
+ return "Unable to get WebModule MBean for virtual host - virtual-host not handled from @WebContext";
+ }
}
return message;
15 years, 6 months
- 1
- 0
JBossWS SVN: r8648 - in container/jboss50: trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-04 09:02:48 -0500 (Tue, 04 Nov 2008)
New Revision: 8648
Modified:
container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java
container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java
Log:
[JBWS-2246] hack for .sar incorporating webservices deployment on AS bootstrap
Modified: container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java
===================================================================
--- container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java 2008-11-04 05:59:54 UTC (rev 8647)
+++ container/jboss50/branches/jboss500CR2/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java 2008-11-04 14:02:48 UTC (rev 8648)
@@ -23,6 +23,7 @@
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;
@@ -52,6 +53,11 @@
{
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
Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java
===================================================================
--- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java 2008-11-04 05:59:54 UTC (rev 8647)
+++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/deployment/RuntimeLoaderDeploymentAspect.java 2008-11-04 14:02:48 UTC (rev 8648)
@@ -23,6 +23,7 @@
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;
@@ -52,6 +53,11 @@
{
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
15 years, 6 months
- 1
- 0
JBossWS SVN: r8647 - framework/trunk/src/main/java/org/jboss/wsf/framework.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-04 00:59:54 -0500 (Tue, 04 Nov 2008)
New Revision: 8647
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
Log:
[JBWS-2338] removing DAManagerLocator iface + useless DAs
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2008-11-04 05:58:06 UTC (rev 8646)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2008-11-04 05:59:54 UTC (rev 8647)
@@ -51,7 +51,6 @@
import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory;
import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
import org.jboss.wsf.spi.util.ServiceLoader;
-import org.jboss.wsf.spi.DeploymentAspectManagerLocator;
/**
* @author Thomas.Diesler(a)jboss.com
@@ -140,10 +139,6 @@
{
returnType = (T)loadService(spiType, null);
}
- else if (DeploymentAspectManagerLocator.class.equals(spiType))
- {
- returnType = (T)loadService(spiType, null);
- }
if (returnType == null)
throw new WSFException("Failed to provide SPI '" + spiType + "'");
15 years, 6 months
- 1
- 0
JBossWS SVN: r8646 - in framework/trunk/src/main/java/org/jboss/wsf/framework: deployment and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-04 00:58:06 -0500 (Tue, 04 Nov 2008)
New Revision: 8646
Removed:
framework/trunk/src/main/java/org/jboss/wsf/framework/DeploymentAspectManagerLocatorImpl.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointDeployerLifecycleDeploymentAspect.java
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/IdentityDeploymentAspect.java
Log:
[JBWS-2338] removing DAManagerLocator iface + useless DAs
Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/DeploymentAspectManagerLocatorImpl.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/DeploymentAspectManagerLocatorImpl.java 2008-11-04 05:54:16 UTC (rev 8645)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/DeploymentAspectManagerLocatorImpl.java 2008-11-04 05:58:06 UTC (rev 8646)
@@ -1,40 +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.framework;
-
-import org.jboss.wsf.common.KernelAwareSPIFactory;
-import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
-import org.jboss.wsf.spi.DeploymentAspectManagerLocator;
-
-/**
- * DeploymentAspectManagerLocator implementation
- * @author richard.opalka(a)jboss.com
- */
-public final class DeploymentAspectManagerLocatorImpl implements DeploymentAspectManagerLocator
-{
- public DeploymentAspectManager locateDeploymentAspectManager(String managerName)
- {
- return new KernelAwareSPIFactory().getKernelProvidedSPI(
- managerName, DeploymentAspectManager.class
- );
- }
-}
Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointDeployerLifecycleDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointDeployerLifecycleDeploymentAspect.java 2008-11-04 05:54:16 UTC (rev 8645)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointDeployerLifecycleDeploymentAspect.java 2008-11-04 05:58:06 UTC (rev 8646)
@@ -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.framework.deployment;
-
-import org.jboss.wsf.spi.deployment.Deployment;
-
-/**
- * Lifecycle deployer handler dealing with CREATE and DESTROY only
- * @author richard.opalka(a)jboss.com
- */
-public class EndpointDeployerLifecycleDeploymentAspect extends EndpointLifecycleDeploymentAspect
-{
- @Override
- public void start(Deployment dep)
- {
- // do nothing in deployers
- }
-
- @Override
- public void stop(Deployment dep)
- {
- // do nothing in deployers
- }
-}
Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/IdentityDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/IdentityDeploymentAspect.java 2008-11-04 05:54:16 UTC (rev 8645)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/IdentityDeploymentAspect.java 2008-11-04 05:58:06 UTC (rev 8646)
@@ -1,60 +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.framework.deployment;
-
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspect;
-
-/**
- * Identity deployment aspect that does nothing
- *
- * @author richard.opalka(a)jboss.org
- * @since 30-May-2008
- */
-public final class IdentityDeploymentAspect extends DeploymentAspect
-{
-
- @Override
- public void create(Deployment dep)
- {
- // does nothing
- }
-
- @Override
- public void destroy(Deployment dep)
- {
- // does nothing
- }
-
- @Override
- public void start(Deployment dep)
- {
- // does nothing
- }
-
- @Override
- public void stop(Deployment dep)
- {
- // does nothing
- }
-
-}
15 years, 6 months
- 1
- 0
JBossWS SVN: r8645 - in common/trunk: src/main/java/org/jboss/wsf/common and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-04 00:54:16 -0500 (Tue, 04 Nov 2008)
New Revision: 8645
Removed:
common/trunk/src/main/java/org/jboss/wsf/common/concurrent/
Modified:
common/trunk/.classpath
common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java
Log:
[JBWS-2338] removing DAManagerLocator iface
Modified: common/trunk/.classpath
===================================================================
--- common/trunk/.classpath 2008-11-04 05:50:56 UTC (rev 8644)
+++ common/trunk/.classpath 2008-11-04 05:54:16 UTC (rev 8645)
@@ -4,5 +4,6 @@
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jbossws-spi"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java 2008-11-04 05:50:56 UTC (rev 8644)
+++ common/trunk/src/main/java/org/jboss/wsf/common/servlet/AbstractEndpointServlet.java 2008-11-04 05:54:16 UTC (rev 8645)
@@ -31,13 +31,10 @@
import javax.servlet.http.HttpServletResponse;
import org.jboss.wsf.common.ObjectNameFactory;
-import org.jboss.wsf.spi.DeploymentAspectManagerLocator;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointRegistry;
@@ -48,8 +45,6 @@
/**
* A cross stack webservice endpoint servlet.
- * Backward compatible mode is used on JBoss AS 4.2 series.
- * Not backward compatible mode is used on JBoss AS 5.0 series
* @author thomas.diesler(a)jboss.org
* @author heiko.braun(a)jboss.com
* @author richard.opalka(a)jboss.com
@@ -57,12 +52,9 @@
public abstract class AbstractEndpointServlet extends HttpServlet
{
- private static final String PROPERTY_NAME = "org.jboss.ws.webapp.ServletAspectManagerName";
private final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
protected Endpoint endpoint;
private EndpointRegistry epRegistry;
- private DeploymentAspectManager aspectsManager;
- private boolean backwardCompatibilityMode;
/**
* Constructor
@@ -81,22 +73,6 @@
}
/**
- * Servlet lifecycle destroy method
- */
- public final void destroy()
- {
- try
- {
- this.stopAspectManager();
- this.stopEndpoint();
- }
- finally
- {
- super.destroy();
- }
- }
-
- /**
* Serves the requests
*/
public final void service(HttpServletRequest req, HttpServletResponse res)
@@ -124,100 +100,6 @@
}
/**
- * Initializes aspect manager if not backward compatible mode
- */
- private void initAspectManager()
- {
- final String managerName = (String)this.endpoint.getService().getDeployment().getProperty(PROPERTY_NAME);
- if (managerName == null)
- {
- this.backwardCompatibilityMode = true;
- }
-
- if (!this.backwardCompatibilityMode)
- {
- final DeploymentAspectManagerLocator locator = this.spiProvider.getSPI(DeploymentAspectManagerLocator.class);
- this.aspectsManager = locator.locateDeploymentAspectManager(managerName);
- }
- }
-
- /**
- * Starts servlet related aspects if not backward compatible mode
- */
- private void startAspectManager()
- {
- if (!this.backwardCompatibilityMode)
- {
- this.assertCorrectState();
-
- final Deployment dep = this.endpoint.getService().getDeployment();
-
- if (this.endpoint.getState() != EndpointState.STARTED) // [JBWS-2338] TODO fix this hack preventing exceptions
- {
- this.aspectsManager.deploy(dep);
- }
- }
- }
-
- /**
- * Stops servlet related aspects if not backward compatible mode
- */
- private void stopAspectManager()
- {
- if (!this.backwardCompatibilityMode)
- {
- this.assertCorrectState();
-
- final Deployment dep = this.endpoint.getService().getDeployment();
-
- if (this.endpoint.getState() == EndpointState.STARTED) // [JBWS-2338] TODO fix this hack preventing exceptions
- {
- try
- {
- this.aspectsManager.undeploy(dep);
- }
- finally
- {
- this.aspectsManager = null;
- }
- }
- }
- }
-
- /**
- * Fires endpoint start event if not backward compatible mode
- */
- private void startEndpoint()
- {
- if (!this.backwardCompatibilityMode)
- {
- Deployment dep = this.endpoint.getService().getDeployment();
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- ep.getLifecycleHandler().start(ep); // [JBWS-2338] TODO fix this hack preventing exceptions
- }
- }
- }
-
- /**
- * Fires endpoint stop event if not backward compatible mode
- */
- private void stopEndpoint()
- {
- if (!this.backwardCompatibilityMode)
- {
- if (this.endpoint.getState() == EndpointState.STARTED)
- {
- Deployment dep = this.endpoint.getService().getDeployment();
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- ep.getLifecycleHandler().stop(ep); // [JBWS-2338] TODO fix this hack preventing exceptions
- }
- }
- }
- }
-
- /**
* Abstract method that must be overriden by each stack servlet endpoint
* @param servletContext servlet context
* @param servletName servlet name
@@ -231,11 +113,8 @@
private void initServiceEndpoint(ServletConfig servletConfig)
{
this.initEndpoint(servletConfig.getServletContext().getContextPath(), getServletName());
- this.initAspectManager();
this.setRuntimeLoader();
- this.startAspectManager();
this.postInit(servletConfig);
- this.startEndpoint();
}
/**
@@ -281,16 +160,4 @@
dep.setRuntimeClassLoader(classLoader);
}
}
-
- /**
- * Asserts this object correct state
- */
- private void assertCorrectState()
- {
- if (this.endpoint == null || this.aspectsManager == null)
- {
- throw new IllegalStateException();
- }
- }
-
}
15 years, 6 months
- 1
- 0
JBossWS SVN: r8644 - spi/trunk/src/main/java/org/jboss/wsf/spi.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-04 00:50:56 -0500 (Tue, 04 Nov 2008)
New Revision: 8644
Removed:
spi/trunk/src/main/java/org/jboss/wsf/spi/DeploymentAspectManagerLocator.java
Log:
[JBWS-2338] removing DAManagerLocator iface
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/DeploymentAspectManagerLocator.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/DeploymentAspectManagerLocator.java 2008-11-03 18:04:18 UTC (rev 8643)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/DeploymentAspectManagerLocator.java 2008-11-04 05:50:56 UTC (rev 8644)
@@ -1,38 +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.spi;
-
-import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
-
-/**
- * DeploymentAspectManager locator
- * @author richard.opalka(a)jboss.com
- */
-public interface DeploymentAspectManagerLocator
-{
- /**
- * Locate a deployment aspect manager by logical name
- * @param managerName deployment aspect manager name as specified in config file
- * @return deployment aspect manager instance
- */
- DeploymentAspectManager locateDeploymentAspectManager(String managerName);
-}
15 years, 6 months
- 1
- 0
JBossWS SVN: r8643 - in stack/native/trunk: modules/core and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-03 13:04:18 -0500 (Mon, 03 Nov 2008)
New Revision: 8643
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/pom.xml
Log:
Updating dependencies
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2008-11-03 16:38:47 UTC (rev 8642)
+++ stack/native/trunk/modules/core/pom.xml 2008-11-03 18:04:18 UTC (rev 8643)
@@ -15,8 +15,8 @@
</parent>
<properties>
- <jboss.jbosssx.version>2.0.2.CR6</jboss.jbosssx.version>
- <jboss.microcontainer.version>2.0.0.CR2</jboss.microcontainer.version>
+ <jboss.jbosssx.version>2.0.2.CR11</jboss.jbosssx.version>
+ <jboss.microcontainer.version>2.0.0.CR3</jboss.microcontainer.version>
</properties>
<!-- Dependencies -->
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-11-03 16:38:47 UTC (rev 8642)
+++ stack/native/trunk/pom.xml 2008-11-03 18:04:18 UTC (rev 8643)
@@ -67,7 +67,7 @@
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.jaxbintros.version>1.0.0.beta2</jboss.jaxbintros.version>
<jboss.logging.version>2.0.5.GA</jboss.logging.version>
- <jboss.remoting.version>2.5.0.GA</jboss.remoting.version>
+ <jboss.remoting.version>2.5.0.SP1</jboss.remoting.version>
<jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version>
<apache.scout.version>0.7rc2</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
15 years, 6 months
- 1
- 0
JBossWS SVN: r8642 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-03 11:38:47 -0500 (Mon, 03 Nov 2008)
New Revision: 8642
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt
Log:
[JBMETA-137] Enabling test
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt 2008-11-03 16:34:24 UTC (rev 8641)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501-JDK6.txt 2008-11-03 16:38:47 UTC (rev 8642)
@@ -7,9 +7,6 @@
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-# [EJBTHREE-1537] NPE in org.jboss.ejb3.javaee.JavaEEComponentHelper.createObjectName() method
-org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.*
-
# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
org/jboss/test/ws/jaxws/binding/**
org/jboss/test/ws/jaxws/handlerscope/**
15 years, 6 months
- 1
- 0
JBossWS SVN: r8641 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-03 11:34:24 -0500 (Mon, 03 Nov 2008)
New Revision: 8641
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-1822][JBMETA-137] Enabling test
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-03 15:04:22 UTC (rev 8640)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-03 16:34:24 UTC (rev 8641)
@@ -13,9 +13,6 @@
org/jboss/test/ws/jaxws/samples/jmstransport/**
org/jboss/test/ws/jaxws/samples/dar/**
-# [EJBTHREE-1537] NPE in org.jboss.ejb3.javaee.JavaEEComponentHelper.createObjectName() method
-org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.*
-
# [JBAS-5257] Cannot deploy through jax-ws endpoint API
org/jboss/test/ws/jaxws/endpoint/**
15 years, 6 months
- 1
- 0
JBossWS SVN: r8640 - in container/jboss42/trunk: src/main/java/org/jboss/wsf/container/jboss42 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-03 10:04:22 -0500 (Mon, 03 Nov 2008)
New Revision: 8640
Removed:
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/LazyAssemblyWSFRuntime.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/transport/
Modified:
container/jboss42/trunk/pom.xml
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java
container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java
container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml
Log:
[JBWS-2338] removing WSFRuntime abstraction
Modified: container/jboss42/trunk/pom.xml
===================================================================
--- container/jboss42/trunk/pom.xml 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/pom.xml 2008-11-03 15:04:22 UTC (rev 8640)
@@ -24,8 +24,8 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.0.7.GA</jbossws.common.version>
- <jbossws.spi.version>1.0.6.GA</jbossws.spi.version>
+ <jbossws.common.version>1.0.8-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>1.0.7-SNAPSHOT</jbossws.spi.version>
<!--
To deploy-file to snapshot repo do:
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -28,7 +28,6 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.spi.deployment.*;
import javax.management.MBeanServer;
@@ -37,11 +36,8 @@
/**
* An abstract web service deployer.
- * Lazily adds deployer hooks to the deployment interceptors.
- * Otherwise the dependency management at boot time doesn't work.
- *
+ *
* @author Thomas.Diesler(a)jboss.org
- * @author Heiko.Braun(a)jboss.com
* @since 25-Apr-2007
*/
public abstract class AbstractDeployerHook implements DeployerHook
@@ -49,24 +45,29 @@
// provide logging
protected final Logger log = Logger.getLogger(getClass());
- private WSFRuntime runtime;
+ private DeploymentAspectManager deploymentAspectManager;
private DeploymentModelFactory deploymentModelFactory;
private List<ObjectName> phaseOneInterceptors;
private List<ObjectName> phaseTwoInterceptors;
- /**
- * MC injected
- * @param runtime
- */
- public void setRuntime(WSFRuntime runtime)
+ protected String deploymentManagerName;
+
+ /** MC provided property **/
+ public void setDeploymentManagerName(String deploymentManagerName)
{
- this.runtime = runtime;
+ this.deploymentManagerName = deploymentManagerName;
}
+
+ public DeploymentAspectManager getDeploymentAspectManager()
+ {
+ if(null == deploymentAspectManager)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).getDeploymentAspectManager( deploymentManagerName );
+ }
- public WSFRuntime getRuntime()
- {
- return this.runtime;
+ return deploymentAspectManager;
}
public DeploymentModelFactory getDeploymentModelFactory()
@@ -133,6 +134,7 @@
*/
public void start()
{
+
MBeanServer server = MBeanServerLocator.locateJBoss();
try
{
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHookEJB.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -22,34 +22,14 @@
package org.jboss.wsf.container.jboss42;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.DeploymentException;
/**
- * An abstract deployer for EJB Endpoints.
- * Enganges the START lifecylcle of an endpoint.
+ * An abstract deployer for EJB Endpoints
*
* @author Thomas.Diesler(a)jboss.org
- * @author Heiko.Braun(a)jboss.com
- *
* @since 25-Apr-2007
*/
public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook
{
- public void deploy(DeploymentInfo unit) throws DeploymentException
- {
- if (!ignoreDeployment(unit) && isWebServiceDeployment(unit))
- {
- super.deploy(unit); // Calls create
-
- log.debug("deploy: " + unit.shortName);
- Deployment dep = getDeployment(unit);
- if (dep == null || (dep.getState() != Deployment.DeploymentState.CREATED) )
- throw new DeploymentException("Create step failed");
-
- getRuntime().start(dep);
-
- unit.context.put(Deployment.class, dep);
- }
- }
+
}
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -92,8 +92,7 @@
dep.addAttachment(DeploymentInfo.class, unit);
}
- getRuntime().create(dep);
-
+ getDeploymentAspectManager().deploy(dep);
unit.context.put(Deployment.class, dep);
}
}
@@ -107,8 +106,7 @@
if (dep != null)
{
log.debug("undeploy: " + unit.shortName);
- getRuntime().stop(dep);
- getRuntime().destroy(dep);
+ getDeploymentAspectManager().undeploy(dep);
}
}
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -24,7 +24,6 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
-import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that builds the UnifiedDeploymentInfo
@@ -42,7 +41,7 @@
}
@Override
- public void create(Deployment dep, WSFRuntime runtime)
+ public void create(Deployment dep)
{
DeploymentInfo di = dep.getAttachment(DeploymentInfo.class);
if (di == null)
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeployerHookPostJSE.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -22,7 +22,6 @@
package org.jboss.wsf.container.jboss42;
import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.DeploymentException;
import org.jboss.wsf.spi.deployment.Deployment;
/**
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -21,21 +21,21 @@
*/
package org.jboss.wsf.container.jboss42;
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.WebServiceException;
+
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.WSFRuntime;
-import org.jboss.wsf.spi.WSFRuntimeLocator;
import org.jboss.wsf.spi.deployment.AbstractExtensible;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
+import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory;
import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
import org.jboss.wsf.spi.deployment.Service;
import org.jboss.wsf.spi.http.HttpContext;
import org.jboss.wsf.spi.http.HttpContextFactory;
import org.jboss.wsf.spi.http.HttpServer;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.WebServiceException;
-
/**
* A HTTP Server that uses DeploymentAspects
*
@@ -44,14 +44,6 @@
*/
public class DeploymentAspectHttpServer extends AbstractExtensible implements HttpServer
{
- private String runtimeName;
-
-
- public void setRuntimeName(String runtimeName)
- {
- this.runtimeName = runtimeName;
- }
-
/** Start an instance of this HTTP server */
public void start()
{
@@ -90,11 +82,9 @@
service.addEndpoint(ep);
// Deploy using deployment aspects
- WSFRuntimeLocator locator = spiProvider.getSPI(WSFRuntimeLocator.class);
- WSFRuntime runtime = locator.locateRuntime(runtimeName);
-
- runtime.create(dep);
- runtime.start(dep);
+ DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class);
+ DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI");
+ depManager.deploy(dep);
}
catch (RuntimeException rte)
{
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPostJSE.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -24,7 +24,6 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.DeploymentException;
/**
* A deployer JAXRPC JSE Endpoints
@@ -35,22 +34,6 @@
public class JAXRPCDeployerHookPostJSE extends DeployerHookPostJSE
{
- public void deploy(DeploymentInfo unit) throws DeploymentException
- {
- if (ignoreDeployment(unit))
- return;
-
- if (!ignoreDeployment(unit) && isWebServiceDeployment(unit))
- {
- log.debug("deploy: " + unit.shortName);
- Deployment dep = getDeployment(unit);
- if(null==dep || Deployment.DeploymentState.CREATED != dep.getState())
- throw new DeploymentException("Create step is missing");
-
- getRuntime().start(dep);
- }
- }
-
/** Get the deployment type this deployer can handle
*/
public Deployment.DeploymentType getDeploymentType()
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookPreJSE.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -39,21 +39,12 @@
/**
* A deployer JAXRPC JSE Endpoints
- *
* @author Thomas.Diesler(a)jboss.org
- * @author Heiko.Braun(a)jboss.com
- *
- * @see org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect#create(org.jboss.wsf.spi.deployment.Deployment, org.jboss.wsf.spi.WSFRuntime)
* @since 25-Apr-2007
*/
public class JAXRPCDeployerHookPreJSE extends AbstractDeployerHookJSE
{
- public void undeploy(DeploymentInfo unit)
- {
- // the post hook deals with undeployment
- }
-
/** Get the deployemnt type this deployer can handle
*/
public DeploymentType getDeploymentType()
@@ -103,7 +94,6 @@
Class<?> epBean = loader.loadClass(servletClass.trim());
// If this is a servlet we defer the the bean creation
- // See ModifyWebMetaDataDeploymentAspect#create(Deployment dep, WSFRuntime runtime)
if (javax.servlet.Servlet.class.isAssignableFrom(epBean))
servletClass = null;
}
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -25,7 +25,6 @@
import javax.xml.ws.WebServiceProvider;
import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.DeploymentException;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Ejb3ModuleMBean;
import org.jboss.ejb3.mdb.MessagingContainer;
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPostJSE.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -22,7 +22,6 @@
package org.jboss.wsf.container.jboss42;
import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.DeploymentException;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
@@ -32,24 +31,6 @@
public class JAXWSDeployerHookPostJSE extends DeployerHookPostJSE
{
-
- public void deploy(DeploymentInfo unit) throws DeploymentException
- {
- if (ignoreDeployment(unit))
- return;
-
- if (!ignoreDeployment(unit) && isWebServiceDeployment(unit))
- {
- log.debug("deploy: " + unit.shortName);
- Deployment dep = getDeployment(unit);
-
- if (null == dep || Deployment.DeploymentState.CREATED != dep.getState())
- throw new DeploymentException("Create step failed");
-
- getRuntime().start(dep);
- }
- }
-
/** Get the deployment type this deployer can handle
*/
public Deployment.DeploymentType getDeploymentType()
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookPreJSE.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -50,12 +50,6 @@
public class JAXWSDeployerHookPreJSE extends AbstractDeployerHookJSE
{
-
- public void undeploy(DeploymentInfo unit)
- {
- // let the post deployer hook deal with undeployment
- }
-
/** Get the deployemnt type this deployer can handle
*/
public DeploymentType getDeploymentType()
Deleted: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/LazyAssemblyWSFRuntime.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/LazyAssemblyWSFRuntime.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/LazyAssemblyWSFRuntime.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -1,143 +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.jboss42;
-
-import org.jboss.wsf.spi.WSFRuntime;
-import org.jboss.wsf.spi.ComposableRuntime;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.invocation.RequestHandlerFactory;
-import org.jboss.wsf.spi.invocation.InvocationHandlerFactory;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.spi.transport.TransportManagerFactory;
-import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
-
-/**
- * Lazy assembly required because MC 1.0.x doesn't support IOC
- * across different beans configurations.
- *
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class LazyAssemblyWSFRuntime implements WSFRuntime, ComposableRuntime
-{
-
- private boolean assembled;
- private String runtimeName;
- private TransportManagerFactory tmf;
- private RequestHandlerFactory rhf;
- private InvocationHandlerFactory ihf;
- private DeploymentAspectManager dam;
- private EndpointRegistry reg;
-
- public void setRuntimeName(String runtimeName)
- {
- this.runtimeName = runtimeName;
- }
-
- public void create(Deployment deployment)
- {
- assemble();
- dam.create(deployment, this);
- }
-
- public void start(Deployment deployment)
- {
- assemble();
- dam.start(deployment, this);
- }
-
- public void stop(Deployment deployment)
- {
- assemble();
- dam.stop(deployment, this);
- }
-
- public void destroy(Deployment deployment)
- {
- assemble();
- dam.destroy(deployment, this);
- }
-
-
- public void setTransportManagerFactory(TransportManagerFactory factory)
- {
- this.tmf = factory;
- }
-
- public TransportManagerFactory getTransportManagerFactory()
- {
- return this.tmf;
- }
-
- public void setEndpointRegistry(EndpointRegistry endpointRegistry)
- {
- this.reg = endpointRegistry;
- }
-
- public EndpointRegistry getEndpointRegistry()
- {
- return this.reg;
- }
-
- public void setDeploymentAspectManager(DeploymentAspectManager deploymentManager)
- {
- this.dam = deploymentManager;
- }
-
- public DeploymentAspectManager getDeploymentAspectManager()
- {
- return this.dam;
- }
-
- public void setRequestHandlerFactory(RequestHandlerFactory factory)
- {
- this.rhf = factory;
- }
-
- public RequestHandlerFactory getRequestHandlerFactory()
- {
- return this.rhf;
- }
-
- public void setInvocationHandlerFactory(InvocationHandlerFactory factory)
- {
- this.ihf = factory;
- }
-
- public InvocationHandlerFactory getInvocationHandlerFactory()
- {
- return this.ihf;
- }
-
- private void assemble()
- {
- if(!assembled)
- {
- SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
- RequestHandlerFactory rhFactory = provider.getSPI(RequestHandlerFactory.class);
- setRequestHandlerFactory(rhFactory);
-
- assembled = true;
- }
- }
-}
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -21,7 +21,6 @@
*/
package org.jboss.wsf.container.jboss42;
-import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -41,7 +40,7 @@
this.webXMLRewriter = serviceEndpointPublisher;
}
- public void create(Deployment dep, WSFRuntime runtime)
+ public void create(Deployment dep)
{
RewriteResults results = webXMLRewriter.rewriteWebXml(dep);
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/RuntimeLoaderDeploymentAspect.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -25,7 +25,6 @@
import org.jboss.metadata.WebMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
-import org.jboss.wsf.spi.WSFRuntime;
/**
* Determines the correct runtime loader for per deployment type
@@ -36,7 +35,7 @@
public class RuntimeLoaderDeploymentAspect extends DeploymentAspect
{
- public void start(Deployment dep, WSFRuntime runtime)
+ public void create(Deployment dep)
{
// JSE endpoints
Modified: container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java
===================================================================
--- container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2008-11-03 15:04:22 UTC (rev 8640)
@@ -34,7 +34,6 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.WSFDeploymentException;
-import org.jboss.wsf.spi.WSFRuntime;
/**
* Publish the HTTP service endpoint to Tomcat
@@ -54,7 +53,7 @@
this.webXMLRewriter = serviceEndpointPublisher;
}
- public void create(Deployment dep, WSFRuntime runtime)
+ public void create(Deployment dep)
{
URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url");
if (warURL == null)
Modified: container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml 2008-11-03 14:34:48 UTC (rev 8639)
+++ container/jboss42/trunk/src/main/resources/jbossws-jboss42-config.xml 2008-11-03 15:04:22 UTC (rev 8640)
@@ -1,324 +1,287 @@
-<!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
+ <!-- Locate the single instance of the kernel -->
+ <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- </bean>
+ </bean>
+
+ <!-- Locate the single instance of the MBeanServer -->
+ <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/>
+
+ <!-- The HTTPServer used by the JAXWS Endpoint API -->
+ <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"/>
- <!-- Locate the single instance of the MBeanServer -->
- <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/>
+ <!-- Bind Service objects in client environment context -->
+ <bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
- <!-- The HTTPServer used by the JAXWS Endpoint API -->
- <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer">
- <property name="runtimeName">EndpointAPIRuntime</property>
- </bean>
+ <!-- JBoss_4_2_0_GA uses this hardcoded bean name -->
+ <bean name="ServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
- <!-- Bind Service objects in client environment context -->
- <bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
+ <!--
+ *********************************************************************************************************************
+ Web Service deployment
+
+ There are three deployer interceptors registered with the JBoss Deployers.
+
+ 1) DeployerInterceptorJSE
+ 2) DeployerInterceptorEJB21
+ 3) DeployerInterceptorEJB3
+
+ Each interceptor has a number of DeployerHooks registerd with it
+
+ Conceptually, each of these hooks implements the following pattern:
+
+ DployerHook.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 DeployerManager injected into it.
+ A web service DeployerManager maintains a list of Deployers, each of which
+ handles a single aspect of web service deployment.
+
+ Finally, each Endpoint is registered with the EndpointRegistry.
+
+ *********************************************************************************************************************
+ -->
+
+ <!--
+ Register DeployerHooks with JBoss deployers
+ -->
- <!-- JBoss_4_2_0_GA uses this hardcoded bean name -->
- <bean name="ServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
-
- <!--
- *********************************************************************************************************************
- Web Service deployment
-
- There are three deployer interceptors registered with the JBoss Deployers.
-
- 1) DeployerInterceptorJSE
- 2) DeployerInterceptorEJB21
- 3) DeployerInterceptorEJB3
-
- Each interceptor has a number of DeployerHooks registerd with it
-
- Conceptually, each of these hooks implements the following pattern:
-
- DployerHook.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 DeployerManager injected into it.
- A web service DeployerManager maintains a list of Deployers, each of which
- handles a single aspect of web service deployment.
-
- Finally, each Endpoint is registered with the EndpointRegistry.
-
- *********************************************************************************************************************
- -->
-
- <!--
- Register DeployerHooks with JBoss deployers
- -->
-
- <!-- Phase 1 -->
- <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPreJSE">
- <property name="runtime"><inject bean="WebserviceJSERuntime"/></property>
+ <!-- Phase 1 -->
+ <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPreJSE">
+ <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
<property name="phaseOneInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
</property>
- </bean>
+ </bean>
- <!-- Phase 2 -->
- <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPostJSE">
- <property name="runtime"><inject bean="WebserviceJSERuntime"/></property>
+ <!-- Phase 2 -->
+ <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPostJSE">
+ <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
<property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
</property>
- </bean>
+ </bean>
- <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21">
- <property name="runtime"><inject bean="WebserviceEJBRuntime"/></property>
+ <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21">
+ <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property>
<property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorEJB21</value>
- </list>
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorEJB21</value>
+ </list>
</property>
- </bean>
+ </bean>
- <!-- Phase 1 -->
- <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPreJSE">
- <property name="runtime"><inject bean="WebserviceJSERuntime"/></property>
+ <!-- Phase 1 -->
+ <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPreJSE">
+ <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property>
<property name="phaseOneInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
</property>
- </bean>
+ </bean>
- <!-- Phase 2 -->
- <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPostJSE">
- <property name="runtime"><inject bean="WebserviceJSERuntime"/></property>
+ <!-- Phase 2 -->
+ <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPostJSE">
+ <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property>
<property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorJSE</value>
- </list>
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorJSE</value>
+ </list>
</property>
- </bean>
+ </bean>
- <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3">
- <property name="runtime"><inject bean="WebserviceEJBRuntime"/></property>
+ <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3">
+ <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property>
<property name="phaseTwoInterceptors">
- <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
- <value>jboss.ws:service=DeployerInterceptorEJB3</value>
- </list>
+ <list class="java.util.LinkedList" elementClass="javax.management.ObjectName">
+ <value>jboss.ws:service=DeployerInterceptorEJB3</value>
+ </list>
</property>
- </bean>
-
- <!--
- *********************************************************************************************************************
- Main WSFRuntimes.
- -->
-
- <bean name="WebserviceJSERuntime" class="org.jboss.wsf.container.jboss42.LazyAssemblyWSFRuntime">
- <property name="runtimeName">WebserviceJSERuntime</property>
- <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
- <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property>
-
- <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property>
- </bean>
-
- <bean name="WebserviceEJBRuntime" class="org.jboss.wsf.container.jboss42.LazyAssemblyWSFRuntime">
- <property name="runtimeName">WebserviceEJBRuntime</property>
- <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
- <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property>
-
- <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property>
- </bean>
-
- <bean name="EndpointAPIRuntime" class="org.jboss.wsf.container.jboss42.LazyAssemblyWSFRuntime">
- <property name="runtimeName">EndpointAPIRuntime</property>
- <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
- <property name="endpointRegistry"><inject bean="WSEndpointRegistry"/></property>
-
- <property name="invocationHandlerFactory"><inject bean="InvocationHandlerFactory"/></property>
- </bean>
-
-
- <!--
- *********************************************************************************************************************
- WSFRuntimes Components
- -->
-
- <!-- The registry for web service endpoints -->
- <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- </bean>
-
- <!-- invcocation handling -->
- <bean name="InvocationHandlerFactory" class="org.jboss.wsf.container.jboss42.InvocationHandlerFactoryImpl"/>
-
- <!--
- *********************************************************************************************************************
- Each DeploymentAspectManger maintains a list of DeploymentAspects
- -->
- <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
- <property name="name">WSDeploymentAspectManagerJSE</property>
- </bean>
- <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ </bean>
+
+ <!--
+ Each DeploymentAspectManger maintains a list of DeploymentAspects
+ -->
+ <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ <property name="name">WSDeploymentAspectManagerPreJSE</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>
+ <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
<property name="name">WSDeploymentAspectManagerEJB</property>
- </bean>
- <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
+ </bean>
+ <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
<property name="name">WSDeploymentAspectManagerEndpointAPI</property>
- </bean>
-
- <!--
- The container deployment aspects
- -->
- <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect">
- <property name="provides">ContainerMetaData,VFSRoot</property>
+ </bean>
+
+ <!--
+ The container deployment aspects
+ -->
+ <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect">
+ <property name="provides">ContainerMetaData, VFSRoot</property>
<property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property>
- </bean>
-
- <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
+ </bean>
+
+ <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">ContextRoot</property>
- </bean>
+ </bean>
+
+ <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect">
+ <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property>
+ </bean>
- <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect">
- <property name="provides">ContainerMetaData,RuntimeLoader,URLPattern,VFSRoot</property>
- </bean>
-
- <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
+ <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
<property name="requires">URLPattern</property>
<property name="provides">EndpointAddress</property>
- </bean>
-
- <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ </bean>
+
+ <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
<property name="requires">ContainerMetaData</property>
- <property name="provides">ContainerEndpointHandler</property>
- </bean>
-
- <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
+ <property name="provides">ContainerEndpointHandler</property>
+ </bean>
+
+ <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
<property name="requires">LAST_DEPLOYMENT_ASPECT</property>
- </bean>
+ </bean>
- <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
- <property name="provides">EndpointMetrics</property>
- </bean>
-
- <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
+ <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
+ <property name="provides">EndpointMetrics</property>
+ </bean>
+
+ <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
<property name="requires">URLPattern</property>
<property name="provides">EndpointName</property>
- </bean>
-
- <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
+ </bean>
+
+ <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
<property name="requires">EndpointName</property>
<property name="provides">RegisteredEndpoint</property>
- <depends>WSEndpointRegistry</depends>
- </bean>
-
- <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect">
- <property name="requires">ContextProperties,ContainerMetaData,StackDescriptor,WebMetaData</property>
+ </bean>
+
+ <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect">
+ <property name="requires">ContextProperties, ContainerMetaData, StackDescriptor</property>
<property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
- </bean>
-
- <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect">
+ </bean>
+
+ <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">RuntimeLoader</property>
- </bean>
-
- <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect">
- <property name="requires">ContextRoot,ContainerMetaData</property>
+ </bean>
+
+ <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect">
+ <property name="requires">ContextRoot, ContainerMetaData</property>
<property name="provides">URLPattern</property>
- </bean>
-
- <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss42.WebAppDeploymentAspect">
- <property name="requires">WebMetaData,ContextProperties</property>
+ </bean>
+
+ <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss42.WebAppDeploymentAspect">
+ <property name="requires">WebMetaData, ContextProperties</property>
<property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property>
- </bean>
-
- <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect">
+ </bean>
+
+ <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect">
<property name="requires">URLPattern</property>
<property name="provides">WebMetaData</property>
<property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
- </bean>
+ </bean>
- <bean name="WSFakeWebMetaDataDeploymentAspect" class="org.jboss.wsf.framework.deployment.IdentityDeploymentAspect">
- <property name="provides">WebMetaData</property>
- </bean>
-
- <!-- Deployment aspect helper beans -->
- <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/>
- <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/>
- <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss42.ContainerMetaDataAdapter">
+ <!-- Deployment aspect helper beans -->
+ <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/>
+ <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/>
+ <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss42.ContainerMetaDataAdapter">
<property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property>
<property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property>
<property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property>
- </bean>
- <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
- <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
- <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/>
- <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/>
- <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss42.WebXMLRewriterImpl">
+ </bean>
+ <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/>
+ <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/>
+ <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/>
+ <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/>
+ <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss42.WebXMLRewriterImpl">
<property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property>
- </bean>
+ </bean>
+
+ <!-- Deployment aspect installers -->
+ <!-- Phase 1 -->
+ <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></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="WSContextRootDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ <inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSModifyWebMetaDataDeploymentAspect"/>
+ <inject bean="WSURLPatternDeploymentAspect"/>
+ </set>
+ </property>
+ </bean>
- <!-- Deployment aspect installers -->
- <!-- Phase 1 -->
- <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
- <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
+ <!-- Phase 2 -->
+ <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></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="WSContextRootDeploymentAspect"/>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointHandlerDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSModifyWebMetaDataDeploymentAspect"/>
- <inject bean="WSURLPatternDeploymentAspect"/>
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSRuntimeLoaderDeploymentAspect"/>
- <inject bean="WSFakeWebMetaDataDeploymentAspect"/>
- </set>
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ <inject bean="WSRuntimeLoaderDeploymentAspect"/>
+ </set>
</property>
- </bean>
+ <depends>WSDeploymentAspectInstallerPreJSE</depends>
+ </bean>
- <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <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="WSContextRootDeploymentAspect"/>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointHandlerDeploymentAspect"/>
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSRuntimeLoaderDeploymentAspect"/>
- <inject bean="WSURLPatternDeploymentAspect"/>
- <inject bean="WSWebAppDeploymentAspect"/>
- <inject bean="WSWebAppGeneratorDeploymentAspect"/>
- </set>
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSContainerMetaDataDeploymentAspect"/>
+ <inject bean="WSContextRootDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ <inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSRuntimeLoaderDeploymentAspect"/>
+ <inject bean="WSURLPatternDeploymentAspect"/>
+ <inject bean="WSWebAppDeploymentAspect"/>
+ <inject bean="WSWebAppGeneratorDeploymentAspect"/>
+ </set>
</property>
- </bean>
+ </bean>
- <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
<property name="sortAspectsOnCreate">false</property>
<property name="aspects">
- <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
- <inject bean="WSEndpointAPIDeploymentAspect"/>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointHandlerDeploymentAspect"/>
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- <inject bean="WSWebAppDeploymentAspect"/>
- <inject bean="WSWebAppGeneratorDeploymentAspect"/>
- </set>
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSEndpointAPIDeploymentAspect"/>
+ <inject bean="WSEndpointAddressDeploymentAspect"/>
+ <inject bean="WSEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSEndpointLifecycleDeploymentAspect"/>
+ <inject bean="WSEndpointMetricsDeploymentAspect"/>
+ <inject bean="WSEndpointNameDeploymentAspect"/>
+ <inject bean="WSEndpointRegistryDeploymentAspect"/>
+ <inject bean="WSWebAppDeploymentAspect"/>
+ <inject bean="WSWebAppGeneratorDeploymentAspect"/>
+ </set>
</property>
- </bean>
+ </bean>
15 years, 6 months
- 1
- 0