[jboss-svn-commits] JBL Code SVN: r26377 - in labs/jbossesb/workspace/dbevenius/jbossas5/product: rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue May 5 09:00:23 EDT 2009
Author: beve
Date: 2009-05-05 09:00:23 -0400 (Tue, 05 May 2009)
New Revision: 26377
Added:
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbossesb/src/main/resources/META-INF/jboss-scanning.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbpm/src/main/resources/META-INF/jboss-scanning.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbrules/src/main/resources/META-INF/jboss-scanning.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/smooks/src/main/resources/META-INF/jboss-scanning.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soap/src/main/resources/META-INF/jboss-scanning.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-scanning.xml
labs/jbossesb/workspace/dbevenius/jbossas5/product/services/spring/src/main/resources/META-INF/jboss-scanning.xml
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/EsbWsdlDeployer.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployerUnitTest.java
Log:
Minor clean up and improvments.
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-05-05 11:21:07 UTC (rev 26376)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWebServiceDeployer.java 2009-05-05 13:00:23 UTC (rev 26377)
@@ -21,7 +21,6 @@
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;
@@ -55,7 +54,7 @@
/**
* EsbWebServiceDeployer is responsible for deploying the web service that will
- * expose the underlying ESB service.
+ * expose the underlying ESB service as a web service.
* <p/>
*
* @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
@@ -79,7 +78,12 @@
private static final String DYNAMIC_CL_URL_KEY = "WS-DYNAMIC-CL-URL";
/**
- * No-args constructor.
+ * Sole constructor that performas the following steps:
+ * <lu>
+ * <li>Sets the output of this deployer to be {@link EsbMetaData}.</li>
+ * <li>Sets this deployers deployment stage to {@link DeploymentStages#POST_PARSE}./li>
+ * <li>Specifies that this deployer produces JBossWebMetaData and EsbMetaData./li>
+ * </lu>
*/
public EsbWebServiceDeployer()
{
@@ -89,6 +93,9 @@
setOutput(EsbMetaData.class);
}
+ /**
+ * Create only logs that this deployer has been created.
+ */
public void create()
{
log.info("Created");
@@ -100,7 +107,7 @@
final List<WebserviceInfo> endpointServices = esbMetaData.getModel().getWebserviceServices();
if (hasWebServices(endpointServices))
{
- log.info("Deploying webservices for : " + esbMetaData.getDeploymentName());
+ log.debug("Deploying webservices for : " + esbMetaData.getDeploymentName());
final JBossWebMetaData webMetaData = new JBossWebMetaData();
final JBossServletsMetaData servlets = new JBossServletsMetaData();
@@ -128,12 +135,9 @@
final boolean includeHandlers = (handlers != null);
if (includeHandlers)
{
- log.info("Adding to metadatalocation : " + classesDir);
deploymentUnit.appendMetaDataLocation(classesDir);
final String wsHandlerName = serviceInfo.getPackageName().replace('.', '/') + "/esb-jaxws-handlers.xml";
- VirtualFile jaxwsHandlers = MemoryFileFactory.putFile(new URL(classesUrl + wsHandlerName), handlers.getBytes());
- log.info("Created handler : " + jaxwsHandlers);
- //deploymentUnit.addClassPath(jaxwsHandlers);
+ MemoryFileFactory.putFile(new URL(classesUrl + wsHandlerName), handlers.getBytes());
}
if (serviceInfo.isOneWay())
@@ -149,7 +153,7 @@
final URL servletClassUrl = new URL(classesUrl + "/" + servletClassName);
// Add the servlet to the virtual file system.
MemoryFileFactory.putFile(servletClassUrl, servletClass);
- log.info("Generated ws impl: " + servletClassUrl);
+ log.debug("Generated ws impl: " + servletClassUrl);
servlets.add(createServlets(service, serviceInfo, generator, includeHandlers));
servletMappings.add(createServletMapping(serviceInfo));
@@ -228,7 +232,7 @@
{
log.warn("Error deleting dynamic class root for " + deploymentUnit.getName(), e);
}
- }
+ }
}
private ServletMappingMetaData createServletMapping(final ESBServiceEndpointInfo serviceInfo)
@@ -248,7 +252,7 @@
return servlet;
}
- private FilterMetaData createFilter(ESBServiceEndpointInfo serviceInfo)
+ private FilterMetaData createFilter(final ESBServiceEndpointInfo serviceInfo)
{
// Filter
final FilterMetaData filter = new FilterMetaData();
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWsdlDeployer.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWsdlDeployer.java 2009-05-05 11:21:07 UTC (rev 26376)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWsdlDeployer.java 2009-05-05 13:00:23 UTC (rev 26377)
@@ -39,7 +39,7 @@
* MC deployer that generates a wsdl and then adds this wsdl to
* a virtual memory file system.
* <p/>
- * It accepts an EsbMetaData instance and looks for the existence of any WebService (WS)
+ * This deployer accepts an EsbMetaData instance and looks for the existence of any WebService (WS)
* information. If WS information is found a wsdl will be generated and it will be added
* to the deployment unit as a metadata location. The wsdl file is added as a VirtualFile
* to an in-memory virtual file system.
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployerUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployerUnitTest.java 2009-05-05 11:21:07 UTC (rev 26376)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployerUnitTest.java 2009-05-05 13:00:23 UTC (rev 26377)
@@ -46,7 +46,6 @@
public void testExplodedEsbArchive() throws Throwable
{
- /*
final String archiveName = "exploded-esb-archive.esb";
EsbMetaData esbMetaData = TestUtil.getEsbMetaData(new EsbConfigParser(), dir, archiveName);
VFSDeploymentUnit deploymentUnit = TestUtil.getDeploymentUnit(dir, archiveName);
@@ -54,7 +53,6 @@
esbDeployer.deploy(deploymentUnit, esbMetaData);
Object attachment = deploymentUnit.getAttachment(BeanMetaData.class.getName() + "_ESB");
assertTrue(attachment instanceof BeanMetaData);
- */
}
}
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbossesb/src/main/resources/META-INF/jboss-scanning.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbossesb/src/main/resources/META-INF/jboss-scanning.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbossesb/src/main/resources/META-INF/jboss-scanning.xml 2009-05-05 13:00:23 UTC (rev 26377)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+ <!-- prevent scanning for annotations -->
+</scanning>
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbpm/src/main/resources/META-INF/jboss-scanning.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbpm/src/main/resources/META-INF/jboss-scanning.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbpm/src/main/resources/META-INF/jboss-scanning.xml 2009-05-05 13:00:23 UTC (rev 26377)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+ <!-- prevent scanning for annotations -->
+</scanning>
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbrules/src/main/resources/META-INF/jboss-scanning.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbrules/src/main/resources/META-INF/jboss-scanning.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/jbrules/src/main/resources/META-INF/jboss-scanning.xml 2009-05-05 13:00:23 UTC (rev 26377)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+ <!-- prevent scanning for annotations -->
+</scanning>
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/smooks/src/main/resources/META-INF/jboss-scanning.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/smooks/src/main/resources/META-INF/jboss-scanning.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/smooks/src/main/resources/META-INF/jboss-scanning.xml 2009-05-05 13:00:23 UTC (rev 26377)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+ <!-- prevent scanning for annotations -->
+</scanning>
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soap/src/main/resources/META-INF/jboss-scanning.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soap/src/main/resources/META-INF/jboss-scanning.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soap/src/main/resources/META-INF/jboss-scanning.xml 2009-05-05 13:00:23 UTC (rev 26377)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+ <!-- prevent scanning for annotations -->
+</scanning>
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-scanning.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-scanning.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/soapui-client/src/main/resources/META-INF/jboss-scanning.xml 2009-05-05 13:00:23 UTC (rev 26377)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+ <!-- prevent scanning for annotations -->
+</scanning>
Added: labs/jbossesb/workspace/dbevenius/jbossas5/product/services/spring/src/main/resources/META-INF/jboss-scanning.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/services/spring/src/main/resources/META-INF/jboss-scanning.xml (rev 0)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/services/spring/src/main/resources/META-INF/jboss-scanning.xml 2009-05-05 13:00:23 UTC (rev 26377)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+ <!-- prevent scanning for annotations -->
+</scanning>
More information about the jboss-svn-commits
mailing list