[jboss-svn-commits] JBL Code SVN: r33549 - in labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools: guvnor/client/explorer/grid/model and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 18 12:49:34 EDT 2010
Author: diegoll
Date: 2010-06-18 12:49:32 -0400 (Fri, 18 Jun 2010)
New Revision: 33549
Added:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/ExecutionEnvironmentInfo.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentDataContainer.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentInfoPanel.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentInfoPanel.ui.xml
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/FillExecutionEnvironmentInfoPanelCallback.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoDataContainer.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoGateringService.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoPanel.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoPanel.ui.xml
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/ProviderInspector.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/ProviderInfo.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/ProviderInspectorFactory.java
Removed:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/BrowseGridResourcesTreeBuilder.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/BrowseGridTopologiesTreeBuilder.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentPanel.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/GenericProviderFactory.java
Modified:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/GridResourceInfo.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsService.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsServiceAsync.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/grid/TopologyEditor.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/grid/TopologyEditor.ui.xml
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java
Log:
refactor to better screens
Deleted: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/BrowseGridResourcesTreeBuilder.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/BrowseGridResourcesTreeBuilder.java 2010-06-18 16:47:41 UTC (rev 33548)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/BrowseGridResourcesTreeBuilder.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -1,89 +0,0 @@
-package org.drools.guvnor.client.explorer.grid;
-
-import org.drools.guvnor.client.explorer.ExplorerViewCenterPanel;
-import org.drools.guvnor.client.explorer.grid.model.DirectoryInstanceView;
-import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentView;
-import org.drools.guvnor.client.explorer.grid.model.GridTopologyView;
-import org.drools.guvnor.client.explorer.grid.model.TaskServerInstanceView;
-import org.drools.guvnor.client.explorer.grid.panels.ExecutionEnvironmentPanel;
-import org.drools.guvnor.client.explorer.grid.panels.NewGridResourcePanel;
-
-import com.gwtext.client.core.EventObject;
-import com.gwtext.client.data.Node;
-import com.gwtext.client.widgets.tree.TreeNode;
-import com.gwtext.client.widgets.tree.event.TreeNodeListenerAdapter;
-
-public final class BrowseGridResourcesTreeBuilder {
-
- public Node build(final ExplorerViewCenterPanel targetPanel, final GridTopologyView gridTopology) {
- final TreeNode resourcesItem = new TreeNode(gridTopology.getName().trim());
- resourcesItem.addListener(new TreeNodeListenerAdapter(){
- @Override
- public void onClick(Node node, EventObject e) {
- openCreateNewGridResourcePanel(targetPanel, resourcesItem, gridTopology);
- }
- });
-
- for(ExecutionEnvironmentView executionEnvironment : gridTopology.getExecutionEnvironments()){
- addExecutionEnvironmentNode(targetPanel, resourcesItem, gridTopology, executionEnvironment);
- }
-
- for(DirectoryInstanceView directoryInstance : gridTopology.getDirectoryInstances()){
- addDirectoryInstanceNode(targetPanel, resourcesItem, gridTopology, directoryInstance);
- }
-
- return resourcesItem;
- }
-
- private void addDirectoryInstanceNode(ExplorerViewCenterPanel targetPanel,
- TreeNode resourcesItem, GridTopologyView gridTopology, DirectoryInstanceView directoryInstance) {
- resourcesItem.appendChild(new TreeNode("directory - " + directoryInstance.getName()));
- }
-
- private void addExecutionEnvironmentNode(final ExplorerViewCenterPanel targetPanel, TreeNode resourcesItem, final GridTopologyView gridTopology, final ExecutionEnvironmentView executionEnvironment) {
- TreeNode environmentNode = new TreeNode("environment - " + executionEnvironment.getName());
- environmentNode.addListener(new TreeNodeListenerAdapter(){
- @Override
- public void onClick(Node node, EventObject e) {
- //FIXME find a more accurate id for the EE tab
- String executionEnvironmentTabId = executionEnvironment.getName();
- if(!targetPanel.showIfOpen(executionEnvironmentTabId)){
- targetPanel.addTab(
- executionEnvironment.getName(),
- true,
- new ExecutionEnvironmentPanel(gridTopology, executionEnvironment),
- executionEnvironmentTabId);
- }
- }
- });
- resourcesItem.appendChild(environmentNode);
- }
-
- protected void addTaskServerInstanceNode(
- ExplorerViewCenterPanel targetPanel, TreeNode resourcesItem,
- GridTopologyView gridTopology,
- TaskServerInstanceView taskServerInstance) {
- resourcesItem.appendChild(new TreeNode("task server - " + taskServerInstance.getName()));
- }
-
- private void openCreateNewGridResourcePanel(final ExplorerViewCenterPanel targetPanel, final TreeNode resourcesItem, final GridTopologyView gridTopology) {
- if (!targetPanel.showIfOpen(gridTopology.getName())) {
- targetPanel.addTab("New Resource", true, new NewGridResourcePanel(gridTopology) {
- @Override
- public void onExecutionEnvironmentCreation(ExecutionEnvironmentView executionEnvironment) {
- addExecutionEnvironmentNode(targetPanel, resourcesItem, gridTopology, executionEnvironment);
- }
-
- @Override
- public void onDirectoryInstanceCreation(DirectoryInstanceView directoryInstance) {
- addDirectoryInstanceNode(targetPanel, resourcesItem, gridTopology, directoryInstance);
- }
-
- @Override
- public void onTaskServerInstanceCreation(TaskServerInstanceView taskServerInstance) {
- addTaskServerInstanceNode(targetPanel, resourcesItem, gridTopology, taskServerInstance);
- }
- }, gridTopology.getName());
- }
- }
-}
Deleted: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/BrowseGridTopologiesTreeBuilder.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/BrowseGridTopologiesTreeBuilder.java 2010-06-18 16:47:41 UTC (rev 33548)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/BrowseGridTopologiesTreeBuilder.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -1,59 +0,0 @@
-package org.drools.guvnor.client.explorer.grid;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.drools.guvnor.client.explorer.ExplorerViewCenterPanel;
-import org.drools.guvnor.client.explorer.grid.model.GridTopologyView;
-import org.drools.guvnor.client.explorer.grid.panels.NewGridTopologyPanel;
-
-import com.gwtext.client.core.EventObject;
-import com.gwtext.client.data.Node;
-import com.gwtext.client.widgets.tree.TreeNode;
-import com.gwtext.client.widgets.tree.event.TreeNodeListenerAdapter;
-
-public class BrowseGridTopologiesTreeBuilder {
-
- private static final String TOPOLOGIES_TAB_KEY = "topologies";
- private BrowseGridResourcesTreeBuilder gridResourcesTreeBuilder;
-
- public Node build(final ExplorerViewCenterPanel targetPanel){
- final TreeNode topologiesItem = new TreeNode("Topologies");
- topologiesItem.addListener(new TreeNodeListenerAdapter(){
- @Override
- public void onClick(Node node, EventObject e) {
- openCreateNewGridTopologyPanel(targetPanel, topologiesItem);
- }
- });
-
- for (GridTopologyView topology : loadExistingTopologies()) {
- addTopologyNode(targetPanel, topologiesItem, topology);
- }
- return topologiesItem;
- }
-
- private void openCreateNewGridTopologyPanel(final ExplorerViewCenterPanel targetPanel, final TreeNode topologiesItem) {
- if (!targetPanel.showIfOpen(TOPOLOGIES_TAB_KEY)) {
- targetPanel.addTab("New execution environment", true, new NewGridTopologyPanel() {
- @Override
- public void onGridTopologyCreation(GridTopologyView newTopology) {
- addTopologyNode(targetPanel, topologiesItem, newTopology);
- }
- }, TOPOLOGIES_TAB_KEY);
- }
- }
-
- private void addTopologyNode(ExplorerViewCenterPanel targetPanel, TreeNode topologiesItem, final GridTopologyView newTopology) {
- topologiesItem.appendChild(getGridResourcesTreeBuilder().build(targetPanel, newTopology));
- }
-
- private List<GridTopologyView> loadExistingTopologies() {
- return Collections.emptyList();
- }
-
- public BrowseGridResourcesTreeBuilder getGridResourcesTreeBuilder() {
- if(gridResourcesTreeBuilder == null)
- gridResourcesTreeBuilder = new BrowseGridResourcesTreeBuilder();
- return gridResourcesTreeBuilder;
- }
-}
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/ExecutionEnvironmentInfo.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/ExecutionEnvironmentInfo.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/ExecutionEnvironmentInfo.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -0,0 +1,14 @@
+package org.drools.guvnor.client.explorer.grid.model;
+
+import java.util.HashMap;
+
+public class ExecutionEnvironmentInfo extends GridResourceInfo {
+
+ public ExecutionEnvironmentInfo() { }
+
+ public ExecutionEnvironmentInfo(Status status,
+ HashMap<String, String> info) {
+ super(status, info);
+ }
+
+}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/GridResourceInfo.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/GridResourceInfo.java 2010-06-18 16:47:41 UTC (rev 33548)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/GridResourceInfo.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -6,6 +6,8 @@
public class GridResourceInfo implements Serializable{
private Status status;
+ private String address;
+ private int port;
private Map<String, String> info;
public GridResourceInfo() { }
@@ -34,4 +36,20 @@
}
static public enum Status {RUNNING, MISSING}
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
}
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentDataContainer.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentDataContainer.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentDataContainer.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -0,0 +1,9 @@
+package org.drools.guvnor.client.explorer.grid.panels;
+
+import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentInfo;
+
+public interface ExecutionEnvironmentDataContainer {
+
+ void addInfoToPanel(ExecutionEnvironmentInfo result);
+
+}
Copied: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentInfoPanel.java (from rev 33447, labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentPanel.java)
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentInfoPanel.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentInfoPanel.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -0,0 +1,29 @@
+package org.drools.guvnor.client.explorer.grid.panels;
+
+import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentInfo;
+import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentView;
+import org.drools.guvnor.client.explorer.grid.model.GridTopologyView;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.SimplePanel;
+import com.google.gwt.user.client.ui.Widget;
+
+public class ExecutionEnvironmentInfoPanel extends Composite implements ExecutionEnvironmentDataContainer{
+
+ private static ExecutionEnvironmentInfoPanelUiBinder uiBinder = GWT.create(ExecutionEnvironmentInfoPanelUiBinder.class);
+ interface ExecutionEnvironmentInfoPanelUiBinder extends UiBinder<Widget, ExecutionEnvironmentInfoPanel> { }
+
+ @UiField SimplePanel genericInfoPanel;
+
+ public ExecutionEnvironmentInfoPanel(GridTopologyView gridTopology, ExecutionEnvironmentView executionEnvironment, GridResourceInfoGateringService service) {
+ initWidget(uiBinder.createAndBindUi(this));
+ service.getGridResourceInfoData(this);
+ }
+
+ public void addInfoToPanel(ExecutionEnvironmentInfo result) {
+ genericInfoPanel.add(new GridResourceInfoPanel(result));
+ }
+}
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentInfoPanel.ui.xml
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentInfoPanel.ui.xml (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentInfoPanel.ui.xml 2010-06-18 16:49:32 UTC (rev 33549)
@@ -0,0 +1,12 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
+ xmlns:g="urn:import:com.google.gwt.user.client.ui" >
+ <ui:style>
+ .important {
+ font-weight: bold;
+ }
+ </ui:style>
+ <g:VerticalPanel>
+ <g:SimplePanel ui:field="genericInfoPanel"/>
+ </g:VerticalPanel>
+</ui:UiBinder>
\ No newline at end of file
Deleted: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentPanel.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentPanel.java 2010-06-18 16:47:41 UTC (rev 33548)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentPanel.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -1,74 +0,0 @@
-package org.drools.guvnor.client.explorer.grid.panels;
-
-import java.util.Map;
-
-import org.drools.guvnor.client.common.GenericCallback;
-import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentView;
-import org.drools.guvnor.client.explorer.grid.model.GridResourceInfo;
-import org.drools.guvnor.client.explorer.grid.model.GridTopologyView;
-import org.drools.guvnor.client.explorer.grid.services.TopologyAssetsService;
-import org.drools.guvnor.client.explorer.grid.services.TopologyAssetsServiceAsync;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.Grid;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.Panel;
-import com.google.gwt.user.client.ui.VerticalPanel;
-
-public class ExecutionEnvironmentPanel extends Composite {
-
- private TopologyAssetsServiceAsync assetService;
-
- public ExecutionEnvironmentPanel(GridTopologyView gridTopology, ExecutionEnvironmentView executionEnvironment) {
- final Panel panel = new VerticalPanel();
- initWidget(panel);
-
- fillPanelGenericData(panel, gridTopology, executionEnvironment);
-
- getService().queryExecutionEnvironmentInfo(gridTopology, executionEnvironment, new GenericCallback<GridResourceInfo>() {
- public void onSuccess(GridResourceInfo result) {
- addInfoToPanel(panel, result);
- }
- });
-
- }
-
-
- private void fillPanelGenericData(Panel panel,
- GridTopologyView gridTopology,
- ExecutionEnvironmentView executionEnvironment) {
-
- Grid genericData = new Grid(2,2);
- genericData.setWidget(0, 0, new Label("Topology:"));
- genericData.setWidget(0, 1, new Label(gridTopology.getName()));
- genericData.setWidget(1, 0, new Label("Execution Environment:"));
- genericData.setWidget(1, 1, new Label(executionEnvironment.getName()));
-
- panel.add(genericData);
- }
-
-
- private void addInfoToPanel(Panel panel, GridResourceInfo result) {
- Grid extraInfo = new Grid(result.getInfo().size(), 2);
- {
- int i = 0;
- for (Map.Entry<String, String> info : result.getInfo().entrySet()) {
- extraInfo.setWidget(i, 0, new Label(info.getKey()));
- extraInfo.setWidget(i, 1, new Label(info.getValue()));
- i++;
- }
- }
-
- panel.add(new Label(result.getStatus().name()));
- panel.add(extraInfo);
- }
-
-
- private TopologyAssetsServiceAsync getService() {
- if(assetService == null)
- assetService = GWT.create(TopologyAssetsService.class);
- return assetService;
- }
-
-}
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/FillExecutionEnvironmentInfoPanelCallback.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/FillExecutionEnvironmentInfoPanelCallback.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/FillExecutionEnvironmentInfoPanelCallback.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -0,0 +1,17 @@
+package org.drools.guvnor.client.explorer.grid.panels;
+
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentInfo;
+
+public class FillExecutionEnvironmentInfoPanelCallback extends GenericCallback<ExecutionEnvironmentInfo> {
+
+ private ExecutionEnvironmentDataContainer infoPanel;
+
+ public FillExecutionEnvironmentInfoPanelCallback(ExecutionEnvironmentDataContainer infoPanel) {
+ this.infoPanel = infoPanel;
+ }
+
+ public void onSuccess(ExecutionEnvironmentInfo result) {
+ infoPanel.addInfoToPanel(result);
+ }
+}
\ No newline at end of file
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoDataContainer.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoDataContainer.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoDataContainer.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -0,0 +1,9 @@
+package org.drools.guvnor.client.explorer.grid.panels;
+
+import org.drools.guvnor.client.explorer.grid.model.GridResourceInfo;
+
+public interface GridResourceInfoDataContainer {
+
+ void addInfoToPanel(GridResourceInfo infoContainer);
+
+}
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoGateringService.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoGateringService.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoGateringService.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -0,0 +1,7 @@
+package org.drools.guvnor.client.explorer.grid.panels;
+
+public interface GridResourceInfoGateringService {
+
+ void getGridResourceInfoData(ExecutionEnvironmentInfoPanel gridResourcePanel);
+
+}
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoPanel.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoPanel.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoPanel.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -0,0 +1,54 @@
+package org.drools.guvnor.client.explorer.grid.panels;
+
+import org.drools.guvnor.client.explorer.grid.model.GridResourceInfo;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.dom.client.SpanElement;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.Widget;
+
+public class GridResourceInfoPanel extends Composite {
+
+ private static GridResourceInfoPanelUiBinder uiBinder = GWT.create(GridResourceInfoPanelUiBinder.class);
+ interface GridResourceInfoPanelUiBinder extends UiBinder<Widget, GridResourceInfoPanel> {};
+
+ @UiField Label address;
+ @UiField Label port;
+ @UiField Label status;
+
+ public GridResourceInfoPanel(GridResourceInfo info) {
+ initWidget(uiBinder.createAndBindUi(this));
+
+ setI18NContent();
+
+ address.setText(info.getAddress());
+ port.setText(String.valueOf(info.getPort()));
+ status.setText(info.getStatus().name());
+
+// Panel mainPanel = new VerticalPanel();
+// Grid extraInfo = new Grid(info.getInfo().size(), 2);
+// {
+// int i = 0;
+// for (Map.Entry<String, String> data : info.getInfo().entrySet()) {
+// extraInfo.setWidget(i, 0, new Label(data.getKey()));
+// extraInfo.setWidget(i, 1, new Label(data.getValue()));
+// i++;
+// }
+// }
+// mainPanel.add(extraInfo);
+ }
+
+ @UiField SpanElement addressLabel;
+ @UiField SpanElement portLabel;
+ @UiField SpanElement statusLabel;
+
+ private void setI18NContent() {
+ addressLabel.setInnerText("Address");
+ portLabel.setInnerText("Port");
+ statusLabel.setInnerText("Status");
+ }
+
+}
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoPanel.ui.xml
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoPanel.ui.xml (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoPanel.ui.xml 2010-06-18 16:49:32 UTC (rev 33549)
@@ -0,0 +1,28 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
+ xmlns:g="urn:import:com.google.gwt.user.client.ui" >
+ <ui:style>
+ .important {
+ font-weight: bold;
+ }
+ .outside-panel {
+ border: 2px solid grey;
+ padding: 5px;
+ }
+ .inlined {
+ display: inline;
+ }
+
+ </ui:style>
+ <g:HTMLPanel styleName="{style.outside-panel}">
+ <div>
+ <span ui:field="addressLabel" styleName="{style.important}"/>: <g:Label ui:field="address" styleName="{style.inlined}"/>
+ </div>
+ <div>
+ <span ui:field="portLabel" styleName="{style.important}"/>: <g:Label ui:field="port" styleName="{style.inlined}"/>
+ </div>
+ <div>
+ <span ui:field="statusLabel" styleName="{style.important}"/>: <g:Label ui:field="status" styleName="{style.inlined}"/>
+ </div>
+ </g:HTMLPanel>
+</ui:UiBinder>
\ No newline at end of file
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsService.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsService.java 2010-06-18 16:47:41 UTC (rev 33548)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsService.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -2,6 +2,7 @@
import org.drools.grid.services.GridTopology;
import org.drools.guvnor.client.explorer.grid.model.DirectoryInstanceView;
+import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentInfo;
import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentView;
import org.drools.guvnor.client.explorer.grid.model.GenericProviderView;
import org.drools.guvnor.client.explorer.grid.model.GridResourceInfo;
@@ -48,7 +49,9 @@
* Queries the status of the {@link ExecutionEnvironmentView} inside the {@link GridTopology}
* @param topology the data needed to create the {@link GridTopology}
* @param executionEnvironment the data needed to query the {@link GridTopology} for info
- * @return the status of the {@link ExecutionEnvironmentView} associated
+ * @return the info of the {@link ExecutionEnvironmentView} associated
*/
- GridResourceInfo queryExecutionEnvironmentInfo(GridTopologyView topology, ExecutionEnvironmentView executionEnvironment);
+ ExecutionEnvironmentInfo queryExecutionEnvironmentInfo(GridTopologyView topology, ExecutionEnvironmentView executionEnvironment);
+
+ GridResourceInfo queryTaskServerInstanceInfo(GridTopologyView topology, TaskServerInstanceView taskServerInstance);
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsServiceAsync.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsServiceAsync.java 2010-06-18 16:47:41 UTC (rev 33548)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsServiceAsync.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -1,6 +1,7 @@
package org.drools.guvnor.client.explorer.grid.services;
import org.drools.guvnor.client.explorer.grid.model.DirectoryInstanceView;
+import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentInfo;
import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentView;
import org.drools.guvnor.client.explorer.grid.model.GenericProviderView;
import org.drools.guvnor.client.explorer.grid.model.GridResourceInfo;
@@ -24,10 +25,14 @@
void queryExecutionEnvironmentInfo(GridTopologyView topology,
ExecutionEnvironmentView executionEnvironment,
- AsyncCallback<GridResourceInfo> callback);
+ AsyncCallback<ExecutionEnvironmentInfo> callback);
void createTaskServerInstance(String name, GenericProviderView provider,
GridTopologyView gridTopology,
AsyncCallback<TaskServerInstanceView> callback);
+ void queryTaskServerInstanceInfo(GridTopologyView topology,
+ TaskServerInstanceView taskServerInstance,
+ AsyncCallback<GridResourceInfo> callback);
+
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/grid/TopologyEditor.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/grid/TopologyEditor.java 2010-06-18 16:47:41 UTC (rev 33548)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/grid/TopologyEditor.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -7,8 +7,12 @@
import org.drools.guvnor.client.explorer.grid.model.GridResourceView;
import org.drools.guvnor.client.explorer.grid.model.GridTopologyView;
import org.drools.guvnor.client.explorer.grid.model.TaskServerInstanceView;
-import org.drools.guvnor.client.explorer.grid.panels.ExecutionEnvironmentPanel;
+import org.drools.guvnor.client.explorer.grid.panels.FillExecutionEnvironmentInfoPanelCallback;
+import org.drools.guvnor.client.explorer.grid.panels.GridResourceInfoGateringService;
+import org.drools.guvnor.client.explorer.grid.panels.ExecutionEnvironmentInfoPanel;
import org.drools.guvnor.client.explorer.grid.panels.NewGridResourcePanel;
+import org.drools.guvnor.client.explorer.grid.services.TopologyAssetsService;
+import org.drools.guvnor.client.explorer.grid.services.TopologyAssetsServiceAsync;
import org.drools.guvnor.client.rpc.RuleAsset;
import com.google.gwt.core.client.GWT;
@@ -37,6 +41,7 @@
private static TopologyEditorUiBinder uiBinder = GWT.create(TopologyEditorUiBinder.class);
interface TopologyEditorUiBinder extends UiBinder<Widget, TopologyEditor> { }
+ private TopologyAssetsServiceAsync assetService;
private GridTopologyView gridTopology;
private OptGroupElement executionEnvironments;
private OptGroupElement directoryInstances;
@@ -76,13 +81,27 @@
gridResources.getElement().appendChild(groupElement);
}
+
+ /*
+ * impl disclaimer: this method looks ugly b/c it's not possible to know what kind
+ * of resource have you selected (meaning the parent group)
+ */
+ /**
+ * Changes the content of the panel acording the selected resource
+ * @param event
+ */
@UiHandler("gridResources")
void onChange(ChangeEvent event){
gridResourcePanel.clear();
String selectedResourceName = gridResources.getItemText(gridResources.getSelectedIndex());
- ExecutionEnvironmentView selectedExecEnv = gridTopology.getExecutionEnvironment(selectedResourceName);
+ final ExecutionEnvironmentView selectedExecEnv = gridTopology.getExecutionEnvironment(selectedResourceName);
if(selectedExecEnv != null){
- gridResourcePanel.add(new ExecutionEnvironmentPanel(gridTopology, selectedExecEnv));
+ gridResourcePanel.add(new ExecutionEnvironmentInfoPanel(gridTopology, selectedExecEnv, new GridResourceInfoGateringService() {
+ public void getGridResourceInfoData(ExecutionEnvironmentInfoPanel gridResourcePanel) {
+ getService().queryExecutionEnvironmentInfo(gridTopology, selectedExecEnv,
+ new FillExecutionEnvironmentInfoPanelCallback(gridResourcePanel));
+ }
+ }));
return;
}
@@ -148,9 +167,15 @@
@UiField SpanElement topologyNameLabel;
@UiField Label executionEnvironmentsLabel;
private void setI18NContent() {
- topologyNameLabel.setInnerText("Topology name: ");
- executionEnvironmentsLabel.setText("Resources:");
+ topologyNameLabel.setInnerText("Topology name");
+ executionEnvironmentsLabel.setText("Resources");
addResourceAction.setText("Create new resource");
removeResourceAction.setText("Remove resource");
}
+
+ private TopologyAssetsServiceAsync getService() {
+ if(assetService == null)
+ assetService = GWT.create(TopologyAssetsService.class);
+ return assetService;
+ }
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/grid/TopologyEditor.ui.xml
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/grid/TopologyEditor.ui.xml 2010-06-18 16:47:41 UTC (rev 33548)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/grid/TopologyEditor.ui.xml 2010-06-18 16:49:32 UTC (rev 33549)
@@ -9,20 +9,20 @@
display: inline;
}
</ui:style>
- <g:HorizontalPanel>
- <g:VerticalPanel>
- <g:HTMLPanel>
- <span ui:field="topologyNameLabel"/> <g:Label ui:field="topologyName" styleName="{style.important} {style.inlined}"/>
- </g:HTMLPanel>
- <g:HorizontalPanel>
- <g:Button ui:field="addResourceAction"/>
- </g:HorizontalPanel>
- <g:VerticalPanel>
- <g:Label ui:field="executionEnvironmentsLabel"/>
+ <g:VerticalPanel>
+ <g:HTMLPanel>
+ <span ui:field="topologyNameLabel"/>: <g:Label ui:field="topologyName" styleName="{style.important} {style.inlined}"/>
+ </g:HTMLPanel>
+ <g:HorizontalPanel>
+ <g:VerticalPanel>
+ <g:Label ui:field="executionEnvironmentsLabel"/>
<g:ListBox ui:field="gridResources" visibleItemCount="10"/>
- <g:Button ui:field="removeResourceAction" enabled="false"/>
</g:VerticalPanel>
- </g:VerticalPanel>
- <g:SimplePanel ui:field="gridResourcePanel"/>
- </g:HorizontalPanel>
+ <g:SimplePanel ui:field="gridResourcePanel"/>
+ </g:HorizontalPanel>
+ <g:HorizontalPanel>
+ <g:Button ui:field="removeResourceAction" enabled="false"/>
+ <g:Button ui:field="addResourceAction"/>
+ </g:HorizontalPanel>
+ </g:VerticalPanel>
</ui:UiBinder>
\ No newline at end of file
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/ProviderInspector.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/ProviderInspector.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/ProviderInspector.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -0,0 +1,26 @@
+package org.drools.repository.services;
+
+import org.drools.grid.services.GenericNodeProvider;
+import org.drools.repository.services.factories.ProviderInfo;
+
+public class ProviderInspector {
+
+ private GenericNodeProvider provider;
+ private ProviderInfo providerInfo;
+
+ public GenericNodeProvider getProvider() {
+ return this.provider;
+ }
+
+ public void setProvider(GenericNodeProvider provider) {
+ this.provider = provider;
+ }
+
+ public void setProviderInfo(ProviderInfo providerInfo) {
+ this.providerInfo = providerInfo;
+ }
+
+ public ProviderInfo getProviderInfo() {
+ return providerInfo;
+ }
+}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java 2010-06-18 16:47:41 UTC (rev 33548)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -1,12 +1,11 @@
package org.drools.repository.services;
import java.rmi.RemoteException;
-import java.util.HashMap;
-import org.drools.grid.ExecutionNode;
-import org.drools.grid.services.GridResource;
+import org.drools.grid.services.ExecutionEnvironment;
import org.drools.grid.services.GridTopology;
import org.drools.guvnor.client.explorer.grid.model.DirectoryInstanceView;
+import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentInfo;
import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentView;
import org.drools.guvnor.client.explorer.grid.model.GenericProviderView;
import org.drools.guvnor.client.explorer.grid.model.GridResourceInfo;
@@ -14,7 +13,7 @@
import org.drools.guvnor.client.explorer.grid.model.TaskServerInstanceView;
import org.drools.guvnor.client.explorer.grid.model.GridResourceInfo.Status;
import org.drools.guvnor.client.explorer.grid.services.TopologyAssetsService;
-import org.drools.repository.services.factories.GenericProviderFactory;
+import org.drools.repository.services.factories.ProviderInspectorFactory;
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
@@ -43,26 +42,46 @@
return newTaskServerInstance;
}
- public GridResourceInfo queryExecutionEnvironmentInfo(
+ public ExecutionEnvironmentInfo queryExecutionEnvironmentInfo(
GridTopologyView topology,
- ExecutionEnvironmentView executionEnvironment) {
- String executionEnvironmentName = executionEnvironment.getName();
+ ExecutionEnvironmentView executionEnvironmentView) {
+
+ ProviderInspector providerInspector = ProviderInspectorFactory.create(executionEnvironmentView.getProvider());
+
+ ExecutionEnvironmentInfo info = new ExecutionEnvironmentInfo();
+ info.setAddress(providerInspector.getProviderInfo().getAddress());
+ info.setPort(providerInspector.getProviderInfo().getPort());
+
+ String executionEnvironmentName = executionEnvironmentView.getName();
GridTopology gridTopology = new GridTopology(topology.getName());
-
try {
- gridTopology.registerGridResource(executionEnvironmentName, GenericProviderFactory.create(executionEnvironment.getProvider()));
+ gridTopology.registerExecutionEnvironment(executionEnvironmentName, providerInspector.getProvider());
} catch (RemoteException e) {
throw new IllegalStateException("Error registering execution environment: " + executionEnvironmentName, e);
}
-
- GridResource gridResource = gridTopology.getGridResource(executionEnvironmentName);
-
+ ExecutionEnvironment executionEnvironment = gridTopology.getExecutionEnvironment(executionEnvironmentName);
try{
- ExecutionNode node = gridTopology.getExecutionNode(gridResource);
+ executionEnvironment.getExecutionNodes();
} catch (IllegalStateException ise){
- return new GridResourceInfo(Status.MISSING, new HashMap<String, String>());
+ info.setStatus(Status.MISSING);
+ return info;
}
-
- return new GridResourceInfo(Status.RUNNING, new HashMap<String, String>());
+ info.setStatus(Status.RUNNING);
+ return info;
}
+
+ public GridResourceInfo queryTaskServerInstanceInfo(
+ GridTopologyView topology, TaskServerInstanceView taskServerInstance) {
+ String executionEnvironmentName = taskServerInstance.getName();
+ GridTopology gridTopology = new GridTopology(topology.getName());
+
+ try {
+ ProviderInspector providerInspector = ProviderInspectorFactory.create(taskServerInstance.getProvider());
+ gridTopology.registerTaskServerInstance(executionEnvironmentName, providerInspector.getProvider());
+ } catch (RemoteException e) {
+ throw new IllegalStateException("Error registering execution environment: " + executionEnvironmentName, e);
+ }
+
+ return null;
+ }
}
Deleted: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/GenericProviderFactory.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/GenericProviderFactory.java 2010-06-18 16:47:41 UTC (rev 33548)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/GenericProviderFactory.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -1,24 +0,0 @@
-package org.drools.repository.services.factories;
-
-import org.drools.grid.services.GenericProvider;
-import org.drools.grid.services.local.LocalEnvironmentProvider;
-import org.drools.grid.services.remote.MinaEnvironmentProvider;
-import org.drools.guvnor.client.explorer.grid.model.GenericProviderView;
-import org.drools.guvnor.client.explorer.grid.model.LocalProviderView;
-import org.drools.guvnor.client.explorer.grid.model.MinaProviderView;
-
-public class GenericProviderFactory {
-
- public static GenericProvider create(GenericProviderView genericProviderView){
- if(genericProviderView instanceof MinaProviderView){
- MinaProviderView minaProviderView = (MinaProviderView) genericProviderView;
- return new MinaEnvironmentProvider(minaProviderView.getName(), minaProviderView.getAddress(), minaProviderView.getPort());
- }
- if(genericProviderView instanceof LocalProviderView){
- return new LocalEnvironmentProvider();
- }
-
- throw new IllegalArgumentException("Unknown provider type from view");
- }
-
-}
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/ProviderInfo.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/ProviderInfo.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/ProviderInfo.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -0,0 +1,32 @@
+package org.drools.repository.services.factories;
+
+import org.drools.grid.services.local.LocalNodeProvider;
+import org.drools.grid.services.remote.MinaProvider;
+
+public class ProviderInfo {
+
+ private String address;
+ private int port;
+
+ public ProviderInfo(String address, int port){
+ this.address = address;
+ this.port = port;
+ }
+
+ public ProviderInfo(MinaProvider minaProvider) {
+ this(minaProvider.getProviderAddress(), minaProvider.getProviderPort());
+ }
+
+ public ProviderInfo(LocalNodeProvider localProvider) {
+ this("n/a", -1);
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+}
Copied: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/ProviderInspectorFactory.java (from rev 33520, labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/GenericProviderFactory.java)
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/ProviderInspectorFactory.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/ProviderInspectorFactory.java 2010-06-18 16:49:32 UTC (rev 33549)
@@ -0,0 +1,29 @@
+package org.drools.repository.services.factories;
+
+import org.drools.grid.services.local.LocalNodeProvider;
+import org.drools.grid.services.remote.MinaProvider;
+import org.drools.guvnor.client.explorer.grid.model.GenericProviderView;
+import org.drools.guvnor.client.explorer.grid.model.LocalProviderView;
+import org.drools.guvnor.client.explorer.grid.model.MinaProviderView;
+import org.drools.repository.services.ProviderInspector;
+
+public class ProviderInspectorFactory {
+
+ public static ProviderInspector create(GenericProviderView genericProviderView){
+ ProviderInspector inspector = new ProviderInspector();
+ if(genericProviderView instanceof MinaProviderView){
+ MinaProviderView minaProviderView = (MinaProviderView) genericProviderView;
+ MinaProvider minaProvider = new MinaProvider(minaProviderView.getName(), minaProviderView.getAddress(), minaProviderView.getPort());
+ inspector.setProvider(minaProvider);
+ inspector.setProviderInfo(new ProviderInfo(minaProvider));
+ }else if(genericProviderView instanceof LocalProviderView){
+ LocalNodeProvider localProvider = new LocalNodeProvider();
+ inspector.setProvider(localProvider);
+ inspector.setProviderInfo(new ProviderInfo(localProvider));
+ }else {
+ throw new IllegalArgumentException("Unknown provider type from view");
+ }
+ return inspector;
+ }
+
+}
More information about the jboss-svn-commits
mailing list