[jboss-svn-commits] JBL Code SVN: r23351 - in labs/jbossesb/workspace/skeagh: runtime/src/main/java/org/jboss/esb/deploy and 1 other directory.

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

Author: beve
Date: 2008-10-07 11:16:36 -0400 (Tue, 07 Oct 2008)
New Revision: 23351

Added:
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/Deployable.java
Removed:
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/IDeploymentRuntime.java
Modified:
   labs/jbossesb/workspace/skeagh/osgi/src/main/java/org/jboss/esb/osgi/EsbServiceActivator.java
   labs/jbossesb/workspace/skeagh/osgi/src/main/java/org/jboss/esb/osgi/EsbServiceDeploymentActivator.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
Log:
Renamed IDeploymentRuntime to Deployable. 


Modified: labs/jbossesb/workspace/skeagh/osgi/src/main/java/org/jboss/esb/osgi/EsbServiceActivator.java
===================================================================
--- labs/jbossesb/workspace/skeagh/osgi/src/main/java/org/jboss/esb/osgi/EsbServiceActivator.java	2008-10-07 14:28:15 UTC (rev 23350)
+++ labs/jbossesb/workspace/skeagh/osgi/src/main/java/org/jboss/esb/osgi/EsbServiceActivator.java	2008-10-07 15:16:36 UTC (rev 23351)
@@ -20,7 +20,7 @@
  */
 package org.jboss.esb.osgi;
 
-import org.jboss.esb.deploy.IDeploymentRuntime;
+import org.jboss.esb.deploy.Deployable;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.util.tracker.ServiceTracker;
@@ -55,10 +55,10 @@
      */
     public final void start(final BundleContext context) throws Exception
     {
-        esbServiceTracker = new ServiceTracker(context, IDeploymentRuntime.class.getName(), null);
+        esbServiceTracker = new ServiceTracker(context, Deployable.class.getName(), null);
         esbServiceTracker.open();
 
-        final IDeploymentRuntime runtime = (IDeploymentRuntime)esbServiceTracker.getService();
+        final Deployable runtime = (Deployable)esbServiceTracker.getService();
         if (runtime != null)
         {
             runtime.deploy();
@@ -73,7 +73,7 @@
      */
     public final void stop(final BundleContext context) throws Exception
     {
-        final IDeploymentRuntime runtime = (IDeploymentRuntime)esbServiceTracker.getService();
+        final Deployable runtime = (Deployable)esbServiceTracker.getService();
         if (runtime != null)
         {
             runtime.undeploy();

Modified: labs/jbossesb/workspace/skeagh/osgi/src/main/java/org/jboss/esb/osgi/EsbServiceDeploymentActivator.java
===================================================================
--- labs/jbossesb/workspace/skeagh/osgi/src/main/java/org/jboss/esb/osgi/EsbServiceDeploymentActivator.java	2008-10-07 14:28:15 UTC (rev 23350)
+++ labs/jbossesb/workspace/skeagh/osgi/src/main/java/org/jboss/esb/osgi/EsbServiceDeploymentActivator.java	2008-10-07 15:16:36 UTC (rev 23351)
@@ -20,7 +20,7 @@
  */
 package org.jboss.esb.osgi;
 
-import org.jboss.esb.deploy.IDeploymentRuntime;
+import org.jboss.esb.deploy.Deployable;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
@@ -47,7 +47,7 @@
     public final void start(final BundleContext context) throws Exception
     {
         final EsbServiceFactory esbService = new EsbServiceFactory();
-        context.registerService(IDeploymentRuntime.class.getName(), esbService, null);
+        context.registerService(Deployable.class.getName(), esbService, null);
     }
 
     /**

Copied: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/Deployable.java (from rev 23350, labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/IDeploymentRuntime.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/Deployable.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/Deployable.java	2008-10-07 15:16:36 UTC (rev 23351)
@@ -0,0 +1,24 @@
+package org.jboss.esb.deploy;
+
+/**
+ * Deployable is something that can be deployed and undeployed.
+ * <p>
+ *
+ * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
+ */
+public interface Deployable
+{
+    /**
+     * Deploy.
+     *
+     * @throws DeploymentException if error occurs during deployment
+     */
+    void deploy() throws DeploymentException;
+
+    /**
+     * Undeploy.
+     *
+     * @throws DeploymentException if error occurs during undeployment
+     */
+    void undeploy() throws DeploymentException;
+}

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java	2008-10-07 14:28:15 UTC (rev 23350)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java	2008-10-07 15:16:36 UTC (rev 23351)
@@ -69,7 +69,7 @@
  *
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
  */
-public class DeploymentRuntime implements IDeploymentRuntime
+public class DeploymentRuntime implements Deployable
 {
     /**
      * Class logger.
@@ -112,6 +112,7 @@
      */
     private Map<Object, Object> deployedObjects = new LinkedHashMap<Object, Object>()
     {
+        @Override
         public Object put(final Object key, final Object value)
         {
             if (containsKey(key))
@@ -427,6 +428,7 @@
             {
                 private DefaultConfigurationDigester digester = new DefaultConfigurationDigester();
 
+                @Override
                 public void processEntry(final String unitName, final String unitPath) throws DeploymentException
                 {
                     String deploymentCheckPath = "preinstalled/" + ConfigUtil.urlEncode(deploymentName) + "/" + unitPath;

Deleted: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/IDeploymentRuntime.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/IDeploymentRuntime.java	2008-10-07 14:28:15 UTC (rev 23350)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/IDeploymentRuntime.java	2008-10-07 15:16:36 UTC (rev 23351)
@@ -1,23 +0,0 @@
-package org.jboss.esb.deploy;
-
-/**
- *
- * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
- *
- */
-public interface IDeploymentRuntime
-{
-    /**
-     * Deploy an Esb Service.
-     *
-     * @throws DeploymentException if error occurs during deployment
-     */
-    void deploy() throws DeploymentException;
-
-    /**
-     * Undeploy an Esb Service.
-     *
-     * @throws DeploymentException if error occurs during undeployment
-     */
-    void undeploy() throws DeploymentException;
-}