JBossWS SVN: r10311 - container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-03 08:31:04 -0400 (Fri, 03 Jul 2009)
New Revision: 10311
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/DeployerUtils.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java
Log:
[JBWS-2332][JBWS-2382] refactoring (WIP)
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/DeployerUtils.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/DeployerUtils.java 2009-07-03 09:34:24 UTC (rev 10310)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/DeployerUtils.java 2009-07-03 12:31:04 UTC (rev 10311)
@@ -33,6 +33,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.metadata.javaee.spec.ParamValueMetaData;
+import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -168,4 +169,18 @@
}
return endpointClass;
}
+
+ static ServletMetaData getServletForName( final JBossWebMetaData jbossWebMD, final String servletName )
+ {
+ for ( JBossServletMetaData servlet : jbossWebMD.getServlets() )
+ {
+ if ( servlet.getName().equals( servletName ) )
+ {
+ return servlet;
+ }
+ }
+
+ throw new IllegalStateException( "Cannot find servlet for link: " + servletName );
+ }
+
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2009-07-03 09:34:24 UTC (rev 10310)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2009-07-03 12:31:04 UTC (rev 10311)
@@ -21,6 +21,7 @@
*/
package org.jboss.webservices.integration.deployers;
+import java.io.IOException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
@@ -34,7 +35,6 @@
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.serviceref.VirtualFileAdaptor;
-import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.virtual.VirtualFile;
@@ -44,12 +44,11 @@
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.Service;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.deployment.WSFDeploymentException;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
@@ -64,7 +63,9 @@
public final class WSDeploymentDeployer extends AbstractRealDeployer
{
+ /** WSDL and XSD files filter. */
private static final WSVirtualFileFilter WS_FILE_FILTER = new WSVirtualFileFilter();
+ /** Deployment model factory. */
private final DeploymentModelFactory deploymentModelFactory;
/**
@@ -83,16 +84,21 @@
this.addOutput( Deployment.class );
// deployment factory
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class);
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ this.deploymentModelFactory = spiProvider.getSPI( DeploymentModelFactory.class );
}
+ /**
+ * Creates new Web Service deployment and registers it with deployment unit.
+ *
+ * @param unit deployment unit
+ */
@Override
protected void internalDeploy( final DeploymentUnit unit ) throws DeploymentException
{
- if ( ASIntegrationHelper.isJaxrpcEjbDeployment( unit ) )
+ if ( ASIntegrationHelper.isJaxwsPojoDeployment( unit ) )
{
- this.newJaxrpcEjbDeployment( unit );
+ this.newJaxwsPojoDeployment( unit );
}
else if ( ASIntegrationHelper.isJaxwsEjbDeployment( unit ) )
{
@@ -102,215 +108,214 @@
{
this.newJaxrpcPojoDeployment( unit );
}
- else if ( ASIntegrationHelper.isJaxwsPojoDeployment( unit ) )
+ else if ( ASIntegrationHelper.isJaxrpcEjbDeployment( unit ) )
{
- this.newJaxwsPojoDeployment( unit );
+ this.newJaxrpcEjbDeployment( unit );
}
}
-
+
+ /**
+ * Creates new JAXRPC EJB21 deployment and registers it with deployment unit.
+ *
+ * @param unit deployment unit
+ */
private void newJaxrpcEjbDeployment( final DeploymentUnit unit )
{
- ArchiveDeployment dep = newDeployment(unit);
-
- Service service = dep.getService();
-
- JBossMetaData jbmd = unit.getAttachment(JBossMetaData.class);
- if (jbmd == null)
- throw new IllegalStateException("Deployment unit does not contain application meta data");
-
- WebservicesMetaData wsMetaData = unit.getAttachment(WebservicesMetaData.class);
- if (wsMetaData == null)
- throw new IllegalStateException("Deployment unit does not contain webservices meta data");
-
- WebServiceDeployment webServiceDeployment = unit.getAttachment(WebServiceDeployment.class);
- if (webServiceDeployment == null)
- throw new IllegalStateException("Deployment unit does not contain webServiceDeployment");
+ final ArchiveDeployment dep = this.newDeployment( unit );
+ final JBossMetaData jbmd = this.getAttachment( JBossMetaData.class, unit, dep );
+ final WebservicesMetaData wsMetaData = this.getAttachment( WebservicesMetaData.class, unit, dep );
+ this.getAttachment( WebServiceDeployment.class, unit, dep );
- // Copy the attachments
- dep.addAttachment(WebservicesMetaData.class, wsMetaData);
- dep.addAttachment(JBossMetaData.class, jbmd);
- dep.addAttachment(WebServiceDeployment.class, webServiceDeployment);
-
- for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
+ for ( WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions() )
{
- for (PortComponentMetaData pcmd : wsd.getPortComponents())
+ for ( PortComponentMetaData pcmd : wsd.getPortComponents() )
{
- String ejbLink = pcmd.getEjbLink();
- if (ejbLink == null)
- throw new IllegalStateException("ejb-link cannot be null");
+ final String ejbName = pcmd.getEjbLink();
+ final JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean( ejbName );
+ final String ejbClass = beanMetaData.getEjbClass();
- JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbLink);
- if (beanMetaData == null)
- throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink);
-
- String ejbClass = beanMetaData.getEjbClass();
-
- // Create the endpoint
- Endpoint ep = this.deploymentModelFactory.newEndpoint(ejbClass);
- ep.setShortName(ejbLink);
- service.addEndpoint(ep);
+ this.createEndpoint( ejbClass, ejbName, dep );
}
}
- dep.addAttachment(DeploymentUnit.class, unit);
+ dep.addAttachment( DeploymentUnit.class, unit );
unit.addAttachment( Deployment.class, dep );
}
+ /**
+ * Creates new JAXWS EJB3 deployment and registers it with deployment unit.
+ *
+ * @param unit deployment unit
+ */
private void newJaxwsEjbDeployment( final DeploymentUnit unit )
{
- ArchiveDeployment dep = newDeployment(unit);
+ final ArchiveDeployment dep = this.newDeployment( unit );
+ final WebServiceDeployment webServiceDeployment = this.getAttachment( WebServiceDeployment.class, unit, dep );
- Service service = dep.getService();
+ final Iterator< WebServiceDeclaration > it = webServiceDeployment.getServiceEndpoints().iterator();
+ while ( it.hasNext() )
+ {
+ final WebServiceDeclaration container = it.next();
- WebServiceDeployment webServiceDeployment = unit.getAttachment(WebServiceDeployment.class);
- if (webServiceDeployment == null)
- throw new IllegalStateException("Deployment unit does not contain webServiceDeployment");
-
- // Copy the attachments
- dep.addAttachment(WebServiceDeployment.class, webServiceDeployment);
-
- Iterator<WebServiceDeclaration> it = webServiceDeployment.getServiceEndpoints().iterator();
- while (it.hasNext())
- {
- WebServiceDeclaration container = it.next();
- if (DeployerUtils.isWebServiceBean(container))
+ if ( DeployerUtils.isWebServiceBean( container ) )
{
- String ejbName = container.getComponentName();
- String epBean = container.getComponentClassName();
+ final String ejbName = container.getComponentName();
+ final String ejbClass = container.getComponentClassName();
- // Create the endpoint
- Endpoint ep = this.deploymentModelFactory.newEndpoint(epBean);
- ep.setShortName(ejbName);
-
- String containName = container.getContainerName();
- if(null==containName)
- throw new IllegalArgumentException("Target container name not set");
- ep.setProperty(InvocationHandlerEJB3.CONTAINER_NAME, containName);
-
- service.addEndpoint(ep);
+ final Endpoint ep = this.createEndpoint( ejbClass, ejbName, dep );
+ ep.setProperty( InvocationHandlerEJB3.CONTAINER_NAME, container.getContainerName() );
}
}
- dep.addAttachment(DeploymentUnit.class, unit);
+ dep.addAttachment( DeploymentUnit.class, unit );
unit.addAttachment( Deployment.class, dep );
}
+ /**
+ * Creates new JAXRPC POJO deployment and registers it with deployment unit.
+ *
+ * @param unit deployment unit
+ */
private void newJaxrpcPojoDeployment( final DeploymentUnit unit )
{
- ArchiveDeployment dep = newDeployment(unit);
+ final ArchiveDeployment dep = this.newDeployment( unit );
+ final JBossWebMetaData webMetaData = this.getAttachment( JBossWebMetaData.class, unit, dep );
+ final WebservicesMetaData wsMetaData = this.getAttachment( WebservicesMetaData.class, unit, dep );
- Service service = dep.getService();
-
- JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
- if (webMetaData == null)
- throw new IllegalStateException("Deployment unit does not contain web meta data");
-
- WebservicesMetaData wsMetaData = unit.getAttachment(WebservicesMetaData.class);
- if (wsMetaData == null)
- throw new IllegalStateException("Deployment unit does not contain webservices meta data");
-
- // Copy the attachments
- dep.addAttachment(WebservicesMetaData.class, wsMetaData);
- dep.addAttachment(JBossWebMetaData.class, webMetaData);
-
- for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
+ for ( WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions() )
{
- for (PortComponentMetaData pcmd : wsd.getPortComponents())
+ for ( PortComponentMetaData pcmd : wsd.getPortComponents() )
{
- String servletLink = pcmd.getServletLink();
- if (servletLink == null)
- throw new IllegalStateException("servlet-link cannot be null");
+ final String pojoName = pcmd.getServletLink();
+ final ServletMetaData servlet = DeployerUtils.getServletForName( webMetaData, pojoName );
+ final String pojoClass = DeployerUtils.getTargetBean( servlet );
- ServletMetaData servlet = getServletForName(webMetaData, servletLink);
- String targetBean = DeployerUtils.getTargetBean(servlet);
-
- // Create the endpoint
- Endpoint ep = this.deploymentModelFactory.newEndpoint(targetBean);
- ep.setShortName(servletLink);
- service.addEndpoint(ep);
+ this.createEndpoint( pojoClass, pojoName, dep );
}
}
- dep.addAttachment(DeploymentUnit.class, unit);
+ dep.addAttachment( DeploymentUnit.class, unit );
unit.addAttachment( Deployment.class, dep );
}
+ /**
+ * Creates new JAXWS POJO deployment and registers it with deployment unit.
+ *
+ * @param unit deployment unit
+ */
private void newJaxwsPojoDeployment( final DeploymentUnit unit )
{
- ArchiveDeployment dep = newDeployment(unit);
+ final ArchiveDeployment dep = this.newDeployment( unit );
+ this.getAttachment( JBossWebMetaData.class, unit, dep );
- Service service = dep.getService();
-
- JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
- if (webMetaData == null)
- throw new IllegalStateException("Deployment unit does not contain web meta data");
-
- // Copy the attachments
- dep.addAttachment(JBossWebMetaData.class, webMetaData);
-
- List<ServletMetaData> servlets = DeployerUtils.getJaxwsServlets(unit);
- for (ServletMetaData servlet : servlets)
+ final List< ServletMetaData > servlets = DeployerUtils.getJaxwsServlets( unit );
+ for ( ServletMetaData servlet : servlets )
{
- String servletName = servlet.getName();
- String targetBean = DeployerUtils.getTargetBean(servlet);
+ final String pojoName = servlet.getName();
+ final String pojoClass = DeployerUtils.getTargetBean( servlet );
- // Create the endpoint
- Endpoint ep = this.deploymentModelFactory.newEndpoint(targetBean);
- ep.setShortName(servletName);
- service.addEndpoint(ep);
+ this.createEndpoint( pojoClass, pojoName, dep );
}
- dep.addAttachment(DeploymentUnit.class, unit);
+ dep.addAttachment( DeploymentUnit.class, unit );
unit.addAttachment( Deployment.class, dep );
}
-
- private ServletMetaData getServletForName(JBossWebMetaData wmd, String servletLink)
+
+ /**
+ * Creates new Web Service deployment.
+ *
+ * @param unit deployment unit
+ * @return archive deployment
+ */
+ private ArchiveDeployment newDeployment( final DeploymentUnit unit )
{
- for (JBossServletMetaData servlet : wmd.getServlets())
+ final ArchiveDeployment dep = ( ArchiveDeployment ) this.deploymentModelFactory.
+ newDeployment( unit.getSimpleName(), unit.getClassLoader() );
+
+ if ( unit instanceof VFSDeploymentUnit )
{
- if (servletLink.equals(servlet.getName()))
+ final VFSDeploymentUnit vfsUnit = ( VFSDeploymentUnit ) unit;
+ final List< VirtualFile > virtualFiles = vfsUnit.getMetaDataFiles( WSDeploymentDeployer.WS_FILE_FILTER );
+ final Set< UnifiedVirtualFile > uVirtualFiles = new HashSet< UnifiedVirtualFile >();
+ for ( VirtualFile vf : virtualFiles )
{
- return servlet;
+ // Adding the roots of the virtual files.
+ try
+ {
+ uVirtualFiles.add( new VirtualFileAdaptor( vf.getVFS().getRoot() ) );
+ }
+ catch ( IOException ioe )
+ {
+ throw new WSFDeploymentException( ioe );
+ }
}
+ dep.setMetadataFiles( new LinkedList<UnifiedVirtualFile>( uVirtualFiles ) );
}
- throw new IllegalStateException("Cannot find servlet for link: " + servletLink);
+
+ if ( unit.getParent() != null )
+ {
+ final DeploymentUnit parentUnit = unit.getParent();
+ final ArchiveDeployment parentDep = ( ArchiveDeployment ) this.deploymentModelFactory.
+ newDeployment( parentUnit.getSimpleName(), parentUnit.getClassLoader() );
+ dep.setParent( parentDep );
+ }
+
+ dep.setRootFile( new VirtualFileAdaptor( ( ( VFSDeploymentUnit ) unit ).getRoot() ) );
+ dep.setRuntimeClassLoader( unit.getClassLoader() );
+ dep.setType( unit.getAttachment( DeploymentType.class ) );
+
+ return dep;
}
- private ArchiveDeployment newDeployment(DeploymentUnit unit)
+ /**
+ * Creates new Web Service endpoint.
+ *
+ * @param endpointClass endpoint class name
+ * @param endpointName endpoint name
+ * @param dep deployment
+ * @return WS endpoint
+ */
+ private Endpoint createEndpoint( final String endpointClass, final String endpointName, final Deployment dep )
{
- try
+ if ( endpointName == null )
{
- ArchiveDeployment dep = (ArchiveDeployment)this.deploymentModelFactory.newDeployment(unit.getSimpleName(), unit.getClassLoader());
- if (unit instanceof VFSDeploymentUnit)
- {
- VFSDeploymentUnit vfsUnit = (VFSDeploymentUnit)unit;
- List<VirtualFile> virtualFiles = vfsUnit.getMetaDataFiles(WS_FILE_FILTER); //get all wsdl and xsd files
- Set<UnifiedVirtualFile> uVirtualFiles = new HashSet<UnifiedVirtualFile>();
- for (VirtualFile vf : virtualFiles)
- {
- // Adding the roots of the virtual files.
- uVirtualFiles.add(new VirtualFileAdaptor(vf.getVFS().getRoot()));
- }
- dep.setMetadataFiles(new LinkedList<UnifiedVirtualFile>(uVirtualFiles));
- }
+ throw new NullPointerException( "Null endpoint name" );
+ }
- if (unit.getParent() != null)
- {
- DeploymentUnit parentUnit = unit.getParent();
- ArchiveDeployment parentDep = (ArchiveDeployment)this.deploymentModelFactory.newDeployment(parentUnit.getSimpleName(), parentUnit.getClassLoader());
- dep.setParent(parentDep);
- }
-
- dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot()));
- dep.setRuntimeClassLoader(unit.getClassLoader());
- dep.setType(unit.getAttachment( DeploymentType.class ));
-
- return dep;
+ if ( endpointClass == null )
+ {
+ throw new NullPointerException( "Null endpoint class" );
}
- catch (Exception ex)
+
+ final Endpoint endpoint = this.deploymentModelFactory.newEndpoint( endpointClass );
+ endpoint.setShortName( endpointName );
+ dep.getService().addEndpoint( endpoint );
+
+ return endpoint;
+ }
+
+ /**
+ * Gets specified attachment from deployment unit.
+ * Checks it's not null and then propagates it to <b>dep</b>
+ * attachments. Finally it returns attachment value.
+ *
+ * @param <A> class type
+ * @param attachment attachment
+ * @param unit deployment unit
+ * @param dep deployment
+ * @return attachment value if found in unit
+ */
+ private <A> A getAttachment( final Class< A > attachment, final DeploymentUnit unit, final Deployment dep )
+ {
+ final A attachmentValue = unit.getAttachment( attachment );
+
+ if ( attachmentValue != null )
{
- throw new WSFDeploymentException("Cannot load spi.deployment.Deployment class", ex);
+ dep.addAttachment( attachment , attachmentValue );
+ return attachmentValue;
}
+
+ throw new IllegalStateException( "Deployment unit does not contain " + attachment );
}
-
+
}
14 years, 10 months
- 1
- 0
JBossWS SVN: r10310 - stack/metro/branches/ropalka/modules/server/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-03 05:34:24 -0400 (Fri, 03 Jul 2009)
New Revision: 10310
Modified:
stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
Log:
fixing comment
Modified: stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2009-07-03 09:32:59 UTC (rev 10309)
+++ stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2009-07-03 09:34:24 UTC (rev 10310)
@@ -25,7 +25,7 @@
<property name="recording">false</property>
</bean>
- <!-- The stack specific deployment aspects wrapped in deployers -->
+ <!-- The stack specific deployment aspects -->
<bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
<property name="provides">ContextProperties</property>
<property name="contextProperties">
14 years, 10 months
- 1
- 0
JBossWS SVN: r10309 - stack/native/branches/ropalka/modules/core/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-03 05:32:59 -0400 (Fri, 03 Jul 2009)
New Revision: 10309
Modified:
stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
Log:
fixing comment
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-07-03 09:31:03 UTC (rev 10308)
+++ stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-07-03 09:32:59 UTC (rev 10309)
@@ -20,7 +20,7 @@
<property name="recording">false</property>
</bean>
- <!-- The stack specific deployment aspects wrapped in deployers -->
+ <!-- The stack specific deployment aspects -->
<bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
<property name="provides">ContextProperties, StackDescriptor</property>
<property name="contextProperties">
14 years, 10 months
- 1
- 0
JBossWS SVN: r10308 - in stack/native/branches/ropalka/modules/core: src/main/java/org/jboss/ws/extensions/wsrm/server and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-03 05:31:03 -0400 (Fri, 03 Jul 2009)
New Revision: 10308
Modified:
stack/native/branches/ropalka/modules/core/pom.xml
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java
stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - removing notion of CREATED,DESTROYED states, removing temporary Deployers integration hack (WIP)
Modified: stack/native/branches/ropalka/modules/core/pom.xml
===================================================================
--- stack/native/branches/ropalka/modules/core/pom.xml 2009-07-03 09:29:49 UTC (rev 10307)
+++ stack/native/branches/ropalka/modules/core/pom.xml 2009-07-03 09:31:03 UTC (rev 10308)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss Web Services - Stack Native Core</name>
+ <name>JBoss Web Services - Native Server</name>
<artifactId>jbossws-native-core</artifactId>
<packaging>jar</packaging>
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2009-07-03 09:29:49 UTC (rev 10307)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2009-07-03 09:31:03 UTC (rev 10308)
@@ -60,7 +60,7 @@
}
@Override
- public final void destroy(Deployment dep)
+ public final void stop(Deployment dep)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2009-07-03 09:29:49 UTC (rev 10307)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2009-07-03 09:31:03 UTC (rev 10308)
@@ -70,7 +70,7 @@
}
@Override
- public void destroy(Deployment dep)
+ public void stop(Deployment dep)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
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-07-03 09:29:49 UTC (rev 10307)
+++ stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-07-03 09:31:03 UTC (rev 10308)
@@ -28,42 +28,18 @@
<entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry>
</map>
</property>
- </bean>
-
- <bean name="WSNativeContextPropertiesDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
<property name="requires">UnifiedMetaDataModel</property>
<property name="provides">InitializedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativeEagerInitializeDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">25</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">StackEndpointHandler</property>
- </bean>
-
- <bean name="WSNativeEndpointHandlerDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
@@ -77,94 +53,38 @@
<inject bean="WSLogRecorder"/>
</list>
</property>
- </bean>
-
- <bean name="WSNativeEndpointRecordProcessorDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
<property name="requires">UnifiedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativeEventingDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSNativeEventingDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">26</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
<property name="requires">UnifiedMetaDataModel, JAXBIntros</property>
<property name="provides">PublishedContract</property>
- </bean>
-
- <bean name="WSNativePublishContractDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSNativePublishContractDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">24</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
<property name="requires">UnifiedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativeServiceEndpointInvokerDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">23</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
<property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativeRMDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSNativeRMDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">27</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
<property name="requires">ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property>
<property name="provides">UnifiedMetaDataModel</property>
- </bean>
-
- <bean name="WSNativeUnifiedMetaDataDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect">
<property name="provides">JAXBIntros</property>
- </bean>
-
- <bean name="WSJAXBIntroDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSJAXBIntroDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
14 years, 10 months
- 1
- 0
JBossWS SVN: r10307 - in stack/metro/branches/ropalka/modules/server: src/main/java/org/jboss/wsf/stack/metro and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-03 05:29:49 -0400 (Fri, 03 Jul 2009)
New Revision: 10307
Modified:
stack/metro/branches/ropalka/modules/server/pom.xml
stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - removing notion of CREATED,DESTROYED states, removing temporary Deployers integration hack (WIP)
Modified: stack/metro/branches/ropalka/modules/server/pom.xml
===================================================================
--- stack/metro/branches/ropalka/modules/server/pom.xml 2009-07-03 09:29:00 UTC (rev 10306)
+++ stack/metro/branches/ropalka/modules/server/pom.xml 2009-07-03 09:29:49 UTC (rev 10307)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss Web Services - Stack Metro Runtime Server</name>
+ <name>JBoss Web Services - Metro Server</name>
<artifactId>jbossws-metro-server</artifactId>
<packaging>jar</packaging>
Modified: stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2009-07-03 09:29:00 UTC (rev 10306)
+++ stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2009-07-03 09:29:49 UTC (rev 10307)
@@ -45,7 +45,7 @@
{
@Override
@SuppressWarnings("unchecked")
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
DDEndpoints ddEndpoints = dep.getAttachment(DDEndpoints.class);
if (ddEndpoints == null)
@@ -78,7 +78,7 @@
}
@Override
- public void destroy(Deployment dep)
+ public void stop(Deployment dep)
{
DDEndpoints dd = dep.getAttachment(DDEndpoints.class);
if (dd != null)
Modified: stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2009-07-03 09:29:00 UTC (rev 10306)
+++ stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2009-07-03 09:29:49 UTC (rev 10307)
@@ -33,28 +33,12 @@
<entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry>
</map>
</property>
- </bean>
-
- <bean name="WSMetroContextPropertiesDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSMetroContextPropertiesDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">StackEndpointHandler</property>
- </bean>
-
- <bean name="WSMetroEndpointHandlerDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSMetroEndpointHandlerDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
@@ -68,42 +52,18 @@
<inject bean="WSLogRecorder"/>
</list>
</property>
- </bean>
-
- <bean name="WSMetroEndpointRecordProcessorDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSMetroEndpointRecordProcessorDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSMetroDescriptorDeploymentAspect" class="org.jboss.wsf.stack.metro.SunJaxwsDeploymentAspect">
<property name="requires">URLPattern</property>
<property name="provides">StackDescriptor</property>
- </bean>
-
- <bean name="WSMetroDescriptorDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSMetroDescriptorDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSRuntimeModelDeploymentAspect" class="org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect">
<property name="requires">StackDescriptor</property>
<property name="provides">RuntimeModel</property>
- </bean>
-
- <bean name="WSRuntimeModelDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSRuntimeModelDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">22</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
14 years, 10 months
- 1
- 0
JBossWS SVN: r10306 - in stack/cxf/branches/ropalka/modules/server: src/main/java/org/jboss/wsf/stack/cxf and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-03 05:29:00 -0400 (Fri, 03 Jul 2009)
New Revision: 10306
Modified:
stack/cxf/branches/ropalka/modules/server/pom.xml
stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - removing notion of CREATED,STARTED states, removing temporary Deployers integration hack (WIP)
Modified: stack/cxf/branches/ropalka/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/pom.xml 2009-07-03 09:26:59 UTC (rev 10305)
+++ stack/cxf/branches/ropalka/modules/server/pom.xml 2009-07-03 09:29:00 UTC (rev 10306)
@@ -1,7 +1,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss Web Services - Stack CXF Runtime Server</name>
+ <name>JBoss Web Services - CXF Server</name>
<artifactId>jbossws-cxf-server</artifactId>
<packaging>jar</packaging>
Modified: stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2009-07-03 09:26:59 UTC (rev 10305)
+++ stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2009-07-03 09:29:00 UTC (rev 10306)
@@ -64,7 +64,7 @@
}
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
URL cxfURL = getCXFConfigFromClassLoader(dep);
if (cxfURL == null)
@@ -79,7 +79,7 @@
}
@Override
- public void destroy(Deployment dep)
+ public void stop(Deployment dep)
{
DDBeans dd = dep.getAttachment(DDBeans.class);
if (dd != null)
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.xml 2009-07-03 09:26:59 UTC (rev 10305)
+++ stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-07-03 09:29:00 UTC (rev 10306)
@@ -24,7 +24,7 @@
<property name="recording">false</property>
</bean>
- <!-- The stack specific deployment aspects wrapped in deployers -->
+ <!-- The stack specific deployment aspects -->
<bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
<property name="provides">ContextProperties</property>
<property name="contextProperties">
@@ -32,14 +32,6 @@
<entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.cxf.CXFServletExt</value></entry>
</map>
</property>
- </bean>
-
- <bean name="WSCXFContextPropertiesDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSCXFContextPropertiesDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">31</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
@@ -48,28 +40,12 @@
<property name="provides">StackDescriptor</property>
<property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property>
<property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property>
- </bean>
-
- <bean name="WSCXFDescriptorDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSCXFDescriptorDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">21</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">StackEndpointHandler</property>
- </bean>
-
- <bean name="WSCXFEndpointHandlerDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSCXFEndpointHandlerDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">13</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
@@ -77,6 +53,7 @@
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
<property name="requires">RegisteredEndpoint</property>
<property name="provides">EndpointRecordProcessors</property>
+ <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
<property name="processors">
<list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
<inject bean="WSMemoryBufferRecorder"/>
@@ -85,13 +62,4 @@
</property>
</bean>
- <bean name="WSCXFEndpointRecordProcessorDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/>
- </parameter>
- </constructor>
- <property name="relativeOrder">36</property> <!-- [JBDEPLOY-201] workaround -->
- </bean>
-
</deployment>
14 years, 10 months
- 1
- 0
JBossWS SVN: r10305 - in container/jboss50/branches/ropalka-jboss510/src/main: java/org/jboss/webservices/integration/deployers and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-03 05:26:59 -0400 (Fri, 03 Jul 2009)
New Revision: 10305
Added:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeployersFactory.java
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/ContainerMetaDataDeploymentAspect.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/InjectionMetaDataDeploymentAspect.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/WebAppDeploymentAspect.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/WebAppGeneratorDeploymentAspect.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/stack-agnostic-jboss-beans.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - removing notion of CREATED,STARTED states, providing Deployers factory - fixing beans file to use that factory
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/ContainerMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/ContainerMetaDataDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/ContainerMetaDataDeploymentAspect.java 2009-07-03 09:26:59 UTC (rev 10305)
@@ -42,7 +42,7 @@
}
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class);
if (unit == null)
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/InjectionMetaDataDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/InjectionMetaDataDeploymentAspect.java 2009-07-03 09:26:59 UTC (rev 10305)
@@ -70,9 +70,9 @@
private EjbReferenceResolver ejbReferenceResolver;
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
- super.create(dep);
+ super.start(dep);
DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class);
if (unit == null)
@@ -128,11 +128,11 @@
}
@Override
- public void destroy(Deployment dep)
+ public void stop(Deployment dep)
{
dep.getService().removeAttachment(InjectionMetaData.class);
- super.destroy(dep);
+ super.stop(dep);
}
/**
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/WebAppDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/WebAppDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/WebAppDeploymentAspect.java 2009-07-03 09:26:59 UTC (rev 10305)
@@ -49,7 +49,7 @@
this.webMetaDataModifier = webMetaDataModifier;
}
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
JBossWebMetaData jbwmd = dep.getAttachment(JBossWebMetaData.class);
if (jbwmd == null)
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/WebAppGeneratorDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/WebAppGeneratorDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/aspects/WebAppGeneratorDeploymentAspect.java 2009-07-03 09:26:59 UTC (rev 10305)
@@ -70,7 +70,7 @@
}
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
final DeploymentType deploymentType = dep.getType();
Added: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeployersFactory.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeployersFactory.java (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeployersFactory.java 2009-07-03 09:26:59 UTC (rev 10305)
@@ -0,0 +1,58 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.deployers;
+
+import org.jboss.deployers.plugins.deployers.DeployersImpl;
+import org.jboss.wsf.spi.deployment.DeploymentAspect;
+
+/**
+ * WSDeploymentAspectDeployer factory.
+ *
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class WSDeployersFactory
+{
+
+ /** Real deployers registry. */
+ private final DeployersImpl delegee;
+
+ /**
+ * Constructor.
+ *
+ * @param realDeployers real deployers registry
+ */
+ public WSDeployersFactory( final DeployersImpl realDeployers )
+ {
+ this.delegee = realDeployers;
+ }
+
+ /**
+ * MC incallback method. It will be called each time DeploymentAspect bean will reach INSTALLED state.
+ *
+ * @param aspect to create real WS deployer for
+ */
+ public void newDeployer( final DeploymentAspect aspect )
+ {
+ this.delegee.addDeployer( new WSDeploymentAspectDeployer( aspect ) );
+ }
+
+}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2009-07-03 09:24:42 UTC (rev 10304)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2009-07-03 09:26:59 UTC (rev 10305)
@@ -53,22 +53,12 @@
*/
public WSDeploymentAspectDeployer( final DeploymentAspect aspect )
{
- this( aspect, false );
- }
- /**
- * Constructor.
- *
- * @param aspect deployment aspect
- * @param lastAspect if this is the last JBossWS aspect in deployers chain
- */
- public WSDeploymentAspectDeployer( final DeploymentAspect aspect, final boolean lastAspect )
- {
super();
// inputs
this.addInput( JBossWebMetaData.class );
this.addInput( Deployment.class );
- if ( lastAspect )
+ if ( aspect.isLast() )
{
this.addInput( WSDeploymentAspectDeployer.JBOSSWS_METADATA );
}
@@ -82,7 +72,7 @@
// outputs
this.addOutput( JBossWebMetaData.class );
- if ( !lastAspect )
+ if ( !aspect.isLast() )
{
this.addOutput( WSDeploymentAspectDeployer.JBOSSWS_METADATA );
}
@@ -94,6 +84,7 @@
this.addOutput( WSDeploymentAspectDeployer.JBOSSWS_ATTACHMENT_PREFIX + output );
}
+ this.setRelativeOrder( aspect.getRelativeOrder() );
this.aspect = aspect;
}
@@ -111,7 +102,6 @@
{
log.debug( this.aspect.getClass() + " deploy: " + unit.getName() );
final Deployment dep = unit.getAttachment( Deployment.class );
- this.aspect.create( dep );
this.aspect.start( dep );
}
}
@@ -130,7 +120,6 @@
log.debug( this.aspect.getClass() + " undeploy: " + unit.getName() );
final Deployment dep = unit.getAttachment( Deployment.class );
this.aspect.stop( dep );
- this.aspect.destroy( dep );
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/stack-agnostic-jboss-beans.xml 2009-07-03 09:24:42 UTC (rev 10304)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/stack-agnostic-jboss-beans.xml 2009-07-03 09:26:59 UTC (rev 10305)
@@ -53,17 +53,9 @@
<property name="relativeOrder">2</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
- <!-- The AS deployment aspects wrapped in deployers -->
+ <!-- The AS specific deployment aspects -->
<bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.webservices.integration.aspects.ContainerMetaDataDeploymentAspect">
<property name="provides">ContainerMetaData, VFSRoot</property>
- </bean>
-
- <bean name="WSContainerMetaDataDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSContainerMetaDataDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">12</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
@@ -71,125 +63,53 @@
<property name="requires">WebMetaData</property>
<property name="provides">InjectionMetaData</property>
<property name="ejbReferenceResolver"><inject bean="org.jboss.ejb3.EjbReferenceResolver"/></property>
- </bean>
-
- <bean name="WSInjectionMetaDataDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSInjectionMetaDataDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">34</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">ContextRoot</property>
- </bean>
-
- <bean name="WSContextRootDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSContextRootDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">14</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSVirtualHostDeploymentAspect" class="org.jboss.wsf.framework.deployment.VirtualHostDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">VirtualHosts</property>
- </bean>
-
- <bean name="WSVirtualHostDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSVirtualHostDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">18</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
<property name="requires">URLPattern</property>
<property name="provides">EndpointAddress</property>
- </bean>
-
- <bean name="WSEndpointAddressDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSEndpointAddressDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">16</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
<property name="provides">LifecycleHandler</property>
- </bean>
-
- <bean name="WSEndpointLifecycleDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSEndpointLifecycleDeploymentAspect"/>
- </parameter>
- <parameter>true</parameter>
- </constructor>
<property name="relativeOrder">37</property> <!-- [JBDEPLOY-201] workaround -->
+ <property name="last">true</property>
</bean>
<bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
<property name="provides">EndpointMetrics</property>
- </bean>
-
- <bean name="WSEndpointMetricsDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSEndpointMetricsDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">11</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
<property name="requires">URLPattern</property>
<property name="provides">EndpointName</property>
- </bean>
-
- <bean name="WSEndpointNameDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSEndpointNameDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">17</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
<bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
<property name="requires">EndpointName</property>
<property name="provides">RegisteredEndpoint</property>
- </bean>
-
- <bean name="WSEndpointRegistryDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSEndpointRegistryDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">35</property> <!-- [JBDEPLOY-201] workaround -->
</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="WSURLPatternDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSURLPatternDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">15</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
@@ -197,14 +117,6 @@
<property name="requires">WebMetaData, ContextProperties, StackDescriptor</property>
<property name="provides">WebMetaData</property>
<property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property>
- </bean>
-
- <bean name="WSWebAppDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
- <constructor>
- <parameter>
- <inject bean="WSWebAppDeploymentAspect"/>
- </parameter>
- </constructor>
<property name="relativeOrder">33</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
@@ -213,15 +125,17 @@
<property name="provides">WebMetaData</property>
<property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
+ <property name="relativeOrder">32</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
- <bean name="WSWebAppGeneratorDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
+ <!-- WSDeploymentAspectDeployers factory -->
+ <bean name="WSDeployersFactory" class="org.jboss.webservices.integration.deployers.WSDeployersFactory">
<constructor>
- <parameter>
- <inject bean="WSWebAppGeneratorDeploymentAspect"/>
+ <parameter class="org.jboss.deployers.plugins.deployers.DeployersImpl">
+ <inject bean="Deployers"/>
</parameter>
</constructor>
- <property name="relativeOrder">32</property> <!-- [JBDEPLOY-201] workaround -->
+ <incallback method="newDeployer"/>
</bean>
<!-- Deployment aspect helper beans -->
14 years, 10 months
- 1
- 0
JBossWS SVN: r10304 - framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-03 05:24:42 -0400 (Fri, 03 Jul 2009)
New Revision: 10304
Modified:
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java
Log:
[JBWS-2332][JBWS-2382] refactoring - removing CREATED, DESTROYED states - these are useless (WIP)
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java 2009-07-03 09:17:03 UTC (rev 10303)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
@@ -49,7 +49,7 @@
}
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
if (contextProperties != null)
{
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2009-07-03 09:17:03 UTC (rev 10303)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
@@ -40,7 +40,7 @@
public class ContextRootDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
String contextRoot = dep.getService().getContextRoot();
if (contextRoot == null)
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java 2009-07-03 09:17:03 UTC (rev 10303)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/DefaultLifecycleHandler.java 2009-07-03 09:24:42 UTC (rev 10304)
@@ -38,25 +38,12 @@
// provide logging
protected final Logger log = Logger.getLogger(getClass());
- public void create(Endpoint ep)
- {
- log.debug("Create: " + ep.getName());
-
- InvocationHandler invHandler = ep.getInvocationHandler();
- if (invHandler == null)
- throw new IllegalStateException("Invocation handler not available");
-
- invHandler.init(ep);
-
- ep.setState(EndpointState.CREATED);
- }
-
public void start(Endpoint ep)
{
log.debug("Start: " + ep.getName());
EndpointState state = ep.getState();
- if (state == EndpointState.UNDEFINED || state == EndpointState.DESTROYED)
+ if (state != EndpointState.UNDEFINED)
{
log.error("Cannot start endpoint in state: " + state);
}
@@ -65,6 +52,11 @@
if (ep.getEndpointMetrics() != null)
ep.getEndpointMetrics().start();
+ InvocationHandler invHandler = ep.getInvocationHandler();
+ if (invHandler == null)
+ throw new IllegalStateException("Invocation handler not available");
+ invHandler.init(ep);
+
ep.setState(EndpointState.STARTED);
}
}
@@ -87,10 +79,4 @@
}
}
- public void destroy(Endpoint ep)
- {
- log.debug("Destroy: " + ep.getName());
-
- ep.setState(EndpointState.DESTROYED);
- }
}
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2009-07-03 09:17:03 UTC (rev 10303)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2009-07-03 09:24:42 UTC (rev 10304)
@@ -111,14 +111,9 @@
throw new IllegalStateException("Required conditions '" + aspect.getRequires() + "' not satisfied by '" + providedConditions + "' for: " + aspect);
*/
- logInvocation(aspect, "Create");
- aspect.create(dep);
-
providedConditions.addAll(aspect.getProvidesAsSet());
}
- dep.setState(DeploymentState.CREATED);
-
// start the deployment
for (int i = 0; i < getDeploymentAspects().size(); i++)
{
@@ -133,7 +128,7 @@
while (i-- >= 0)
{
// destroy the deployment
- failsafeDestroy(aspect, dep);
+ failsafeStop(aspect, dep);
}
throw rte;
}
@@ -144,7 +139,6 @@
public void undeploy(Deployment dep)
{
- // stop the deployment
for (int i = getDeploymentAspects().size(); 0 < i; i--)
{
DeploymentAspect aspect = getDeploymentAspects().get(i - 1);
@@ -152,15 +146,6 @@
}
dep.setState(DeploymentState.STOPPED);
-
- // destroy the deployment
- for (int i = getDeploymentAspects().size(); 0 < i; i--)
- {
- DeploymentAspect aspect = getDeploymentAspects().get(i - 1);
- failsafeDestroy(aspect, dep);
- }
-
- dep.setState(DeploymentState.DESTROYED);
}
private void failsafeStop(DeploymentAspect aspect, Deployment dep)
@@ -176,23 +161,11 @@
}
}
- private void failsafeDestroy(DeploymentAspect aspect, Deployment dep)
- {
- try
- {
- logInvocation(aspect, "Destroy");
- aspect.destroy(dep);
- }
- catch (RuntimeException rte)
- {
- WSFDeploymentException.rethrow(rte);
- }
- }
-
private void logInvocation(DeploymentAspect aspect, String method)
{
String name = aspect.getClass().getName();
name = name.substring(name.lastIndexOf(".") + 1);
log.debug("[" + this.name + "]" + name + ":" + method);
}
+
}
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2009-07-03 09:17:03 UTC (rev 10303)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
@@ -39,7 +39,7 @@
public class EndpointAPIDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
dep.setType(DeploymentType.JAXWS_JSE);
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2009-07-03 09:17:03 UTC (rev 10303)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
@@ -38,7 +38,7 @@
public class EndpointAddressDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
String contextRoot = dep.getService().getContextRoot();
if (contextRoot == null)
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2009-07-03 09:17:03 UTC (rev 10303)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
@@ -54,7 +54,7 @@
}
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java 2009-07-03 09:17:03 UTC (rev 10303)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointLifecycleDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
@@ -31,14 +31,6 @@
*/
public class EndpointLifecycleDeploymentAspect extends DeploymentAspect
{
- @Override
- public void create(Deployment dep)
- {
- for (Endpoint ep : dep.getService().getEndpoints())
- {
- getLifecycleHandler(ep, true).create(ep);
- }
- }
@Override
public void start(Deployment dep)
@@ -64,21 +56,6 @@
}
}
- @Override
- public void destroy(Deployment dep)
- {
- Service service = dep.getService();
- if (service != null)
- {
- for (Endpoint ep : service.getEndpoints())
- {
- LifecycleHandler lifecycleHandler = getLifecycleHandler(ep, false);
- if (lifecycleHandler != null)
- lifecycleHandler.destroy(ep);
- }
- }
- }
-
private LifecycleHandler getLifecycleHandler(Endpoint ep, boolean assertHandler)
{
LifecycleHandler lifecycleHandler = ep.getLifecycleHandler();
@@ -87,4 +64,5 @@
return lifecycleHandler;
}
+
}
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java 2009-07-03 09:17:03 UTC (rev 10303)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointMetricsDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
@@ -38,7 +38,7 @@
public class EndpointMetricsDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
EndpointMetricsFactory factory = provider.getSPI(EndpointMetricsFactory.class);
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2009-07-03 09:17:03 UTC (rev 10303)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
@@ -38,7 +38,7 @@
public class EndpointNameDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
String contextRoot = dep.getService().getContextRoot();
if (contextRoot == null || contextRoot.startsWith("/") == false)
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java 2009-07-03 09:17:03 UTC (rev 10303)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
@@ -77,7 +77,7 @@
}
@Override
- public void destroy(Deployment dep)
+ public void stop(Deployment dep)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2009-07-03 09:17:03 UTC (rev 10303)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/EndpointRegistryDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
@@ -38,7 +38,7 @@
{
private EndpointRegistry registry;
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
if (registry == null)
@@ -49,7 +49,7 @@
}
}
- public void destroy(Deployment dep)
+ public void stop(Deployment dep)
{
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
if (registry == null)
@@ -59,4 +59,5 @@
registry.unregister(ep);
}
}
+
}
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2009-07-03 09:17:03 UTC (rev 10303)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
@@ -38,7 +38,7 @@
public class URLPatternDeploymentAspect extends DeploymentAspect
{
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java 2009-07-03 09:17:03 UTC (rev 10303)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/VirtualHostDeploymentAspect.java 2009-07-03 09:24:42 UTC (rev 10304)
@@ -40,7 +40,7 @@
{
@Override
- public void create(Deployment dep)
+ public void start(Deployment dep)
{
if ( DeploymentType.JAXWS_EJB3.equals(dep.getType()))
{
14 years, 10 months
- 1
- 0
JBossWS SVN: r10303 - spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-03 05:17:03 -0400 (Fri, 03 Jul 2009)
New Revision: 10303
Modified:
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java
Log:
[JBWS-2332][JBWS-2382] refactoring - adding new LAST, RELATIVE_ORDER properties, removing CREATED, DESTROYED states - these are useless (WIP)
Modified: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2009-07-02 19:20:55 UTC (rev 10302)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2009-07-03 09:17:03 UTC (rev 10303)
@@ -37,7 +37,7 @@
public enum DeploymentState
{
- UNDEFINED, CREATED, STARTED, STOPPED, DESTROYED
+ UNDEFINED, STARTED, STOPPED
};
/** Get the identifier for this deployment */
Modified: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2009-07-02 19:20:55 UTC (rev 10302)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2009-07-03 09:17:03 UTC (rev 10303)
@@ -45,7 +45,19 @@
private String provides;
private String requires;
+ private int relativeOrder;
+ private boolean isLast;
+ public void setLast(boolean isLast)
+ {
+ this.isLast = isLast;
+ }
+
+ public boolean isLast()
+ {
+ return this.isLast;
+ }
+
public String getProvides()
{
return provides;
@@ -65,13 +77,15 @@
{
this.requires = requires;
}
-
- public void create(Deployment dep)
+
+ public void setRelativeOrder(int relativeOrder)
{
+ this.relativeOrder = relativeOrder;
}
-
- public void destroy(Deployment dep)
+
+ public int getRelativeOrder()
{
+ return this.relativeOrder;
}
public void start(Deployment dep)
Modified: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2009-07-02 19:20:55 UTC (rev 10302)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2009-07-03 09:17:03 UTC (rev 10303)
@@ -47,7 +47,7 @@
public enum EndpointState
{
- UNDEFINED, CREATED, STARTED, STOPPED, DESTROYED
+ UNDEFINED, STARTED, STOPPED
};
/** Get the service this endpoint belongs to */
Modified: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java 2009-07-02 19:20:55 UTC (rev 10302)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java 2009-07-03 09:17:03 UTC (rev 10303)
@@ -29,15 +29,9 @@
*/
public interface LifecycleHandler
{
- /** Handle the create step of an endpoint */
- void create(Endpoint endpoint);
-
/** Handle the start step of an endpoint */
void start(Endpoint endpoint);
/** Handle the stop step of an endpoint */
void stop(Endpoint endpoint);
-
- /** Handle the destroy step of an endpoint */
- void destroy(Endpoint endpoint);
}
14 years, 10 months
- 1
- 0
JBossWS SVN: r10302 - stack/native/branches/ropalka/modules/core/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-07-02 15:20:55 -0400 (Thu, 02 Jul 2009)
New Revision: 10302
Modified:
stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring
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-07-02 19:20:17 UTC (rev 10301)
+++ stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-07-02 19:20:55 UTC (rev 10302)
@@ -30,7 +30,7 @@
</property>
</bean>
- <bean name="WSNativeContextPropertiesDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <bean name="WSNativeContextPropertiesDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
<constructor>
<parameter>
<inject bean="WSNativeContextPropertiesDeploymentAspect"/>
@@ -44,7 +44,7 @@
<property name="provides">InitializedMetaDataModel</property>
</bean>
- <bean name="WSNativeEagerInitializeDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <bean name="WSNativeEagerInitializeDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
<constructor>
<parameter>
<inject bean="WSNativeEagerInitializeDeploymentAspect"/>
@@ -58,7 +58,7 @@
<property name="provides">StackEndpointHandler</property>
</bean>
- <bean name="WSNativeEndpointHandlerDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <bean name="WSNativeEndpointHandlerDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
<constructor>
<parameter>
<inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
@@ -79,7 +79,7 @@
</property>
</bean>
- <bean name="WSNativeEndpointRecordProcessorDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <bean name="WSNativeEndpointRecordProcessorDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
<constructor>
<parameter>
<inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
@@ -92,7 +92,7 @@
<property name="requires">UnifiedMetaDataModel</property>
</bean>
- <bean name="WSNativeEventingDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <bean name="WSNativeEventingDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
<constructor>
<parameter>
<inject bean="WSNativeEventingDeploymentAspect"/>
@@ -106,7 +106,7 @@
<property name="provides">PublishedContract</property>
</bean>
- <bean name="WSNativePublishContractDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <bean name="WSNativePublishContractDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
<constructor>
<parameter>
<inject bean="WSNativePublishContractDeploymentAspect"/>
@@ -119,7 +119,7 @@
<property name="requires">UnifiedMetaDataModel</property>
</bean>
- <bean name="WSNativeServiceEndpointInvokerDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <bean name="WSNativeServiceEndpointInvokerDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
<constructor>
<parameter>
<inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
@@ -132,7 +132,7 @@
<property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property>
</bean>
- <bean name="WSNativeRMDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <bean name="WSNativeRMDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
<constructor>
<parameter>
<inject bean="WSNativeRMDeploymentAspect"/>
@@ -146,7 +146,7 @@
<property name="provides">UnifiedMetaDataModel</property>
</bean>
- <bean name="WSNativeUnifiedMetaDataDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <bean name="WSNativeUnifiedMetaDataDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
<constructor>
<parameter>
<inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
@@ -159,7 +159,7 @@
<property name="provides">JAXBIntros</property>
</bean>
- <bean name="WSJAXBIntroDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
+ <bean name="WSJAXBIntroDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentAspectDeployer">
<constructor>
<parameter>
<inject bean="WSJAXBIntroDeploymentAspect"/>
14 years, 10 months
- 1
- 0