[jboss-svn-commits] JBL Code SVN: r25981 - in labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta: tests/src/org/jboss/soa/esb/listeners/deployers/mc and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 7 07:30:23 EDT 2009
Author: beve
Date: 2009-04-07 07:30:22 -0400 (Tue, 07 Apr 2009)
New Revision: 25981
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/EsbWebServiceDeployer.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployerUnitTest.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployerUnitTest.xml
Log:
Minor updates.
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-07 10:07:27 UTC (rev 25980)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParser.java 2009-04-07 11:30:22 UTC (rev 25981)
@@ -107,7 +107,7 @@
super(EsbMetaData.class);
setSuffix(ESB_FILE_SUFFIX);
setJarExtension(ESB_ARCHIVE_SUFFIX);
- setStage(DeploymentStages.POST_CLASSLOADER);
+ setStage(DeploymentStages.PARSE);
}
@Override
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-07 10:07:27 UTC (rev 25980)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployer.java 2009-04-07 11:30:22 UTC (rev 25981)
@@ -28,7 +28,6 @@
import org.apache.log4j.Logger;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.deployers.vfs.plugins.classloader.HostNameCreator;
import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.internal.soa.esb.publish.ContractReferencePublisher;
@@ -48,7 +47,6 @@
import org.jboss.metadata.web.spec.ServletMappingMetaData;
import org.jboss.soa.esb.Service;
import org.jboss.soa.esb.listeners.config.WebserviceInfo;
-import org.jboss.util.id.GUID;
import org.jboss.virtual.MemoryFileFactory;
import org.jboss.virtual.VirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
@@ -66,7 +64,7 @@
/**
* No-args constructor.
*
- * Sets the deployment stage to POST_CLASSLOADER and set the output of
+ * Sets the deployment stage to CLASSLOADER and set the output of
* this deployer to {@link JSEArchiveMetaData}.
*/
public EsbWebServiceDeployer()
@@ -104,7 +102,7 @@
// Add WEB-INF to the classpath
deploymentUnit.addClassPath(webInfDir);
- URL classesUrl = new URL(webInfDir.toURL() + "/classes");
+ URL classesUrl = new URL(webInfDir.toURL() + "classes");
VirtualFile classesDir = MemoryFileFactory.createDirectory(classesUrl);
// Add WEB-INF/classes to the classpath
deploymentUnit.addClassPath(classesDir);
@@ -119,7 +117,8 @@
if (includeHandlers)
{
final String wsHandlerName = serviceInfo.getPackageName().replace('.', '/') + "/esb-jaxws-handlers.xml";
- VirtualFile jaxwsHandlers = MemoryFileFactory.putFile(new URL(classesUrl + wsHandlerName), handlers.getBytes());
+ URL jaxwsHandlersUrl = new URL(classesUrl + wsHandlerName);
+ VirtualFile jaxwsHandlers = MemoryFileFactory.putFile(jaxwsHandlersUrl, handlers.getBytes());
deploymentUnit.addClassPath(jaxwsHandlers);
}
@@ -131,13 +130,15 @@
// Generate the servlet class bytes
final byte[] servletClass = generator.generate(service.getCategory(), service.getName(), serviceInfo, includeHandlers);
String servletClassName = serviceInfo.getClassName().replace('.', '/') + ".class";
- MemoryFileFactory.putFile(new URL(classesUrl + "/" + servletClassName), servletClass);
+ URL servletClassUrl = new URL(classesUrl + "/" + servletClassName);
+ MemoryFileFactory.putFile(servletClassUrl, servletClass);
servlets.add(createServlets(service, serviceInfo, generator, includeHandlers));
servletMappings.add(createServletMapping(serviceInfo));
final String wsdl = ESBContractGenerator.generateWSDL(webserviceInfo, serviceInfo);
- MemoryFileFactory.putFile(new URL(webInfUrl + "/" + serviceInfo.getWSDLFileName()), wsdl.getBytes());
+ URL wsdlUrl = new URL(dynamicClassRoot + "/" + serviceInfo.getWSDLFileName());
+ MemoryFileFactory.putFile(wsdlUrl, wsdl.getBytes());
final ContractReferencePublisher publisher = new ESBServiceContractPublisher(service, webserviceInfo.getDescription(), serviceInfo.getServletName());
publishers.add(publisher);
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployerUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployerUnitTest.java 2009-04-07 10:07:27 UTC (rev 25980)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployerUnitTest.java 2009-04-07 11:30:22 UTC (rev 25981)
@@ -59,12 +59,11 @@
final String servletClassName = servlets.iterator().next().getServletClass();
assertEquals("esb.ws.FirstServiceESB.SimpleListener.Implementation", servletClassName);
- System.out.println(deploymentUnit.getClassLoader().getClass().getName());
- URL wsdl = deploymentUnit.getClassLoader().getResource("/WEB-INF/wsdl/FirstServiceESB/SimpleListener.wsdl");
+ URL wsdl = deploymentUnit.getClassLoader().getResource("exploded-esb-archive/WEB-INF/wsdl/FirstServiceESB/SimpleListener.wsdl");
assertNotNull("No wsdl file was added to the classpath.", wsdl);
- URL servletClass = deploymentUnit.getClassLoader().getResource("/WEB-INF/classes/esb/ws/FirstServiceESB.SimpleListener.Implementation.class");
- assertNotNull("No servletclass(WS) was added to the classpath", servletClass);
+ //URL servletClass = deploymentUnit.getClassLoader().getResource("/WEB-INF/classes/esb/ws/FirstServiceESB.SimpleListener.Implementation.class");
+ //assertNotNull("No servletclass(WS) was added to the classpath", servletClass);
// Try loading the servlet class to verify that it is available to the deployment units classloader
try
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployerUnitTest.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployerUnitTest.xml 2009-04-07 10:07:27 UTC (rev 25980)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployerUnitTest.xml 2009-04-07 11:30:22 UTC (rev 25981)
@@ -6,8 +6,11 @@
<bean name="EsbConfigParser" class="org.jboss.soa.esb.listeners.deployers.mc.EsbConfigParser"/>
- <!-- bean name="EsbDeployer" class="org.jboss.soa.esb.listeners.deployers.mc.EsbDeployer"/-->
+ <bean name="EsbWebServiceDeployer" class="org.jboss.soa.esb.listeners.deployers.mc.EsbWebServiceDeployer"/>
+
+ <bean name="EsbParser" class="org.jboss.soa.esb.listeners.deployers.mc.EsbDeployer"/>
+
<bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
<property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
<property name="deployers"><inject bean="Deployers"/></property>
More information about the jboss-svn-commits
mailing list