[jboss-svn-commits] JBL Code SVN: r33415 - in labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools: guvnor/client/explorer/grid/panels and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jun 9 11:10:24 EDT 2010
Author: diegoll
Date: 2010-06-09 11:10:24 -0400 (Wed, 09 Jun 2010)
New Revision: 33415
Added:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/
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/MinaProviderView.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/guvnor/client/explorer/grid/panels/MinaFactoryPanel.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java
Log:
added first support to be aware of the status of the mina node (running|missing)
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/MinaProviderView.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/MinaProviderView.java 2010-06-09 09:25:09 UTC (rev 33414)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/MinaProviderView.java 2010-06-09 15:10:24 UTC (rev 33415)
@@ -6,12 +6,12 @@
private String name;
private String address;
- private String port;
+ private int port;
public MinaProviderView(){
}
- public MinaProviderView(String name, String address, String port) {
+ public MinaProviderView(String name, String address, int port) {
this.name = name;
this.address = address;
this.port = port;
@@ -25,7 +25,7 @@
return address;
}
- public String getPort() {
+ public int getPort() {
return port;
}
@@ -42,7 +42,7 @@
this.address = address;
}
- public void setPort(String port) {
+ public void setPort(int port) {
this.port = port;
}
}
Modified: 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-09 09:25:09 UTC (rev 33414)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentPanel.java 2010-06-09 15:10:24 UTC (rev 33415)
@@ -13,14 +13,15 @@
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.SimplePanel;
+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 SimplePanel panel = new SimplePanel();
+ final Panel panel = new VerticalPanel();
initWidget(panel);
fillPanelGenericData(panel, gridTopology, executionEnvironment);
@@ -34,7 +35,7 @@
}
- private void fillPanelGenericData(SimplePanel panel,
+ private void fillPanelGenericData(Panel panel,
GridTopologyView gridTopology,
ExecutionEnvironmentView executionEnvironment) {
@@ -48,7 +49,7 @@
}
- private void addInfoToPanel(SimplePanel panel, GridResourceInfo result) {
+ private void addInfoToPanel(Panel panel, GridResourceInfo result) {
Grid extraInfo = new Grid(result.getInfo().size(), 2);
{
int i = 0;
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/MinaFactoryPanel.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/MinaFactoryPanel.java 2010-06-09 09:25:09 UTC (rev 33414)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/MinaFactoryPanel.java 2010-06-09 15:10:24 UTC (rev 33415)
@@ -40,7 +40,7 @@
public GenericProviderView getProvider() {
String name = providerName.getText();
String address = providerAddress.getText();
- String port = providerPort.getText();
+ int port = Integer.parseInt(providerPort.getText());
MinaProviderView provider = new MinaProviderView(name, address, port);
return provider;
}
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-09 09:25:09 UTC (rev 33414)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java 2010-06-09 15:10:24 UTC (rev 33415)
@@ -1,7 +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.GridTopology;
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.GenericProviderView;
@@ -9,6 +13,7 @@
import org.drools.guvnor.client.explorer.grid.model.GridTopologyView;
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 com.google.gwt.user.server.rpc.RemoteServiceServlet;
@@ -34,7 +39,23 @@
public GridResourceInfo queryExecutionEnvironmentInfo(
GridTopologyView topology,
ExecutionEnvironmentView executionEnvironment) {
- executionEnvironment.getProvider();
- return new GridResourceInfo(Status.MISSING, new HashMap<String, String>());
+ String executionEnvironmentName = executionEnvironment.getName();
+ GridTopology gridTopology = new GridTopology(topology.getName());
+
+ try {
+ gridTopology.registerGridResource(executionEnvironmentName, GenericProviderFactory.create(executionEnvironment.getProvider()));
+ } catch (RemoteException e) {
+ throw new IllegalStateException("Error registering execution environment: " + executionEnvironmentName, e);
+ }
+
+ GridResource gridResource = gridTopology.getGridResource(executionEnvironmentName);
+
+ try{
+ ExecutionNode node = gridTopology.getExecutionNode(gridResource);
+ } catch (IllegalStateException ise){
+ return new GridResourceInfo(Status.MISSING, new HashMap<String, String>());
+ }
+
+ return new GridResourceInfo(Status.RUNNING, new HashMap<String, String>());
}
}
Added: 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 (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/GenericProviderFactory.java 2010-06-09 15:10:24 UTC (rev 33415)
@@ -0,0 +1,24 @@
+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");
+ }
+
+}
More information about the jboss-svn-commits
mailing list