[jboss-svn-commits] JBL Code SVN: r24100 - in labs/jbossesb/workspace/skeagh/container/microcontainer/src: test/java/org/jboss/esb/microcontainer/deployers and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2008-11-25 16:30:40 -0500 (Tue, 25 Nov 2008)
New Revision: 24100

Modified:
   labs/jbossesb/workspace/skeagh/container/microcontainer/src/main/java/org/jboss/esb/microcontainer/deployers/EsbDeployer.java
   labs/jbossesb/workspace/skeagh/container/microcontainer/src/main/java/org/jboss/esb/microcontainer/deployers/EsbParserDeployer.java
   labs/jbossesb/workspace/skeagh/container/microcontainer/src/test/java/org/jboss/esb/microcontainer/deployers/EsbDeployerTest.xml
Log:
Made the suffixes configurable properties.


Modified: labs/jbossesb/workspace/skeagh/container/microcontainer/src/main/java/org/jboss/esb/microcontainer/deployers/EsbDeployer.java
===================================================================
--- labs/jbossesb/workspace/skeagh/container/microcontainer/src/main/java/org/jboss/esb/microcontainer/deployers/EsbDeployer.java	2008-11-25 18:08:44 UTC (rev 24099)
+++ labs/jbossesb/workspace/skeagh/container/microcontainer/src/main/java/org/jboss/esb/microcontainer/deployers/EsbDeployer.java	2008-11-25 21:30:40 UTC (rev 24100)
@@ -21,12 +21,14 @@
 package org.jboss.esb.microcontainer.deployers;
 
 import java.io.IOException;
+import java.net.URL;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.log4j.Logger;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.esb.api.context.ResourceLocator;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
 import org.jboss.esb.microcontainer.config.DeploymentUnitResourceLocator;
@@ -121,8 +123,9 @@
 
     private DeploymentRuntime createRuntime(final DeploymentUnit deploymentUnit, final EsbMetaData esbMetaData, final String deploymentName) throws org.jboss.esb.deploy.DeploymentException, IOException
     {
-        final DeploymentUnitResourceLocator resourceLocator = new DeploymentUnitResourceLocator(deploymentUnit.getClassLoader());
-        final DeploymentRuntime runtime = DeploymentUtil.createRuntime(esbMetaData.getFileURL().openStream(), resourceLocator);
+        final ResourceLocator resourceLocator = new DeploymentUnitResourceLocator(deploymentUnit.getClassLoader());
+        final URL esbConfigURL = esbMetaData.getFileURL();
+        final DeploymentRuntime runtime = DeploymentUtil.createRuntime(esbConfigURL.openStream(), resourceLocator);
         runtime.setDeploymentName(deploymentName);
         return runtime;
     }

Modified: labs/jbossesb/workspace/skeagh/container/microcontainer/src/main/java/org/jboss/esb/microcontainer/deployers/EsbParserDeployer.java
===================================================================
--- labs/jbossesb/workspace/skeagh/container/microcontainer/src/main/java/org/jboss/esb/microcontainer/deployers/EsbParserDeployer.java	2008-11-25 18:08:44 UTC (rev 24099)
+++ labs/jbossesb/workspace/skeagh/container/microcontainer/src/main/java/org/jboss/esb/microcontainer/deployers/EsbParserDeployer.java	2008-11-25 21:30:40 UTC (rev 24100)
@@ -26,9 +26,19 @@
 import org.jboss.virtual.VirtualFile;
 
 /**
- * Esb deployer that picks up jboss-esb.xml files and .esb archives..
+ * Esb deployer that picks up jboss-esb.xml files and .esb archives.
  *
+ * Sample configuration:
+ * <pre>{@code
+ *  <bean name="EsbParserDeployer" class="org.jboss.esb.microcontainer.deployers.EsbParserDeployer">
+ *    <property name="esbFileSuffix">-esb.xml</property>
+ *    <property name="esbArchiveSuffix">.esb</property>
+ * </bean>
+ * }
+ * </pre>
+ *
  * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ * @since 5.0
  *
  */
 public class EsbParserDeployer extends AbstractVFSParsingDeployer<EsbMetaData>
@@ -39,22 +49,38 @@
     private Logger log = Logger.getLogger(EsbParserDeployer.class);
 
     /**
-     * The suffix of JBossESB configuration files that should be picked up.
+     * The default suffix of JBossESB configuration files that should be picked up.
      */
-    private static final String ESB_FILE_SUFFIX = "-esb.xml";
+    private static final String DEFAULT_ESB_FILE_SUFFIX = "-esb.xml";
 
     /**
-     * The suffix of JBossESB archives that should be accepted.
+     * The default suffix of JBossESB archives that should be accepted.
      */
-    private static final String ESB_JAR_SUFFIX = ".esb";
+    private static final String DEFAULT_ESB_JAR_SUFFIX = ".esb";
 
+    /**
+     * Configurable esb file suffix.
+     */
+    private String esbFileSuffix = DEFAULT_ESB_FILE_SUFFIX;
+
+    /**
+     * Configurable esb file suffix.
+     */
+    private String esbArchiveSuffix = DEFAULT_ESB_JAR_SUFFIX;
+
     public EsbParserDeployer()
     {
         super(EsbMetaData.class);
-        setSuffix(ESB_FILE_SUFFIX);
-        setJarExtension(ESB_JAR_SUFFIX);
+        setSuffix(esbFileSuffix);
+        setJarExtension(esbArchiveSuffix);
     }
 
+    /**
+     *
+     * @param deploymentUnit
+     * @param file
+     * @param metaData
+     */
     @Override
     protected EsbMetaData parse(final VFSDeploymentUnit deploymentUnit, final VirtualFile file, final EsbMetaData metaData) throws Exception
     {
@@ -65,7 +91,26 @@
     protected String getDefaultName(final VirtualFile file)
     {
         final String shortName = file.getName();
-        return shortName.substring(0, shortName.indexOf(ESB_FILE_SUFFIX));
+        return shortName.substring(0, shortName.indexOf(esbFileSuffix));
     }
 
+    public String getEsbFileSuffix()
+    {
+        return esbFileSuffix;
+    }
+
+    public void setEsbFileSuffix(String esbFileSuffix)
+    {
+        this.esbFileSuffix = esbFileSuffix;
+    }
+
+    public String getEsbArchiveSuffix()
+    {
+        return esbArchiveSuffix;
+    }
+
+    public void setEsbArchiveSuffix(String esbArchiveSuffix)
+    {
+        this.esbArchiveSuffix = esbArchiveSuffix;
+    }
 }

Modified: labs/jbossesb/workspace/skeagh/container/microcontainer/src/test/java/org/jboss/esb/microcontainer/deployers/EsbDeployerTest.xml
===================================================================
--- labs/jbossesb/workspace/skeagh/container/microcontainer/src/test/java/org/jboss/esb/microcontainer/deployers/EsbDeployerTest.xml	2008-11-25 18:08:44 UTC (rev 24099)
+++ labs/jbossesb/workspace/skeagh/container/microcontainer/src/test/java/org/jboss/esb/microcontainer/deployers/EsbDeployerTest.xml	2008-11-25 21:30:40 UTC (rev 24100)
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <bean name="EsbParserDeployer" class="org.jboss.esb.microcontainer.deployers.EsbParserDeployer"/>
+   <bean name="EsbParserDeployer" class="org.jboss.esb.microcontainer.deployers.EsbParserDeployer">
+      <property name="esbFileSuffix">-esb.xml</property>
+      <property name="esbArchiveSuffix">.esb</property>
+   </bean>
    <bean name="EsbDeployer" class="org.jboss.esb.microcontainer.deployers.EsbDeployer"/>
    
    <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">