Author: objectiser Date: 2011-01-25 07:20:12 -0500 (Tue, 25 Jan 2011) New Revision: 1267 Modified: workspace/gbrown/as6/runtime/engine/pom.xml workspace/gbrown/as6/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java workspace/gbrown/as6/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java Log: Update to comment out testcase with slf dependency (for now) and update H2Database to obtain the server data dir from DSP. Modified: workspace/gbrown/as6/runtime/engine/pom.xml =================================================================== --- workspace/gbrown/as6/runtime/engine/pom.xml 2011-01-25 10:33:54 UTC (rev 1266) +++ workspace/gbrown/as6/runtime/engine/pom.xml 2011-01-25 12:20:12 UTC (rev 1267) @@ -211,6 +211,9 @@ <include>**/*TestCase.java</include> <include>**/*Test.java</include> </includes> + <excludes> + <exclude>riftsaw277/*</exclude> + </excludes> </configuration> </plugin> </plugins> Modified: workspace/gbrown/as6/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java =================================================================== --- workspace/gbrown/as6/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java 2011-01-25 10:33:54 UTC (rev 1266) +++ workspace/gbrown/as6/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java 2011-01-25 12:20:12 UTC (rev 1267) @@ -579,8 +579,11 @@ { if (datadir == null) { - final ServerConfigImpl serverConfig = (ServerConfigImpl) MBeanProxyExt.create(ServerConfigImplMBean.class,ServerConfigImplMBean.OBJECT_NAME); - return serverConfig.getServerDataDir(); + //final ServerConfigImpl serverConfig = (ServerConfigImpl) MBeanProxyExt.create(ServerConfigImplMBean.class,ServerConfigImplMBean.OBJECT_NAME); + //return serverConfig.getServerDataDir(); + org.jboss.soa.dsp.server.ServerConfig serverConfig= + org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory.createServerConfig(); + return(serverConfig.getServerDeployDir()); } return new File(datadir); } Modified: workspace/gbrown/as6/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java =================================================================== --- workspace/gbrown/as6/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2011-01-25 10:33:54 UTC (rev 1266) +++ workspace/gbrown/as6/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2011-01-25 12:20:12 UTC (rev 1267) @@ -25,16 +25,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.iapi.EndpointReference; import org.apache.ode.bpel.iapi.ProcessConf; -import org.jboss.dependency.spi.ControllerContext; -import org.jboss.deployers.client.spi.DeployerClient; -import org.jboss.deployers.client.spi.Deployment; -import org.jboss.deployers.spi.attachments.MutableAttachments; -import org.jboss.deployers.structure.spi.ClassLoaderFactory; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.deployers.structure.spi.DeploymentUnitFilter; -import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory; -import org.jboss.kernel.Kernel; -import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.soa.bpel.deployer.BPELDeploymentUnit; import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl; import org.jboss.soa.bpel.runtime.engine.ode.ExecutionEnvironment; @@ -44,19 +34,15 @@ import org.jboss.soa.dsp.ServiceEndpointReference; import org.jboss.soa.dsp.deployer.jboss.JBossServiceDeployer; import org.jboss.soa.dsp.server.ServerConfig; -import org.jboss.soa.dsp.server.jboss.KernelLocator; import org.jboss.soa.dsp.server.jboss.JBossServerConfigFactory; import org.jboss.soa.dsp.ws.BaseWebServiceEndpoint; import org.jboss.soa.dsp.ws.DeploymentBuilder; import org.jboss.soa.dsp.ws.WSDLParser; import org.jboss.soa.dsp.ws.WSDLReference; import org.jboss.soa.dsp.ws.WebServiceProviderGenerator; -import org.jboss.virtual.VFS; -import org.jboss.virtual.VirtualFile; import javax.xml.namespace.QName; import java.io.File; -import java.io.IOException; import java.net.URL; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -247,41 +233,34 @@ log.debug("Remove endpoint service="+service+" port="+port+" deploymentName="+ref.getDeploymentName()+" ref="+ref); } - if(ref!=null) + try { - try - { - m_deployer.undeploy(ref, serverConfig); - - // unregister - endpointMapping.remove(key); - - if (log.isDebugEnabled()) { - log.debug("Undeployed web service with deploymentName="+ref.getDeploymentName()); - } - - // remove physical artifacts - File warArchive = new File(ref.getArchiveLocation()); - if(warArchive.exists()) - { - if(!deleteDirectory(warArchive)) log.warn(warArchive + " could no be deleted"); - } - else - { - log.warn(ref.getArchiveLocation() + " cannot be removed (doesn't exist)."); - } - if (uddiRegistration!=null) { - uddiRegistration.unRegisterEPR(service, port); - } - } - catch (Exception e) - { - throw new EndpointManagementException("Failed to undeploy "+ref.getDeploymentName(), e); - } + m_deployer.undeploy(ref, serverConfig); + + // unregister + endpointMapping.remove(key); + + if (log.isDebugEnabled()) { + log.debug("Undeployed web service with deploymentName="+ref.getDeploymentName()); + } + + // remove physical artifacts + File warArchive = new File(ref.getArchiveLocation()); + if(warArchive.exists()) + { + if(!deleteDirectory(warArchive)) log.warn(warArchive + " could no be deleted"); + } + else + { + log.warn(ref.getArchiveLocation() + " cannot be removed (doesn't exist)."); + } + if (uddiRegistration!=null) { + uddiRegistration.unRegisterEPR(service, port); + } } - else + catch (Exception e) { - log.warn("Endpoint not found for removal: "+key); + throw new EndpointManagementException("Failed to undeploy "+ref.getDeploymentName(), e); } }