[jboss-svn-commits] JBL Code SVN: r33665 - in labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src: main/java/org/drools/guvnor/client/explorer/grid and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jun 26 16:41:38 EDT 2010
Author: diegoll
Date: 2010-06-26 16:41:37 -0400 (Sat, 26 Jun 2010)
New Revision: 33665
Added:
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.ui.xml
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/GridTopologyConfigData.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/grid/
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/grid/NodeProviderInfo.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/grid/TopologyAssetsServiceImpl.java
Removed:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/model/
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/TopologyAssetsServiceImpl.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
Modified:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/Guvnor.gwt.xml
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/LocalProviderFactoryPanel.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/guvnor/client/explorer/grid/panels/NewGridResourcePanel.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridTopologyPanel.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ProviderFactory.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/server/contenthandler/TopologyViewContentHandler.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/webapp/WEB-INF/web.xml
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockRepo.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockSession.java
Log:
added drools-grid-services as gwt module
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/Guvnor.gwt.xml
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/Guvnor.gwt.xml 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/Guvnor.gwt.xml 2010-06-26 20:41:37 UTC (rev 33665)
@@ -10,6 +10,8 @@
<inherits name="org.cobogw.gwt.user.User"/>
<inherits name="org.drools.factconstraints.FactConstraints"/>
<inherits name="org.drools.ide.common.Common"/>
+ <inherits name="org.drools.grid.services.GridConfiguration"/>
+
<!--
<inherits name="org.drools.grid.Grid"/>
-->
@@ -47,7 +49,7 @@
<servlet path="/feed" class="org.drools.guvnor.server.files.FeedServlet"/>
<servlet path="/workflowmanager" class="org.gridcc.mce.mceworkflow.servlets.WorkflowManagerServlet"/>
<servlet path="/wsdlparser" class="org.gridcc.mce.mceworkflow.servlets.WSDLParserServlet"/>
- <servlet path="/topologyService" class="org.drools.repository.services.TopologyAssetsServiceImpl" />
+ <servlet path="/topologyService" class="org.drools.repository.services.grid.TopologyAssetsServiceImpl" />
<set-property name="gwt.suppressNonStaticFinalFieldWarnings" value="true" />
Modified: 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 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentDataContainer.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,6 +1,6 @@
package org.drools.guvnor.client.explorer.grid.panels;
-import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentInfo;
+import org.drools.grid.services.configuration.ExecutionEnvironmentInfo;
public interface ExecutionEnvironmentDataContainer {
Modified: 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.java 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentInfoPanel.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,29 +1,20 @@
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 org.drools.grid.services.configuration.ExecutionEnvironmentInfo;
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{
+public class ExecutionEnvironmentInfoPanel extends Composite {
- private static ExecutionEnvironmentInfoPanelUiBinder uiBinder = GWT.create(ExecutionEnvironmentInfoPanelUiBinder.class);
- interface ExecutionEnvironmentInfoPanelUiBinder extends UiBinder<Widget, ExecutionEnvironmentInfoPanel> { }
+ private static ExecutionEnvironmentInfoPanelUiBinder uiBinder = GWT.create(ExecutionEnvironmentInfoPanel.class);
+ interface ExecutionEnvironmentInfoPanelUiBinder extends UiBinder<Widget, ExecutionEnvironmentInfoPanel> {};
- @UiField SimplePanel genericInfoPanel;
- public ExecutionEnvironmentInfoPanel(GridTopologyView gridTopology, ExecutionEnvironmentView executionEnvironment, GridResourceInfoGateringService service) {
+ public ExecutionEnvironmentInfoPanel(ExecutionEnvironmentInfo result) {
initWidget(uiBinder.createAndBindUi(this));
- service.getGridResourceInfoData(this);
}
- public void addInfoToPanel(ExecutionEnvironmentInfo result) {
- genericInfoPanel.add(new GridResourceInfoPanel(result));
- }
}
Modified: 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 2010-06-26 20:39:30 UTC (rev 33664)
+++ 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-26 20:41:37 UTC (rev 33665)
@@ -5,8 +5,16 @@
.important {
font-weight: bold;
}
+ .outside-panel {
+ border: 2px solid grey;
+ padding: 5px;
+ }
+ .inlined {
+ display: inline;
+ }
+
</ui:style>
- <g:VerticalPanel>
- <g:SimplePanel ui:field="genericInfoPanel"/>
- </g:VerticalPanel>
+ <g:HTMLPanel styleName="{style.outside-panel}">
+ "Buenas buenas"
+ </g:HTMLPanel>
</ui:UiBinder>
\ No newline at end of file
Copied: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentPanel.java (from rev 33595, 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/ExecutionEnvironmentPanel.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentPanel.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -0,0 +1,31 @@
+package org.drools.guvnor.client.explorer.grid.panels;
+
+import org.drools.grid.services.configuration.ExecutionEnvironmentInfo;
+import org.drools.grid.services.configuration.ExecutionEnvironmentView;
+import org.drools.grid.services.configuration.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 ExecutionEnvironmentPanel extends Composite implements ExecutionEnvironmentDataContainer{
+
+ private static ExecutionEnvironmentPanelUiBinder uiBinder = GWT.create(ExecutionEnvironmentPanelUiBinder.class);
+ interface ExecutionEnvironmentPanelUiBinder extends UiBinder<Widget, ExecutionEnvironmentPanel> { }
+
+ @UiField SimplePanel genericInfoPanel;
+ @UiField SimplePanel executionEnvironmentInfoPanel;
+
+ public ExecutionEnvironmentPanel(GridTopologyView gridTopology, ExecutionEnvironmentView executionEnvironment, GridResourceInfoGateringService service) {
+ initWidget(uiBinder.createAndBindUi(this));
+ service.getGridResourceInfoData(this);
+ }
+
+ public void addInfoToPanel(ExecutionEnvironmentInfo result) {
+ genericInfoPanel.add(new GridResourceInfoPanel(result));
+ executionEnvironmentInfoPanel.add(new ExecutionEnvironmentInfoPanel(result));
+ }
+}
Copied: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentPanel.ui.xml (from rev 33595, 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/ExecutionEnvironmentPanel.ui.xml (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ExecutionEnvironmentPanel.ui.xml 2010-06-26 20:41:37 UTC (rev 33665)
@@ -0,0 +1,13 @@
+<!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:SimplePanel ui:field="executionEnvironmentInfoPanel"/>
+ </g:VerticalPanel>
+</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/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 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/FillExecutionEnvironmentInfoPanelCallback.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,7 +1,7 @@
package org.drools.guvnor.client.explorer.grid.panels;
+import org.drools.grid.services.configuration.ExecutionEnvironmentInfo;
import org.drools.guvnor.client.common.GenericCallback;
-import org.drools.guvnor.client.explorer.grid.model.ExecutionEnvironmentInfo;
public class FillExecutionEnvironmentInfoPanelCallback extends GenericCallback<ExecutionEnvironmentInfo> {
Modified: 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 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoDataContainer.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,6 +1,6 @@
package org.drools.guvnor.client.explorer.grid.panels;
-import org.drools.guvnor.client.explorer.grid.model.GridResourceInfo;
+import org.drools.grid.services.configuration.GridResourceInfo;
public interface GridResourceInfoDataContainer {
Modified: 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 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoGateringService.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -2,6 +2,6 @@
public interface GridResourceInfoGateringService {
- void getGridResourceInfoData(ExecutionEnvironmentInfoPanel gridResourcePanel);
+ void getGridResourceInfoData(ExecutionEnvironmentPanel gridResourcePanel);
}
Modified: 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 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/GridResourceInfoPanel.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,6 +1,6 @@
package org.drools.guvnor.client.explorer.grid.panels;
-import org.drools.guvnor.client.explorer.grid.model.GridResourceInfo;
+import org.drools.grid.services.configuration.GridResourceInfo;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.SpanElement;
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/LocalProviderFactoryPanel.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/LocalProviderFactoryPanel.java 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/LocalProviderFactoryPanel.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,7 +1,7 @@
package org.drools.guvnor.client.explorer.grid.panels;
-import org.drools.guvnor.client.explorer.grid.model.GenericProviderView;
-import org.drools.guvnor.client.explorer.grid.model.LocalProviderView;
+import org.drools.grid.services.configuration.GenericProvider;
+import org.drools.grid.services.configuration.LocalProvider;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.Label;
@@ -19,7 +19,7 @@
panel.add(new Label("Local provider doesn't have custom configurations"));
}
- public GenericProviderView getProvider() {
- return new LocalProviderView();
+ public GenericProvider getProvider() {
+ return new LocalProvider();
}
}
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-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/MinaFactoryPanel.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,7 +1,7 @@
package org.drools.guvnor.client.explorer.grid.panels;
-import org.drools.guvnor.client.explorer.grid.model.GenericProviderView;
-import org.drools.guvnor.client.explorer.grid.model.MinaProviderView;
+import org.drools.grid.services.configuration.GenericProvider;
+import org.drools.grid.services.configuration.MinaProvider;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.Grid;
@@ -11,7 +11,6 @@
public class MinaFactoryPanel extends Composite implements ProviderFactory{
- private TextBox providerName;
private TextBox providerAddress;
private TextBox providerPort;
@@ -22,26 +21,22 @@
}
private void fillPanel(SimplePanel panel) {
- providerName = new TextBox();
providerAddress = new TextBox();
providerPort = new TextBox();
- Grid grid = new Grid(3, 2);
- grid.setWidget(0, 0, new Label("Name"));
- grid.setWidget(0, 1, providerName);
- grid.setWidget(1, 0, new Label("Address"));
- grid.setWidget(1, 1, providerAddress);
- grid.setWidget(2, 0, new Label("Port"));
- grid.setWidget(2, 1, providerPort);
+ Grid grid = new Grid(2, 2);
+ grid.setWidget(0, 0, new Label("Address"));
+ grid.setWidget(0, 1, providerAddress);
+ grid.setWidget(1, 0, new Label("Port"));
+ grid.setWidget(1, 1, providerPort);
panel.setWidget(grid);
}
- public GenericProviderView getProvider() {
- String name = providerName.getText();
+ public GenericProvider getProvider() {
String address = providerAddress.getText();
int port = Integer.parseInt(providerPort.getText());
- MinaProviderView provider = new MinaProviderView(name, address, port);
+ MinaProvider provider = new MinaProvider(address, port);
return provider;
}
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridResourcePanel.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridResourcePanel.java 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridResourcePanel.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,11 +1,11 @@
package org.drools.guvnor.client.explorer.grid.panels;
+import org.drools.grid.services.configuration.DirectoryInstanceView;
+import org.drools.grid.services.configuration.ExecutionEnvironmentView;
+import org.drools.grid.services.configuration.GenericProvider;
+import org.drools.grid.services.configuration.GridTopologyView;
+import org.drools.grid.services.configuration.TaskServerInstanceView;
import org.drools.guvnor.client.common.GenericCallback;
-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;
-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.services.TopologyAssetsService;
import org.drools.guvnor.client.explorer.grid.services.TopologyAssetsServiceAsync;
@@ -40,7 +40,7 @@
addEnvironmentAction = new Button("Create As Environment");
addEnvironmentAction.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
- GenericProviderView gridProvider = getGenericProvider(factoryPanel);
+ GenericProvider gridProvider = getGenericProvider(factoryPanel);
getService().createExecutionEnvironment(resourceName.getText(), gridProvider, gridTopology, new GenericCallback<ExecutionEnvironmentView>() {
public void onSuccess(ExecutionEnvironmentView executionEnvironment) {
//GWT parameters on server call are passed by copy, so I have to manually add the
@@ -56,7 +56,7 @@
addDirectoryAction = new Button("Create As Directory");
addDirectoryAction.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
- GenericProviderView gridProvider = getGenericProvider(factoryPanel);
+ GenericProvider gridProvider = getGenericProvider(factoryPanel);
getService().createDirectoryInstance(resourceName.getText(), gridProvider, gridTopology, new GenericCallback<DirectoryInstanceView>() {
public void onSuccess(DirectoryInstanceView directoryInstance) {
//GWT parameters on server call are passed by copy, so I have to manually add the
@@ -71,7 +71,7 @@
addTaskServerAction = new Button("Add as Task Server");
addTaskServerAction.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
- GenericProviderView gridProvider = getGenericProvider(factoryPanel);
+ GenericProvider gridProvider = getGenericProvider(factoryPanel);
getService().createTaskServerInstance(resourceName.getText(), gridProvider, gridTopology, new GenericCallback<TaskServerInstanceView>() {
public void onSuccess(TaskServerInstanceView taskServerInstance) {
//GWT parameters on server call are passed by copy, so I have to manually add the
@@ -98,7 +98,7 @@
initWidget(panel);
}
- protected GenericProviderView getGenericProvider(SimplePanel factoryPanel) {
+ protected GenericProvider getGenericProvider(SimplePanel factoryPanel) {
ProviderFactory providerFactory = (ProviderFactory) factoryPanel.getWidget();
return providerFactory.getProvider();
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridTopologyPanel.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridTopologyPanel.java 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/NewGridTopologyPanel.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,7 +1,7 @@
package org.drools.guvnor.client.explorer.grid.panels;
+import org.drools.grid.services.configuration.GridTopologyView;
import org.drools.guvnor.client.common.GenericCallback;
-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;
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ProviderFactory.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ProviderFactory.java 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/panels/ProviderFactory.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,8 +1,8 @@
package org.drools.guvnor.client.explorer.grid.panels;
-import org.drools.guvnor.client.explorer.grid.model.GenericProviderView;
+import org.drools.grid.services.configuration.GenericProvider;
public interface ProviderFactory {
- GenericProviderView getProvider();
+ GenericProvider getProvider();
}
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-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsService.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,13 +1,13 @@
package org.drools.guvnor.client.explorer.grid.services;
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;
-import org.drools.guvnor.client.explorer.grid.model.GridTopologyView;
-import org.drools.guvnor.client.explorer.grid.model.TaskServerInstanceView;
+import org.drools.grid.services.configuration.DirectoryInstanceView;
+import org.drools.grid.services.configuration.ExecutionEnvironmentInfo;
+import org.drools.grid.services.configuration.ExecutionEnvironmentView;
+import org.drools.grid.services.configuration.GenericProvider;
+import org.drools.grid.services.configuration.GridResourceInfo;
+import org.drools.grid.services.configuration.GridTopologyView;
+import org.drools.grid.services.configuration.TaskServerInstanceView;
import com.google.gwt.user.client.rpc.RemoteService;
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
@@ -24,7 +24,7 @@
* @param gridTopology is the topology where the newly {@link ExecutionEnvironmentView} will be added
* @return a new {@link ExecutionEnvironmentView} already added to a topology
*/
- ExecutionEnvironmentView createExecutionEnvironment(String name, GenericProviderView provider, GridTopologyView gridTopology);
+ ExecutionEnvironmentView createExecutionEnvironment(String name, GenericProvider provider, GridTopologyView gridTopology);
/**
* Creates a new {@link DirectoryInstanceView} and adds it to the {@link GridTopologyView} parameter
@@ -33,7 +33,7 @@
* @param gridTopology is the topology where the newly {@link DirectoryInstanceView} will be added
* @return a new {@link DirectoryInstanceView} already added to a topology
*/
- DirectoryInstanceView createDirectoryInstance(String name, GenericProviderView provider, GridTopologyView gridTopology);
+ DirectoryInstanceView createDirectoryInstance(String name, GenericProvider provider, GridTopologyView gridTopology);
/**
* Creates a new {@link TaskServerInstanceView} and adds it to the {@link GridTopologyView} parameter
@@ -42,7 +42,7 @@
* @param gridTopology is the topology where the newly {@link TaskServerInstanceView} will be added
* @return a new {@link TaskServerInstanceView} already added to a topology
*/
- TaskServerInstanceView createTaskServerInstance(String name, GenericProviderView provider, GridTopologyView gridTopology);
+ TaskServerInstanceView createTaskServerInstance(String name, GenericProvider provider, GridTopologyView gridTopology);
/**
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-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/grid/services/TopologyAssetsServiceAsync.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,12 +1,12 @@
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;
-import org.drools.guvnor.client.explorer.grid.model.GridTopologyView;
-import org.drools.guvnor.client.explorer.grid.model.TaskServerInstanceView;
+import org.drools.grid.services.configuration.DirectoryInstanceView;
+import org.drools.grid.services.configuration.ExecutionEnvironmentInfo;
+import org.drools.grid.services.configuration.ExecutionEnvironmentView;
+import org.drools.grid.services.configuration.GenericProvider;
+import org.drools.grid.services.configuration.GridResourceInfo;
+import org.drools.grid.services.configuration.GridTopologyView;
+import org.drools.grid.services.configuration.TaskServerInstanceView;
import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -15,11 +15,11 @@
void createNewTopology(String text,
AsyncCallback<GridTopologyView> callback);
- void createDirectoryInstance(String name, GenericProviderView provider,
+ void createDirectoryInstance(String name, GenericProvider provider,
GridTopologyView gridTopology,
AsyncCallback<DirectoryInstanceView> callback);
- void createExecutionEnvironment(String name, GenericProviderView provider,
+ void createExecutionEnvironment(String name, GenericProvider provider,
GridTopologyView gridTopology,
AsyncCallback<ExecutionEnvironmentView> callback);
@@ -27,7 +27,7 @@
ExecutionEnvironmentView executionEnvironment,
AsyncCallback<ExecutionEnvironmentInfo> callback);
- void createTaskServerInstance(String name, GenericProviderView provider,
+ void createTaskServerInstance(String name, GenericProvider provider,
GridTopologyView gridTopology,
AsyncCallback<TaskServerInstanceView> 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-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/grid/TopologyEditor.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -2,17 +2,18 @@
import java.util.Collection;
-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.GridResourceView;
-import org.drools.guvnor.client.explorer.grid.model.GridTopologyView;
-import org.drools.guvnor.client.explorer.grid.model.TaskServerInstanceView;
+import org.drools.grid.services.configuration.DirectoryInstanceView;
+import org.drools.grid.services.configuration.ExecutionEnvironmentView;
+import org.drools.grid.services.configuration.GridResourceView;
+import org.drools.grid.services.configuration.GridTopologyView;
+import org.drools.grid.services.configuration.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.GridTopologyConfigData;
import org.drools.guvnor.client.rpc.RuleAsset;
import com.google.gwt.core.client.GWT;
@@ -53,7 +54,7 @@
@UiField ListBox gridResources;
public TopologyEditor(RuleAsset asset) {
- gridTopology = (GridTopologyView) asset.content;
+ gridTopology = ((GridTopologyConfigData) asset.content).getGridConfiguration();
gridTopology.setName(asset.metaData.name);
initWidget(uiBinder.createAndBindUi(this));
setI18NContent();
@@ -96,8 +97,8 @@
String selectedResourceName = gridResources.getItemText(gridResources.getSelectedIndex());
final ExecutionEnvironmentView selectedExecEnv = gridTopology.getExecutionEnvironment(selectedResourceName);
if(selectedExecEnv != null){
- gridResourcePanel.add(new ExecutionEnvironmentInfoPanel(gridTopology, selectedExecEnv, new GridResourceInfoGateringService() {
- public void getGridResourceInfoData(ExecutionEnvironmentInfoPanel gridResourcePanel) {
+ gridResourcePanel.add(new ExecutionEnvironmentPanel(gridTopology, selectedExecEnv, new GridResourceInfoGateringService() {
+ public void getGridResourceInfoData(ExecutionEnvironmentPanel gridResourcePanel) {
getService().queryExecutionEnvironmentInfo(gridTopology, selectedExecEnv,
new FillExecutionEnvironmentInfoPanelCallback(gridResourcePanel));
}
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/GridTopologyConfigData.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/GridTopologyConfigData.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/GridTopologyConfigData.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -0,0 +1,19 @@
+package org.drools.guvnor.client.rpc;
+
+import org.drools.grid.services.configuration.GridTopologyView;
+import org.drools.ide.common.client.modeldriven.brl.PortableObject;
+
+public class GridTopologyConfigData implements PortableObject {
+
+ private GridTopologyView gridConfiguration;
+
+ public GridTopologyView getGridConfiguration() {
+ if(null == gridConfiguration)
+ gridConfiguration = new GridTopologyView();
+ return gridConfiguration;
+ }
+
+ public void setGridConfiguration(GridTopologyView gridConfiguration) {
+ this.gridConfiguration = gridConfiguration;
+ }
+}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/TopologyViewContentHandler.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/TopologyViewContentHandler.java 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/TopologyViewContentHandler.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,12 +1,12 @@
package org.drools.guvnor.server.contenthandler;
-import org.drools.guvnor.client.explorer.grid.model.GridTopologyView;
+import org.drools.guvnor.client.rpc.GridTopologyConfigData;
-public class TopologyViewContentHandler extends BaseXStreamContentHandler<GridTopologyView> {
+public class TopologyViewContentHandler extends BaseXStreamContentHandler<GridTopologyConfigData> {
@Override
- protected GridTopologyView newInstance() {
- return new GridTopologyView();
+ protected GridTopologyConfigData newInstance() {
+ return new GridTopologyConfigData();
}
}
Deleted: 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 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/ProviderInspector.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,26 +0,0 @@
-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;
- }
-}
Deleted: 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-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/TopologyAssetsServiceImpl.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,86 +0,0 @@
-package org.drools.repository.services;
-
-import org.drools.grid.ConnectorException;
-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;
-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.model.GridResourceInfo.Status;
-import org.drools.guvnor.client.explorer.grid.services.TopologyAssetsService;
-import org.drools.repository.services.factories.ProviderInspectorFactory;
-
-import com.google.gwt.user.server.rpc.RemoteServiceServlet;
-
-public class TopologyAssetsServiceImpl extends RemoteServiceServlet implements TopologyAssetsService {
-
- public GridTopologyView createNewTopology(String text) {
- GridTopologyView newTopology = new GridTopologyView(text);
- return newTopology;
- }
-
- public ExecutionEnvironmentView createExecutionEnvironment(String name, GenericProviderView provider, GridTopologyView gridTopology) {
- ExecutionEnvironmentView newExecutionEnvironment = new ExecutionEnvironmentView(name, provider);
- gridTopology.addExecutionEnvironment(newExecutionEnvironment);
- return newExecutionEnvironment;
- }
-
- public DirectoryInstanceView createDirectoryInstance(String name, GenericProviderView provider, GridTopologyView gridTopology) {
- DirectoryInstanceView newDirectoryInstance = new DirectoryInstanceView(name, provider);
- gridTopology.addDirectoryInstance(newDirectoryInstance);
- return newDirectoryInstance;
- }
-
- public TaskServerInstanceView createTaskServerInstance(String name, GenericProviderView provider, GridTopologyView gridTopology) {
- TaskServerInstanceView newTaskServerInstance = new TaskServerInstanceView(name, provider);
- gridTopology.addTaskServerInstance(newTaskServerInstance);
- return newTaskServerInstance;
- }
-
- public ExecutionEnvironmentInfo queryExecutionEnvironmentInfo(
- GridTopologyView topology,
- 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.registerExecutionEnvironment(executionEnvironmentName, providerInspector.getProvider());
- } catch (ConnectorException e) {
- throw new IllegalStateException("Error registering execution environment: " + executionEnvironmentName, e);
- }
- ExecutionEnvironment executionEnvironment = gridTopology.getExecutionEnvironment(executionEnvironmentName);
- try{
- executionEnvironment.getExecutionNodes();
- } catch (ConnectorException ise){
- info.setStatus(Status.MISSING);
- return info;
- }
- 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 (ConnectorException 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/ProviderInfo.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/ProviderInfo.java 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/ProviderInfo.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,32 +0,0 @@
-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;
- }
-
-}
Deleted: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/ProviderInspectorFactory.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/ProviderInspectorFactory.java 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/factories/ProviderInspectorFactory.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -1,29 +0,0 @@
-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;
- }
-
-}
Copied: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/grid/NodeProviderInfo.java (from rev 33595, 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/grid/NodeProviderInfo.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/grid/NodeProviderInfo.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -0,0 +1,22 @@
+package org.drools.repository.services.grid;
+
+
+public class NodeProviderInfo {
+
+ private String address;
+ private int port;
+
+ public NodeProviderInfo(String address, int port){
+ this.address = address;
+ this.port = port;
+ }
+
+ 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/grid/TopologyAssetsServiceImpl.java (from rev 33595, 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/grid/TopologyAssetsServiceImpl.java (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/java/org/drools/repository/services/grid/TopologyAssetsServiceImpl.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -0,0 +1,85 @@
+package org.drools.repository.services.grid;
+
+import org.drools.builder.DirectoryLookupFactoryService;
+import org.drools.grid.ConnectorException;
+import org.drools.grid.ExecutionNode;
+import org.drools.grid.services.ExecutionEnvironment;
+import org.drools.grid.services.GridTopology;
+import org.drools.grid.services.configuration.DirectoryInstanceView;
+import org.drools.grid.services.configuration.ExecutionEnvironmentInfo;
+import org.drools.grid.services.configuration.ExecutionEnvironmentView;
+import org.drools.grid.services.configuration.GenericProvider;
+import org.drools.grid.services.configuration.GridResourceInfo;
+import org.drools.grid.services.configuration.GridTopologyView;
+import org.drools.grid.services.configuration.TaskServerInstanceView;
+import org.drools.grid.services.configuration.GridResourceInfo.Status;
+import org.drools.grid.services.factory.GridTopologyFactory;
+import org.drools.guvnor.client.explorer.grid.services.TopologyAssetsService;
+
+import com.google.gwt.user.server.rpc.RemoteServiceServlet;
+
+public class TopologyAssetsServiceImpl extends RemoteServiceServlet implements TopologyAssetsService {
+
+ public GridTopologyView createNewTopology(String text) {
+ GridTopologyView newTopology = new GridTopologyView(text);
+ return newTopology;
+ }
+
+ public ExecutionEnvironmentView createExecutionEnvironment(String name, GenericProvider provider, GridTopologyView gridTopology) {
+ ExecutionEnvironmentView newExecutionEnvironment = new ExecutionEnvironmentView(name, provider);
+ gridTopology.addExecutionEnvironment(newExecutionEnvironment);
+ return newExecutionEnvironment;
+ }
+
+ public DirectoryInstanceView createDirectoryInstance(String name, GenericProvider provider, GridTopologyView gridTopology) {
+ DirectoryInstanceView newDirectoryInstance = new DirectoryInstanceView(name, provider);
+ gridTopology.addDirectoryInstance(newDirectoryInstance);
+ return newDirectoryInstance;
+ }
+
+ public TaskServerInstanceView createTaskServerInstance(String name, GenericProvider provider, GridTopologyView gridTopology) {
+ TaskServerInstanceView newTaskServerInstance = new TaskServerInstanceView(name, provider);
+ gridTopology.addTaskServerInstance(newTaskServerInstance);
+ return newTaskServerInstance;
+ }
+
+ public ExecutionEnvironmentInfo queryExecutionEnvironmentInfo(
+ GridTopologyView topology,
+ ExecutionEnvironmentView executionEnvironmentView) {
+
+ GridTopology gridTopology = GridTopologyFactory.build(topology);
+
+ String executionEnvironmentName = executionEnvironmentView.getName();
+ ExecutionEnvironment executionEnvironment = gridTopology.getExecutionEnvironment(executionEnvironmentName);
+ ExecutionEnvironmentInfo info = new ExecutionEnvironmentInfo();
+ try{
+ fillInfo(info, executionEnvironment);
+ } catch (ConnectorException ise){
+ info.setStatus(Status.MISSING);
+ return info;
+ }
+ info.setStatus(Status.RUNNING);
+ return info;
+ }
+
+ private void fillInfo(ExecutionEnvironmentInfo info, ExecutionEnvironment executionEnvironment) throws ConnectorException{
+ for (ExecutionNode executionNode : executionEnvironment.getExecutionNodes()) {
+ info.addExecutionNodeInfo(executionNode.getId(), executionNode.get(DirectoryLookupFactoryService.class).getDirectoryMap());
+ }
+ }
+
+ public GridResourceInfo queryTaskServerInstanceInfo(
+ GridTopologyView topology, TaskServerInstanceView taskServerInstance) {
+// String executionEnvironmentName = taskServerInstance.getName();
+// GridTopology gridTopology = new GridTopology(topology.getName());
+//
+// try {
+// NodeProviderInspector providerInspector = ProviderInspectorFactory.createNodeProviderInspector(taskServerInstance.getProvider());
+// gridTopology.registerTaskServerInstance(executionEnvironmentName, providerInspector.getProvider());
+// } catch (ConnectorException e) {
+// throw new IllegalStateException("Error registering execution environment: " + executionEnvironmentName, e);
+// }
+
+ return null;
+ }
+}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/webapp/WEB-INF/web.xml
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/webapp/WEB-INF/web.xml 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/main/webapp/WEB-INF/web.xml 2010-06-26 20:41:37 UTC (rev 33665)
@@ -60,7 +60,7 @@
</servlet>
<servlet>
<servlet-name>topologyService</servlet-name>
- <servlet-class>org.drools.repository.services.TopologyAssetServicesImpl</servlet-class>
+ <servlet-class>org.drools.repository.services.grid.TopologyAssetsServiceImpl</servlet-class>
</servlet>
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockRepo.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockRepo.java 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockRepo.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -23,6 +23,7 @@
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import javax.jcr.Value;
class MockRepo implements Repository {
@@ -60,5 +61,25 @@
RepositoryException {
return null;
}
+
+ public Value getDescriptorValue(String key) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Value[] getDescriptorValues(String key) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean isSingleValueDescriptor(String key) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public boolean isStandardDescriptor(String key) {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
\ No newline at end of file
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockSession.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockSession.java 2010-06-26 20:39:30 UTC (rev 33664)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-guvnor/src/test/java/org/drools/guvnor/server/repository/MockSession.java 2010-06-26 20:41:37 UTC (rev 33665)
@@ -33,6 +33,7 @@
import javax.jcr.NamespaceException;
import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
+import javax.jcr.Property;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -42,6 +43,8 @@
import javax.jcr.lock.LockException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
+import javax.jcr.retention.RetentionManager;
+import javax.jcr.security.AccessControlManager;
import javax.jcr.version.VersionException;
import org.xml.sax.ContentHandler;
@@ -244,5 +247,64 @@
}
+
+ public AccessControlManager getAccessControlManager()
+ throws UnsupportedRepositoryOperationException, RepositoryException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Node getNode(String absPath) throws PathNotFoundException,
+ RepositoryException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Node getNodeByIdentifier(String id) throws ItemNotFoundException,
+ RepositoryException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Property getProperty(String absPath) throws PathNotFoundException,
+ RepositoryException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public RetentionManager getRetentionManager()
+ throws UnsupportedRepositoryOperationException, RepositoryException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean hasCapability(String methodName, Object target,
+ Object[] arguments) throws RepositoryException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public boolean hasPermission(String absPath, String actions)
+ throws RepositoryException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public boolean nodeExists(String absPath) throws RepositoryException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public boolean propertyExists(String absPath) throws RepositoryException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void removeItem(String absPath) throws VersionException,
+ LockException, ConstraintViolationException, AccessDeniedException,
+ RepositoryException {
+ // TODO Auto-generated method stub
+
+ }
}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list