Move dispatch API to dmr module

jbossas · Mar 13, 2013 · a2399cd · a2399cd
1 parent a774f5d
commit a2399cd
Show file tree

Hide file tree

Showing 176 changed files with 400 additions and 402 deletions.
diff --git a/dmr/pom.xml b/dmr/pom.xml
@@ -31,6 +31,18 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.jboss.as</groupId>
+            <artifactId>diagnostics</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+        </dependency>
+
+
         <!-- GWT -->
         <dependency>
             <groupId>com.google.gwt</groupId>

diff --git a/dmr/src/main/java/org/jboss/dmr/DMR.gwt.xml b/dmr/src/main/java/org/jboss/dmr/DMR.gwt.xml
@@ -19,12 +19,12 @@
   -->
 
 <module rename-to='dmr_gwt'>
-  <inherits name='com.google.gwt.user.User'/>
-  <inherits name='com.google.gwt.http.HTTP'/>
+    <inherits name='com.google.gwt.user.User'/>
+    <inherits name='com.google.gwt.http.HTTP'/>
 
-  <entry-point class='org.jboss.dmr.client.Bootstrap'/>
+    <inherits name="com.google.gwt.debugpanel.DebugPanel_Disabled" />
+    <entry-point class='org.jboss.dmr.client.Bootstrap'/>
 
-  <source path='client'/>
-  <source path='shared'/>
+    <source path='client'/>
 
 </module>
diff --git a/...onsole/client/shared/dispatch/Action.java → ...org/jboss/dmr/client/dispatch/Action.java b/...onsole/client/shared/dispatch/Action.java → ...org/jboss/dmr/client/dispatch/Action.java
@@ -17,7 +17,7 @@
  * MA  02110-1301, USA.
  */
 
-package org.jboss.as.console.client.shared.dispatch;
+package org.jboss.dmr.client.dispatch;
 
 /**
  * @author Heiko Braun

diff --git a/...client/shared/dispatch/ActionHandler.java → ...ss/dmr/client/dispatch/ActionHandler.java b/...client/shared/dispatch/ActionHandler.java → ...ss/dmr/client/dispatch/ActionHandler.java
@@ -17,7 +17,7 @@
  * MA  02110-1301, USA.
  */
 
-package org.jboss.as.console.client.shared.dispatch;
+package org.jboss.dmr.client.dispatch;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 

diff --git a/...le/client/shared/dispatch/ActionType.java → ...jboss/dmr/client/dispatch/ActionType.java b/...le/client/shared/dispatch/ActionType.java → ...jboss/dmr/client/dispatch/ActionType.java
@@ -17,7 +17,7 @@
  * MA  02110-1301, USA.
  */
 
-package org.jboss.as.console.client.shared.dispatch;
+package org.jboss.dmr.client.dispatch;
 
 /**
  * @author Heiko Braun

diff --git a/.../client/shared/dispatch/AsyncCommand.java → ...oss/dmr/client/dispatch/AsyncCommand.java b/.../client/shared/dispatch/AsyncCommand.java → ...oss/dmr/client/dispatch/AsyncCommand.java
@@ -17,7 +17,7 @@
  * MA  02110-1301, USA.
  */
 
-package org.jboss.as.console.client.shared.dispatch;
+package org.jboss.dmr.client.dispatch;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 

diff --git a/...sole/client/shared/dispatch/DMRCache.java → ...g/jboss/dmr/client/dispatch/DMRCache.java b/...sole/client/shared/dispatch/DMRCache.java → ...g/jboss/dmr/client/dispatch/DMRCache.java
@@ -1,7 +1,7 @@
-package org.jboss.as.console.client.shared.dispatch;
+package org.jboss.dmr.client.dispatch;
 
 import com.google.gwt.core.client.Scheduler;
-import org.jboss.as.console.client.shared.dispatch.impl.DMRResponse;
+import org.jboss.dmr.client.dispatch.impl.DMRResponse;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...e/client/shared/dispatch/Diagnostics.java → ...boss/dmr/client/dispatch/Diagnostics.java b/...e/client/shared/dispatch/Diagnostics.java → ...boss/dmr/client/dispatch/Diagnostics.java
@@ -1,4 +1,4 @@
-package org.jboss.as.console.client.shared.dispatch;
+package org.jboss.dmr.client.dispatch;
 
 /**
  * @author Heiko Braun

diff --git a/...sole/client/shared/dispatch/Dispatch.java → ...g/jboss/dmr/client/dispatch/Dispatch.java b/...sole/client/shared/dispatch/Dispatch.java → ...g/jboss/dmr/client/dispatch/Dispatch.java
@@ -17,7 +17,7 @@
  * MA  02110-1301, USA.
  */
 
-package org.jboss.as.console.client.shared.dispatch;
+package org.jboss.dmr.client.dispatch;
 
 /**
  * @author Heiko Braun

diff --git a/...client/shared/dispatch/DispatchAsync.java → ...ss/dmr/client/dispatch/DispatchAsync.java b/...client/shared/dispatch/DispatchAsync.java → ...ss/dmr/client/dispatch/DispatchAsync.java
@@ -17,7 +17,7 @@
  * MA  02110-1301, USA.
  */
 
-package org.jboss.as.console.client.shared.dispatch;
+package org.jboss.dmr.client.dispatch;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 

diff --git a/...ient/shared/dispatch/DispatchRequest.java → .../dmr/client/dispatch/DispatchRequest.java b/...ient/shared/dispatch/DispatchRequest.java → .../dmr/client/dispatch/DispatchRequest.java
@@ -17,7 +17,7 @@
  * MA  02110-1301, USA.
  */
 
-package org.jboss.as.console.client.shared.dispatch;
+package org.jboss.dmr.client.dispatch;
 
 /**
  * @author Heiko Braun

diff --git a/...lient/shared/dispatch/HandlerMapping.java → ...s/dmr/client/dispatch/HandlerMapping.java b/...lient/shared/dispatch/HandlerMapping.java → ...s/dmr/client/dispatch/HandlerMapping.java
@@ -1,4 +1,4 @@
-package org.jboss.as.console.client.shared.dispatch;
+package org.jboss.dmr.client.dispatch;
 
 /**
  * @author Heiko Braun

diff --git a/...onsole/client/shared/dispatch/Result.java → ...org/jboss/dmr/client/dispatch/Result.java b/...onsole/client/shared/dispatch/Result.java → ...org/jboss/dmr/client/dispatch/Result.java
@@ -17,7 +17,7 @@
  * MA  02110-1301, USA.
  */
 
-package org.jboss.as.console.client.shared.dispatch;
+package org.jboss.dmr.client.dispatch;
 
 /**
  * @author Heiko Braun

diff --git a/...d/dispatch/impl/AbstractSimpleResult.java → ...t/dispatch/impl/AbstractSimpleResult.java b/...d/dispatch/impl/AbstractSimpleResult.java → ...t/dispatch/impl/AbstractSimpleResult.java
@@ -17,9 +17,9 @@
  * MA  02110-1301, USA.
  */
 
-package org.jboss.as.console.client.shared.dispatch.impl;
+package org.jboss.dmr.client.dispatch.impl;
 
-import org.jboss.as.console.client.shared.dispatch.Result;
+import org.jboss.dmr.client.dispatch.Result;
 
 public abstract class AbstractSimpleResult<T> implements Result {
   private T value;

diff --git a/...lient/shared/dispatch/impl/DMRAction.java → ...s/dmr/client/dispatch/impl/DMRAction.java b/...lient/shared/dispatch/impl/DMRAction.java → ...s/dmr/client/dispatch/impl/DMRAction.java
@@ -17,10 +17,10 @@
  * MA  02110-1301, USA.
  */
 
-package org.jboss.as.console.client.shared.dispatch.impl;
+package org.jboss.dmr.client.dispatch.impl;
 
-import org.jboss.as.console.client.shared.dispatch.Action;
-import org.jboss.as.console.client.shared.dispatch.ActionType;
+import org.jboss.dmr.client.dispatch.Action;
+import org.jboss.dmr.client.dispatch.ActionType;
 import org.jboss.dmr.client.ModelNode;
 
 /**

diff --git a/...ared/dispatch/impl/DMREndpointConfig.java → ...ient/dispatch/impl/DMREndpointConfig.java b/...ared/dispatch/impl/DMREndpointConfig.java → ...ient/dispatch/impl/DMREndpointConfig.java
@@ -1,4 +1,4 @@
-package org.jboss.as.console.client.shared.dispatch.impl;
+package org.jboss.dmr.client.dispatch.impl;
 
 /**
  * @author Heiko Braun

diff --git a/...ient/shared/dispatch/impl/DMRHandler.java → .../dmr/client/dispatch/impl/DMRHandler.java b/...ient/shared/dispatch/impl/DMRHandler.java → .../dmr/client/dispatch/impl/DMRHandler.java
@@ -17,7 +17,7 @@
  * MA  02110-1301, USA.
  */
 
-package org.jboss.as.console.client.shared.dispatch.impl;
+package org.jboss.dmr.client.dispatch.impl;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.core.client.GWT;
@@ -28,9 +28,9 @@
 import com.google.gwt.http.client.Response;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.inject.Inject;
-import org.jboss.as.console.client.shared.dispatch.ActionHandler;
-import org.jboss.as.console.client.shared.dispatch.Diagnostics;
-import org.jboss.as.console.client.shared.dispatch.DispatchRequest;
+import org.jboss.dmr.client.dispatch.ActionHandler;
+import org.jboss.dmr.client.dispatch.Diagnostics;
+import org.jboss.dmr.client.dispatch.DispatchRequest;
 import org.jboss.dmr.client.ModelNode;
 
 import static org.jboss.dmr.client.ModelDescriptionConstants.*;

diff --git a/...ent/shared/dispatch/impl/DMRResponse.java → ...dmr/client/dispatch/impl/DMRResponse.java b/...ent/shared/dispatch/impl/DMRResponse.java → ...dmr/client/dispatch/impl/DMRResponse.java
@@ -17,10 +17,10 @@
  * MA  02110-1301, USA.
  */
 
-package org.jboss.as.console.client.shared.dispatch.impl;
+package org.jboss.dmr.client.dispatch.impl;
 
 
-import org.jboss.as.console.client.shared.dispatch.Result;
+import org.jboss.dmr.client.dispatch.Result;
 import org.jboss.dmr.client.ModelNode;
 
 /**

diff --git a/...ared/dispatch/impl/DispatchAsyncImpl.java → ...ient/dispatch/impl/DispatchAsyncImpl.java b/...ared/dispatch/impl/DispatchAsyncImpl.java → ...ient/dispatch/impl/DispatchAsyncImpl.java
@@ -17,16 +17,16 @@
  * MA  02110-1301, USA.
  */
 
-package org.jboss.as.console.client.shared.dispatch.impl;
+package org.jboss.dmr.client.dispatch.impl;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.inject.Inject;
-import org.jboss.as.console.client.shared.dispatch.Action;
-import org.jboss.as.console.client.shared.dispatch.ActionHandler;
-import org.jboss.as.console.client.shared.dispatch.DispatchAsync;
-import org.jboss.as.console.client.shared.dispatch.DispatchRequest;
-import org.jboss.as.console.client.shared.dispatch.HandlerMapping;
-import org.jboss.as.console.client.shared.dispatch.Result;
+import org.jboss.dmr.client.dispatch.Action;
+import org.jboss.dmr.client.dispatch.ActionHandler;
+import org.jboss.dmr.client.dispatch.DispatchAsync;
+import org.jboss.dmr.client.dispatch.DispatchRequest;
+import org.jboss.dmr.client.dispatch.HandlerMapping;
+import org.jboss.dmr.client.dispatch.Result;
 
 /**
  * @author Heiko Braun

diff --git a/...shared/dispatch/impl/HandlerRegistry.java → ...client/dispatch/impl/HandlerRegistry.java b/...shared/dispatch/impl/HandlerRegistry.java → ...client/dispatch/impl/HandlerRegistry.java
@@ -17,13 +17,13 @@
  * MA  02110-1301, USA.
  */
 
-package org.jboss.as.console.client.shared.dispatch.impl;
+package org.jboss.dmr.client.dispatch.impl;
 
 import com.google.inject.Inject;
-import org.jboss.as.console.client.shared.dispatch.Action;
-import org.jboss.as.console.client.shared.dispatch.ActionHandler;
-import org.jboss.as.console.client.shared.dispatch.ActionType;
-import org.jboss.as.console.client.shared.dispatch.HandlerMapping;
+import org.jboss.dmr.client.dispatch.Action;
+import org.jboss.dmr.client.dispatch.ActionHandler;
+import org.jboss.dmr.client.dispatch.ActionType;
+import org.jboss.dmr.client.dispatch.HandlerMapping;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/.../shared/dispatch/impl/LMSDiagnostics.java → .../client/dispatch/impl/LMSDiagnostics.java b/.../shared/dispatch/impl/LMSDiagnostics.java → .../client/dispatch/impl/LMSDiagnostics.java
@@ -1,7 +1,7 @@
-package org.jboss.as.console.client.shared.dispatch.impl;
+package org.jboss.dmr.client.dispatch.impl;
 
 import com.google.gwt.debugpanel.common.ExceptionData;
-import org.jboss.as.console.client.shared.dispatch.Diagnostics;
+import org.jboss.dmr.client.dispatch.Diagnostics;
 
 /**
  * Integration with the lightweight metrics systems.

diff --git a/gui/src/main/java/org/jboss/as/console/App.gwt.xml b/gui/src/main/java/org/jboss/as/console/App.gwt.xml
@@ -19,7 +19,7 @@
 
 <module rename-to="app">
 
-    <inherits name="com.google.gwt.debugpanel.DebugPanel_Disabled" />
+
     <inherits name="com.google.gwt.i18n.I18N"/>
     <inherits name="com.google.gwt.json.JSON"/>
     <inherits name='com.google.gwt.visualization.Visualization'/>
@@ -69,12 +69,12 @@
     </replace-with>
 
     <!-- Dispatch API Configuration-->
-    <replace-with class="org.jboss.as.console.client.shared.dispatch.impl.LMSDiagnostics">
-        <when-type-is class="org.jboss.as.console.client.shared.dispatch.Diagnostics"/>
+    <replace-with class="org.jboss.dmr.client.dispatch.impl.LMSDiagnostics">
+        <when-type-is class="org.jboss.dmr.client.dispatch.Diagnostics"/>
     </replace-with>
 
     <replace-with class="org.jboss.as.console.client.core.BootstrappedEndpointConfig">
-        <when-type-is class="org.jboss.as.console.client.shared.dispatch.impl.DMREndpointConfig"/>
+        <when-type-is class="org.jboss.dmr.client.dispatch.impl.DMREndpointConfig"/>
     </replace-with>
 
     <property-provider name="locale">

diff --git a/gui/src/main/java/org/jboss/as/console/client/core/BootstrappedEndpointConfig.java b/gui/src/main/java/org/jboss/as/console/client/core/BootstrappedEndpointConfig.java
@@ -1,7 +1,7 @@
 package org.jboss.as.console.client.core;
 
 import org.jboss.as.console.client.Console;
-import org.jboss.as.console.client.shared.dispatch.impl.DMREndpointConfig;
+import org.jboss.dmr.client.dispatch.impl.DMREndpointConfig;
 
 /**
  * @author Heiko Braun

diff --git a/gui/src/main/java/org/jboss/as/console/client/core/Footer.java b/gui/src/main/java/org/jboss/as/console/client/core/Footer.java
@@ -38,7 +38,7 @@
 import org.jboss.as.console.client.Console;
 import org.jboss.as.console.client.ProductConfig;
 import org.jboss.as.console.client.auth.CurrentUser;
-import org.jboss.as.console.client.shared.dispatch.Diagnostics;
+import org.jboss.dmr.client.dispatch.Diagnostics;
 import org.jboss.as.console.client.widgets.popups.DefaultPopup;
 import org.jboss.ballroom.client.widgets.InlineLink;
 import org.jboss.ballroom.client.widgets.window.Feedback;

diff --git a/gui/src/main/java/org/jboss/as/console/client/core/bootstrap/ExecutionMode.java b/gui/src/main/java/org/jboss/as/console/client/core/bootstrap/ExecutionMode.java
@@ -22,9 +22,9 @@
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import org.jboss.as.console.client.core.BootstrapContext;
-import org.jboss.as.console.client.shared.dispatch.DispatchAsync;
-import org.jboss.as.console.client.shared.dispatch.impl.DMRAction;
-import org.jboss.as.console.client.shared.dispatch.impl.DMRResponse;
+import org.jboss.dmr.client.dispatch.DispatchAsync;
+import org.jboss.dmr.client.dispatch.impl.DMRAction;
+import org.jboss.dmr.client.dispatch.impl.DMRResponse;
 import org.jboss.dmr.client.ModelNode;
 import org.jboss.gwt.flow.client.Control;
 import org.jboss.gwt.flow.client.Function;

diff --git a/gui/src/main/java/org/jboss/as/console/client/core/gin/CoreUI.java b/gui/src/main/java/org/jboss/as/console/client/core/gin/CoreUI.java
@@ -59,9 +59,9 @@
 import org.jboss.as.console.client.plugins.RuntimeExtensionRegistry;
 import org.jboss.as.console.client.plugins.SubsystemRegistry;
 import org.jboss.as.console.client.shared.deployment.DeploymentStore;
-import org.jboss.as.console.client.shared.dispatch.DispatchAsync;
-import org.jboss.as.console.client.shared.dispatch.HandlerMapping;
-import org.jboss.as.console.client.shared.dispatch.impl.DMRHandler;
+import org.jboss.dmr.client.dispatch.DispatchAsync;
+import org.jboss.dmr.client.dispatch.HandlerMapping;
+import org.jboss.dmr.client.dispatch.impl.DMRHandler;
 import org.jboss.as.console.client.shared.expr.ExpressionResolver;
 import org.jboss.as.console.client.shared.general.InterfacePresenter;
 import org.jboss.as.console.client.shared.general.PathManagementPresenter;

diff --git a/gui/src/main/java/org/jboss/as/console/client/core/gin/CoreUIModule.java b/gui/src/main/java/org/jboss/as/console/client/core/gin/CoreUIModule.java
@@ -90,12 +90,12 @@
 import org.jboss.as.console.client.plugins.SubsystemRegistry;
 import org.jboss.as.console.client.plugins.SubsystemRegistryImpl;
 import org.jboss.as.console.client.shared.deployment.DeploymentStore;
-import org.jboss.as.console.client.shared.dispatch.DispatchAsync;
-import org.jboss.as.console.client.shared.dispatch.HandlerMapping;
+import org.jboss.dmr.client.dispatch.DispatchAsync;
+import org.jboss.dmr.client.dispatch.HandlerMapping;
 import org.jboss.as.console.client.shared.state.ResponseProcessorFactory;
-import org.jboss.as.console.client.shared.dispatch.impl.DMRHandler;
-import org.jboss.as.console.client.shared.dispatch.impl.DispatchAsyncImpl;
-import org.jboss.as.console.client.shared.dispatch.impl.HandlerRegistry;
+import org.jboss.dmr.client.dispatch.impl.DMRHandler;
+import org.jboss.dmr.client.dispatch.impl.DispatchAsyncImpl;
+import org.jboss.dmr.client.dispatch.impl.HandlerRegistry;
 import org.jboss.as.console.client.shared.expr.DefaultExpressionResolver;
 import org.jboss.as.console.client.shared.expr.ExpressionResolver;
 import org.jboss.as.console.client.shared.general.InterfacePresenter;

diff --git a/gui/src/main/java/org/jboss/as/console/client/domain/groups/ServerGroupPresenter.java b/gui/src/main/java/org/jboss/as/console/client/domain/groups/ServerGroupPresenter.java
@@ -46,9 +46,9 @@
 import org.jboss.as.console.client.domain.model.ServerGroupStore;
 import org.jboss.as.console.client.domain.model.SimpleCallback;
 import org.jboss.as.console.client.shared.BeanFactory;
-import org.jboss.as.console.client.shared.dispatch.DispatchAsync;
-import org.jboss.as.console.client.shared.dispatch.impl.DMRAction;
-import org.jboss.as.console.client.shared.dispatch.impl.DMRResponse;
+import org.jboss.dmr.client.dispatch.DispatchAsync;
+import org.jboss.dmr.client.dispatch.impl.DMRAction;
+import org.jboss.dmr.client.dispatch.impl.DMRResponse;
 import org.jboss.as.console.client.shared.jvm.CreateJvmCmd;
 import org.jboss.as.console.client.shared.jvm.DeleteJvmCmd;
 import org.jboss.as.console.client.shared.jvm.Jvm;

diff --git a/.../java/org/jboss/as/console/client/domain/groups/deployment/DomainDeploymentPresenter.java b/.../java/org/jboss/as/console/client/domain/groups/deployment/DomainDeploymentPresenter.java
@@ -42,9 +42,9 @@
 import org.jboss.as.console.client.shared.deployment.NewDeploymentWizard;
 import org.jboss.as.console.client.shared.deployment.model.ContentRepository;
 import org.jboss.as.console.client.shared.deployment.model.DeploymentRecord;
-import org.jboss.as.console.client.shared.dispatch.DispatchAsync;
-import org.jboss.as.console.client.shared.dispatch.impl.DMRAction;
-import org.jboss.as.console.client.shared.dispatch.impl.DMRResponse;
+import org.jboss.dmr.client.dispatch.DispatchAsync;
+import org.jboss.dmr.client.dispatch.impl.DMRAction;
+import org.jboss.dmr.client.dispatch.impl.DMRResponse;
 import org.jboss.ballroom.client.widgets.window.DefaultWindow;
 import org.jboss.ballroom.client.widgets.window.Feedback;
 import org.jboss.dmr.client.ModelNode;

diff --git a/gui/src/main/java/org/jboss/as/console/client/domain/hosts/HostVMMetricPresenter.java b/gui/src/main/java/org/jboss/as/console/client/domain/hosts/HostVMMetricPresenter.java
@@ -17,7 +17,7 @@
 import org.jboss.as.console.client.domain.model.SimpleCallback;
 import org.jboss.as.console.client.domain.runtime.DomainRuntimePresenter;
 import org.jboss.as.console.client.shared.BeanFactory;
-import org.jboss.as.console.client.shared.dispatch.DispatchAsync;
+import org.jboss.dmr.client.dispatch.DispatchAsync;
 import org.jboss.as.console.client.shared.jvm.LoadJVMMetricsCmd;
 import org.jboss.as.console.client.shared.jvm.model.CompositeVMMetric;
 import org.jboss.as.console.client.shared.runtime.Metric;

diff --git a/gui/src/main/java/org/jboss/as/console/client/domain/hosts/LoadServerCmd.java b/gui/src/main/java/org/jboss/as/console/client/domain/hosts/LoadServerCmd.java
@@ -1,14 +1,10 @@
 package org.jboss.as.console.client.domain.hosts;
 
 import com.google.gwt.user.client.rpc.AsyncCallback;
-import org.jboss.as.console.client.domain.model.HostInformationStore;
-import org.jboss.as.console.client.domain.model.ServerInstance;
-import org.jboss.as.console.client.shared.dispatch.AsyncCommand;
+import org.jboss.dmr.client.dispatch.AsyncCommand;
 import org.jboss.as.console.client.shared.state.DomainEntityManager;
 import org.jboss.as.console.client.shared.state.ServerInstanceList;
 
-import java.util.List;
-
 /**
  * @author Heiko Braun
  * @date 12/9/11