[jboss-svn-commits] JBL Code SVN: r26503 - in labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta: src/org/jboss/soa/esb/listeners/config and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 13 07:48:55 EDT 2009
Author: beve
Date: 2009-05-13 07:48:55 -0400 (Wed, 13 May 2009)
New Revision: 26503
Modified:
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/util/JBossDeployerUtil.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/DefaultESBPropertiesSetterUnitTest.java
Log:
Minor clean up.
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/util/JBossDeployerUtil.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/util/JBossDeployerUtil.java 2009-05-13 10:55:49 UTC (rev 26502)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/internal/soa/esb/util/JBossDeployerUtil.java 2009-05-13 11:48:55 UTC (rev 26503)
@@ -104,19 +104,6 @@
return result;
}
- public static void addFile(final ZipOutputStream zos, final String filename, final String contents) throws IOException
- {
- addFile(zos, filename, contents.getBytes());
- }
-
- public static void addFile(final ZipOutputStream zos, final String filename, final byte[] contents) throws IOException
- {
- final ZipEntry entry = new ZipEntry(filename);
- zos.putNextEntry(entry);
- zos.write(contents);
- zos.closeEntry();
- }
-
public static File getESBWarFile(final String deploymentName, final String esbName, final boolean createDir, final File dir)
{
final File esbDir = new File(dir, deploymentName);
@@ -142,14 +129,6 @@
return esbWarFiles;
}
- public static File createWarFilesDir(final String parentDir, String dirName)
- {
- AssertArgument.isNotNullAndNotEmpty(parentDir, "parentDir");
-
- final File tmpDir = new File(parentDir);
- return createDir(tmpDir, dirName);
- }
-
public static String readEsbConfig(final InputStream in) throws DeploymentException
{
try
@@ -183,111 +162,6 @@
}
}
- public static File createWebserviceWars(final File warFilesDir, final String esbName, final ModelAdapter model, final String deploymentName, final List<ContractReferencePublisher> publishers) throws DeploymentException
- {
- final List<WebserviceInfo> endpointServices = model.getWebserviceServices();
- if (endpointServices != null)
- {
- if (endpointServices.size() > 0)
- {
- final StringWriter filterDefinitions = new StringWriter();
- final StringWriter filterMappings = new StringWriter();
- final StringWriter servletDefinitions = new StringWriter();
- final StringWriter servletMappings = new StringWriter();
-
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- final ZipOutputStream zos = new ZipOutputStream(baos);
- zos.setComment("ESB war file for exposing webservices: " + esbName);
- try
- {
- final JAXWSProviderClassGenerator generator = new JAXWSProviderClassGenerator();
-
- for (WebserviceInfo webserviceInfo : endpointServices)
- {
- final ESBServiceEndpointInfo serviceInfo = new ESBServiceEndpointInfo(webserviceInfo);
- final String wsdl = ESBContractGenerator.generateWSDL(webserviceInfo, serviceInfo);
- JBossDeployerUtil.addFile(zos, serviceInfo.getWSDLFileName(), wsdl);
-
- final Service service = webserviceInfo.getService();
- final String handlers = JBossDeployerUtil.getHandlers(serviceInfo);
- final boolean includeHandlers = (handlers != null);
- if (includeHandlers)
- {
- final String wsHandlerName = "WEB-INF/classes/" + serviceInfo.getPackageName().replace('.', '/') + "/esb-jaxws-handlers.xml";
- JBossDeployerUtil.addFile(zos, wsHandlerName, handlers);
- }
-
- final byte[] wsClass = generator.generate(service.getCategory(), service.getName(), serviceInfo, includeHandlers);
- final String wsClassName = serviceInfo.getClassName().replace('.', '/') + ".class";
- JBossDeployerUtil.addFile(zos, "WEB-INF/classes/" + wsClassName, wsClass);
-
- // Filter...
- // At the moment we only need the filter to overcome a
- // bug in JBossWS re In-Only endpoints, so
- // we only include for one way services...
- if (serviceInfo.isOneWay())
- {
- String filterName = serviceInfo.getServletName() + "_Filter";
-
- filterDefinitions.append("<filter><filter-name>");
- filterDefinitions.append(filterName);
- filterDefinitions.append("</filter-name><filter-class>");
- filterDefinitions.append(ESBResponseFilter.class.getName());
- filterDefinitions.append("</filter-class>");
- filterDefinitions.append("<init-param><param-name>OneWay</param-name><param-value>true</param-value></init-param>");
- filterDefinitions.append("</filter>");
-
- filterMappings.append("<filter-mapping><filter-name>");
- filterMappings.append(filterName);
- filterMappings.append("</filter-name><servlet-name>");
- filterMappings.append(serviceInfo.getServletName());
- filterMappings.append("</servlet-name></filter-mapping>");
- }
-
- // Servlet....
- servletDefinitions.append("<servlet><servlet-name>");
- servletDefinitions.append(serviceInfo.getServletName());
- servletDefinitions.append("</servlet-name><servlet-class>");
- servletDefinitions.append(serviceInfo.getClassName());
- servletDefinitions.append("</servlet-class></servlet>");
-
- servletMappings.append("<servlet-mapping><servlet-name>");
- servletMappings.append(serviceInfo.getServletName());
- servletMappings.append("</servlet-name><url-pattern>");
- servletMappings.append(serviceInfo.getServletPath());
- servletMappings.append("</url-pattern></servlet-mapping>");
-
- final ContractReferencePublisher publisher = new ESBServiceContractPublisher(service, webserviceInfo.getDescription(), serviceInfo.getServletName());
- publishers.add(publisher);
- }
-
- final StringWriter webXml = new StringWriter();
- webXml.append("<web-app xmlns=\"http://java.sun.com/xml/ns/j2ee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
- webXml.append(" xsi:schemaLocation=\"http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd\" version=\"2.4\">");
- webXml.append(filterDefinitions.getBuffer());
- webXml.append(filterMappings.getBuffer());
- webXml.append(servletDefinitions.getBuffer());
- webXml.append(servletMappings.getBuffer());
- webXml.append("</web-app>");
-
- JBossDeployerUtil.addFile(zos, "WEB-INF/web.xml", webXml.toString());
- zos.close();
-
- final File warFile = JBossDeployerUtil.getESBWarFile(deploymentName, esbName, true, warFilesDir);
-
- final FileOutputStream fos = new FileOutputStream(warFile);
- fos.write(baos.toByteArray());
- fos.close();
- return warFile;
- } catch (final Exception ex)
- {
- throw new DeploymentException("Failed to create webservice artifact", ex);
- }
- }
- }
- return null;
- }
-
public static Properties getArtifactProperties(final String fileName) throws IOException
{
Properties properties = null;
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2009-05-13 10:55:49 UTC (rev 26502)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2009-05-13 11:48:55 UTC (rev 26503)
@@ -278,7 +278,7 @@
try
{
Thread.currentThread().setContextClassLoader(di.localCl) ;
- warFile = JBossDeployerUtil.createWebserviceWars(esbWarFiles, di.shortName, model, deploymentName, publishers) ;
+ warFile = createWebserviceWars(di, model, deploymentName, publishers);
}
finally
{
Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/DefaultESBPropertiesSetterUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/DefaultESBPropertiesSetterUnitTest.java 2009-05-13 10:55:49 UTC (rev 26502)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/DefaultESBPropertiesSetterUnitTest.java 2009-05-13 11:48:55 UTC (rev 26503)
@@ -133,7 +133,7 @@
@Test
public void setPropertiesFilterAllVendorSpecificProperties() throws JMSException
{
- final String filter = "[JMS_].*";
+ final String filter = "(JMS_).*";
DefaultESBPropertiesSetter setter = new DefaultESBPropertiesSetter(filter);
final String propertyKey = "JMS_SomeVendor_Property";
@@ -149,7 +149,7 @@
@Test
public void setPropertiesFilterIBMQVendorSpecificProperties() throws JMSException
{
- final String filter = "[JMS_IBMQ].*";
+ final String filter = "(JMS_IBMQ).*";
DefaultESBPropertiesSetter setter = new DefaultESBPropertiesSetter(filter);
final String propertyKey = "JMS_IBMQ_Property";
More information about the jboss-svn-commits
mailing list