[jboss-svn-commits] JBL Code SVN: r26169 - in labs/jbossesb/workspace/dbevenius/jbossas5/product: services/jbrules/src/main/resources/META-INF and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 21 04:54:15 EDT 2009
Author: beve
Date: 2009-04-21 04:54:14 -0400 (Tue, 21 Apr 2009)
New Revision: 26169
Modified:
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParser.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployer.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployer.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbrules/src/main/resources/META-INF/jboss-structure.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/smooks/src/main/resources/META-INF/jboss-structure.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soap/src/main/resources/META-INF/jboss-structure.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-structure.xml
Log:
Got smooks.esb to "run" via one of the transformation quickstarts.
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParser.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParser.java 2009-04-21 07:58:03 UTC (rev 26168)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParser.java 2009-04-21 08:54:14 UTC (rev 26169)
@@ -233,7 +233,7 @@
/**
- * Will go throught the actions defined in the model (model of the esb configuration) and for every
+ * Will go through the actions defined in the model (model of the esb configuration) and for every
* action that is defined in action artifacts properties adds that action as a dependency.
* This way there is no need to explicetely define dependencies in a separate deployment.xml file.
*
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployer.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployer.java 2009-04-21 07:58:03 UTC (rev 26168)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployer.java 2009-04-21 08:54:14 UTC (rev 26169)
@@ -21,20 +21,21 @@
package org.jboss.soa.esb.listeners.deployers.mc;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Set;
import javax.management.ObjectName;
import org.apache.log4j.Logger;
-import org.jboss.beans.metadata.plugins.AbstractCollectionMetaData;
+import org.jboss.aop.standalone.SystemClassLoader;
import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.ClassLoaderMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.classloader.spi.ClassLoaderSystem;
+import org.jboss.dependency.spi.ControllerState;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.deployment.DeploymentException;
-import org.jboss.internal.soa.esb.publish.ContractReferencePublisher;
/**
* EsbDeployer takes care of the deployment of an {@link BeanMetaData}
@@ -146,7 +147,8 @@
{
// The dependencies are added as demands. If we add them as dependencies
// they will get undeployed when this unit is undeployed.
- bmdBuilder.addDemand(objectName.toString());
+ log.info("Adding depend " + objectName.toString() + " for " + esbMetaData.getDeploymentName());
+ bmdBuilder.addDemand(objectName.toString(), ControllerState.PRE_INSTALL, ControllerState.INSTALLED, null);
}
if (esbMetaData.getPublishers().size() > 0)
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java 2009-04-21 07:58:03 UTC (rev 26168)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java 2009-04-21 08:54:14 UTC (rev 26169)
@@ -55,7 +55,7 @@
private List<ContractReferencePublisher> publishers;
private ManagedLifecycleController controller;
private final String mbeanName;
-
+
public EsbDeployment(final String config, final String deploymentName, final String mbeanName) throws Exception
{
this.jbossEsbXml = config;
@@ -101,12 +101,13 @@
public void create()
{
- LifecycleResourceManager.getSingleton().associateDeployment(deploymentName);
+ LifecycleResourceManager.getSingleton().associateDeployment(deploymentName) ;
}
public void start() throws Exception
{
log.info("Starting EBS Deployment '" + deploymentName + "'");
+
if (controller == null)
{
controller = Configuration.create(jbossEsbXml, new ObjectName(mbeanName), publishers);
@@ -117,6 +118,7 @@
public void stop() throws Exception
{
log.info("Stopping EBS Deployment '" + deploymentName + "'");
+
ServicePublisher.removeServicePublishers(controller);
controller.stop();
}
@@ -124,6 +126,7 @@
public void destroy() throws Exception
{
log.info("Destroying ESB Deployment '" + deploymentName + "'");
+
LifecycleResourceManager.getSingleton().disassociateDeployment(deploymentName);
LifecycleResourceManager.getSingleton().destroyResources();
}
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployer.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployer.java 2009-04-21 07:58:03 UTC (rev 26168)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployer.java 2009-04-21 08:54:14 UTC (rev 26169)
@@ -20,6 +20,8 @@
*/
package org.jboss.soa.esb.listeners.deployers.mc;
+import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@@ -110,17 +112,8 @@
try
{
// Used to dynamically add in-memory files to the deployment.
- final URL dynamicClasspathUrl = new URL("vfsmemory", esbMetaData.getDeploymentName(), "");
- final VirtualFile dynamicClasspathDir = MemoryFileFactory.createRoot(dynamicClasspathUrl).getRoot();
+ final URL dynamicClasspathUrl = createDynamicVFS(deploymentUnit, esbMetaData);
- // Attach the dynamic classpath URL and virtual file to this deployment unit so we can
- // remove then upon undeploy.
- deploymentUnit.addAttachment(DYNAMIC_CL_DIR_KEY, dynamicClasspathDir);
- deploymentUnit.addAttachment(DYNAMIC_CL_URL_KEY, dynamicClasspathUrl);
-
- // Add the dynamic classpath to this deployment unit.
- deploymentUnit.addClassPath(dynamicClasspathDir);
-
// Create WEB-INF/classes
final URL webInfUrl = new URL(dynamicClasspathUrl.toExternalForm() + "/WEB-INF");
final URL classesUrl = new URL(webInfUrl + "/classes");
@@ -184,6 +177,23 @@
}
}
+ private URL createDynamicVFS(final VFSDeploymentUnit deploymentUnit, final EsbMetaData esbMetaData) throws IOException
+ {
+ // Used to dynamically add in-memory files to the deployment.
+ final URL dynamicClasspathUrl = new URL("vfsmemory", esbMetaData.getDeploymentName(), "");
+ final VirtualFile dynamicClasspathDir = MemoryFileFactory.createRoot(dynamicClasspathUrl).getRoot();
+
+ // Attach the dynamic classpath URL and virtual file to this deployment unit so we can
+ // remove then upon undeploy.
+ deploymentUnit.addAttachment(DYNAMIC_CL_DIR_KEY, dynamicClasspathDir);
+ deploymentUnit.addAttachment(DYNAMIC_CL_URL_KEY, dynamicClasspathUrl);
+
+ // Add the dynamic classpath to this deployment unit.
+ deploymentUnit.addClassPath(dynamicClasspathDir);
+ return dynamicClasspathUrl;
+
+ }
+
private boolean hasWebServices(final List<WebserviceInfo> endpointServices)
{
return endpointServices != null && endpointServices.size() > 0;
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbrules/src/main/resources/META-INF/jboss-structure.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbrules/src/main/resources/META-INF/jboss-structure.xml 2009-04-21 07:58:03 UTC (rev 26168)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbrules/src/main/resources/META-INF/jboss-structure.xml 2009-04-21 08:54:14 UTC (rev 26169)
@@ -6,6 +6,7 @@
</metaDataPath>
<classpath>
<path name=""/>
+ <path name="" suffixes=".jar"/>
</classpath>
</context>
</structure>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/smooks/src/main/resources/META-INF/jboss-structure.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/smooks/src/main/resources/META-INF/jboss-structure.xml 2009-04-21 07:58:03 UTC (rev 26168)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/smooks/src/main/resources/META-INF/jboss-structure.xml 2009-04-21 08:54:14 UTC (rev 26169)
@@ -6,6 +6,7 @@
</metaDataPath>
<classpath>
<path name=""/>
+ <path name="" suffixes=".jar"/>
</classpath>
</context>
</structure>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soap/src/main/resources/META-INF/jboss-structure.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soap/src/main/resources/META-INF/jboss-structure.xml 2009-04-21 07:58:03 UTC (rev 26168)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soap/src/main/resources/META-INF/jboss-structure.xml 2009-04-21 08:54:14 UTC (rev 26169)
@@ -6,6 +6,7 @@
</metaDataPath>
<classpath>
<path name=""/>
+ <path name="" suffixes=".jar"/>
</classpath>
</context>
</structure>
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-structure.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-structure.xml 2009-04-21 07:58:03 UTC (rev 26168)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-structure.xml 2009-04-21 08:54:14 UTC (rev 26169)
@@ -6,6 +6,7 @@
</metaDataPath>
<classpath>
<path name=""/>
+ <path name="" suffixes=".jar"/>
</classpath>
</context>
</structure>
More information about the jboss-svn-commits
mailing list