Author: heiko.braun(a)jboss.com Date: 2008-03-14 07:14:56 -0400 (Fri, 14 Mar 2008) New Revision: 5977 Modified: framework/branches/hbraun/framework-3.0.iml framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java framework/branches/hbraun/version.properties Log: Progate WSFRuntime Modified: framework/branches/hbraun/framework-3.0.iml =================================================================== --- framework/branches/hbraun/framework-3.0.iml 2008-03-14 11:14:15 UTC (rev 5976) +++ framework/branches/hbraun/framework-3.0.iml 2008-03-14 11:14:56 UTC (rev 5977) @@ -42,15 +42,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/jsr181-api.jar!/" /> </CLASSES> <JAVADOC /> @@ -123,15 +114,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jbossws-spi-src.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/jaxws-api.jar!/" /> </CLASSES> <JAVADOC /> Modified: framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java =================================================================== --- framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2008-03-14 11:14:15 UTC (rev 5976) +++ framework/branches/hbraun/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2008-03-14 11:14:56 UTC (rev 5977) @@ -35,6 +35,7 @@ import org.jboss.wsf.spi.deployment.DeploymentAspectManager; import org.jboss.wsf.spi.deployment.WSFDeploymentException; import org.jboss.wsf.spi.deployment.Deployment.DeploymentState; +import org.jboss.wsf.spi.WSFRuntime; /** * A general service deployment manger. @@ -84,7 +85,13 @@ // Debug the aspect list StringBuilder builder = new StringBuilder("setDeploymentAspects on " + name); for (DeploymentAspect aspect : aspects) - builder.append("\n " + aspect.getClass().getName() + " provides: " + aspect.getProvidesAsSet() + " requires: " + aspect.getRequiresAsSet()); + builder.append("\n ") + .append(aspect.getClass().getName()) + .append(" provides: ") + .append(aspect.getProvidesAsSet()) + .append(" requires: ") + .append(aspect.getRequiresAsSet() + ); log.debug(builder); } @@ -95,7 +102,7 @@ * If start fails it automaticall calls destroy in the reverse order * starting with the deployer that failed */ - public void deploy(Deployment dep) + public void deploy(Deployment dep, WSFRuntime runtime) { // create the deployment Set<String> providedConditions = new HashSet<String>(); @@ -115,6 +122,7 @@ */ logInvocation(aspect, "Create"); + aspect.setRuntimeAssociation(runtime); aspect.create(dep); providedConditions.addAll(aspect.getProvidesAsSet()); @@ -145,12 +153,12 @@ dep.setState(DeploymentState.STARTED); } - public void undeploy(Deployment dep) + public void undeploy(Deployment dep, WSFRuntime runtime) { // stop the deployment for (int i = getDeploymentAspects().size(); 0 < i; i--) { - DeploymentAspect aspect = getDeploymentAspects().get(i - 1); + DeploymentAspect aspect = getDeploymentAspects().get(i - 1); failsafeStop(aspect, dep); } @@ -165,7 +173,7 @@ dep.setState(DeploymentState.DESTROYED); } - + private void failsafeStop(DeploymentAspect aspect, Deployment dep) { try Modified: framework/branches/hbraun/version.properties =================================================================== --- framework/branches/hbraun/version.properties 2008-03-14 11:14:15 UTC (rev 5976) +++ framework/branches/hbraun/version.properties 2008-03-14 11:14:56 UTC (rev 5977) @@ -6,7 +6,7 @@ specification.version=jbossws-3.0 version.id=3.0.1.DEV -repository.id=snapshot +repository.id=3.0-snapshot implementation.title=JBoss Web Services - Framework implementation.url=http://www.jboss.org/products/jbossws @@ -15,7 +15,7 @@ # Thirdparty library versions jbossws-common=snapshot -jbossws-spi=snapshot +jbossws-spi=3.0-snapshot junit=3.8.1 dom4j=1.6.1