[jboss-svn-commits] JBL Code SVN: r34521 - in labs/jbossrules/trunk/drools-grid: drools-grid-api and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 4 12:13:16 EDT 2010
Author: salaboy21
Date: 2010-08-04 12:13:15 -0400 (Wed, 04 Aug 2010)
New Revision: 34521
Modified:
labs/jbossrules/trunk/drools-grid/drools-grid-api/pom.xml
labs/jbossrules/trunk/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeLocalImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/KnowledgeBuilderGridClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/KnowledgeBuilderProviderLocalClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/factory/DirectoryInstanceFactory.java
labs/jbossrules/trunk/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/factory/ExecutionEnvironmentFactory.java
labs/jbossrules/trunk/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/factory/TaskServerInstanceFactory.java
labs/jbossrules/trunk/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceImpl.java
labs/jbossrules/trunk/drools-grid/pom.xml
Log:
JBRULES-2352: Drools Grid implementation
- Version 2 of Drools Grid. fixing JDK 1.5 issues
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-api/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-api/pom.xml 2010-08-04 15:54:43 UTC (rev 34520)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-api/pom.xml 2010-08-04 16:13:15 UTC (rev 34521)
@@ -11,7 +11,7 @@
<packaging>jar</packaging>
<name>Drools :: Grid :: API</name>
<artifactId>drools-grid-api</artifactId>
-
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -34,8 +34,8 @@
<artifactId>drools-compiler</artifactId>
<type>jar</type>
</dependency>
-
+
</dependencies>
-
+
</project>
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeLocalImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeLocalImpl.java 2010-08-04 15:54:43 UTC (rev 34520)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-api/src/main/java/org/drools/grid/DirectoryNodeLocalImpl.java 2010-08-04 16:13:15 UTC (rev 34521)
@@ -39,13 +39,11 @@
return "Local:Directory:";
}
- @Override
public void register(String executorId, String resourceId) throws ConnectorException, RemoteException {
executorsMap.put(executorId, resourceId);
}
- @Override
public void register(String executorId, GenericNodeConnector resourceConnector) throws ConnectorException, RemoteException {
executorsMap.put(executorId, resourceConnector.getId());
@@ -53,25 +51,21 @@
}
- @Override
public GenericNodeConnector lookup(String executorId) throws ConnectorException, RemoteException {
String nodeConnectorId = (String) executorsMap.get(executorId);
return GenericConnectorFactory.newNodeConnector(nodeConnectorId);
}
- @Override
public void registerKBase(String kbaseId, KnowledgeBase kbase) throws ConnectorException, RemoteException {
this.kbasesMap.put(kbaseId, "local");
this.kbasesInstancesMap.put(kbaseId, kbase);
}
- @Override
public void registerKBase(String kbaseId, String resourceId) throws ConnectorException, RemoteException {
this.kbasesMap.put(kbaseId, resourceId);
}
- @Override
public KnowledgeBase lookupKBase(String kbaseId) throws ConnectorException, RemoteException {
String resourceId = this.kbasesMap.get(kbaseId); //based on the id I should create a kbase client
if (resourceId.equals("local")) {
@@ -82,12 +76,10 @@
}
- @Override
public Map<String, String> getExecutorsMap() throws ConnectorException, RemoteException {
return this.executorsMap;
}
- @Override
public String lookupId(String resourceId) {
return this.executorsMap.get(resourceId);
}
@@ -98,31 +90,23 @@
return this;
}
-
-
-
- @Override
public void unregister(String executorId) throws ConnectorException, RemoteException {
executorsMap.remove(executorId);
}
- @Override
public Map<String, String> getKBasesMap() throws ConnectorException, RemoteException {
return kbasesMap;
}
- @Override
public void unregisterKBase(String kbaseId) throws ConnectorException, RemoteException {
throw new UnsupportedOperationException("Not supported yet.");
}
- @Override
public void dispose() throws ConnectorException, RemoteException {
//Do nothing ??
}
- @Override
public ServiceType getServiceType() {
return ServiceType.LOCAL;
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/KnowledgeBuilderGridClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/KnowledgeBuilderGridClient.java 2010-08-04 15:54:43 UTC (rev 34520)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/KnowledgeBuilderGridClient.java 2010-08-04 16:13:15 UTC (rev 34521)
@@ -25,7 +25,7 @@
public class KnowledgeBuilderGridClient
implements
KnowledgeBuilder {
- //private GridExecutionNodeConnection nodeConnection;
+
private String instanceId;
private GenericNodeConnector client;
private MessageSession messageSession;
@@ -33,7 +33,6 @@
public KnowledgeBuilderGridClient(String instanceId,
GenericNodeConnector client, MessageSession messageSession) {
this.instanceId = instanceId;
- //this.nodeConnection = nodeConnection;
this.client = client;
this.messageSession = messageSession;
@@ -139,7 +138,7 @@
}
- @Override
+
public KnowledgeBase newKnowledgeBase() {
throw new UnsupportedOperationException("Not supported yet.");
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/KnowledgeBuilderProviderLocalClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/KnowledgeBuilderProviderLocalClient.java 2010-08-04 15:54:43 UTC (rev 34520)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-local/src/main/java/org/drools/grid/local/KnowledgeBuilderProviderLocalClient.java 2010-08-04 16:13:15 UTC (rev 34521)
@@ -59,7 +59,6 @@
throw new UnsupportedOperationException("Not supported yet.");
}
- @Override
public JaxbConfiguration newJaxbConfiguration(Options xjcOpts, String systemId) {
throw new UnsupportedOperationException("Not supported yet.");
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/factory/DirectoryInstanceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/factory/DirectoryInstanceFactory.java 2010-08-04 15:54:43 UTC (rev 34520)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/factory/DirectoryInstanceFactory.java 2010-08-04 16:13:15 UTC (rev 34521)
@@ -46,12 +46,10 @@
this.name = directoryInstanceName;
}
- @Override
public DirectoryInstance onLocalProvider() {
return new DirectoryInstance(name, new LocalDirectoryConnector());
}
- @Override
public DirectoryInstance onMinaProvider(MinaProvider provider) {
return new DirectoryInstance(name,
new RemoteMinaDirectoryConnector(name,
@@ -60,7 +58,6 @@
SystemEventListenerFactory.getSystemEventListener()));
}
- @Override
public DirectoryInstance onRioProvider(RioProvider rioProvider) {
throw new UnsupportedOperationException("Uncomment RIO DEPS and this method!");
// try {
@@ -74,10 +71,9 @@
// new DistributedRioDirectoryConnector(name,
// SystemEventListenerFactory.getSystemEventListener(),
// rioProvider.getDirectoryNode()));
-
+
}
- @Override
public DirectoryInstance onHornetQProvider() {
return null;
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/factory/ExecutionEnvironmentFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/factory/ExecutionEnvironmentFactory.java 2010-08-04 15:54:43 UTC (rev 34520)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/factory/ExecutionEnvironmentFactory.java 2010-08-04 16:13:15 UTC (rev 34521)
@@ -45,21 +45,18 @@
this.name = executionEnvironmentName;
}
- @Override
public ExecutionEnvironment onLocalProvider() {
return new ExecutionEnvironment(name, new LocalNodeConnector());
}
- @Override
public ExecutionEnvironment onMinaProvider(MinaProvider provider) {
return new ExecutionEnvironment(name,
new RemoteMinaNodeConnector(name,
- provider.getProviderAddress(),
- provider.getProviderPort(),
+ provider.getProviderAddress(),
+ provider.getProviderPort(),
SystemEventListenerFactory.getSystemEventListener()));
}
- @Override
public ExecutionEnvironment onRioProvider(RioProvider rioProvider) {
try {
rioProvider.lookupExecutionNodeServices();
@@ -68,13 +65,12 @@
} catch (InterruptedException ex) {
Logger.getLogger(ExecutionEnvironmentFactory.class.getName()).log(Level.SEVERE, null, ex);
}
- return new ExecutionEnvironment(name,
+ return new ExecutionEnvironment(name,
new DistributedRioNodeConnector(name,
- SystemEventListenerFactory.getSystemEventListener(),
- rioProvider.getExecutionNode()));
+ SystemEventListenerFactory.getSystemEventListener(),
+ rioProvider.getExecutionNode()));
}
- @Override
public ExecutionEnvironment onHornetQProvider() {
return null;
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/factory/TaskServerInstanceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/factory/TaskServerInstanceFactory.java 2010-08-04 15:54:43 UTC (rev 34520)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-services/src/main/java/org/drools/grid/services/factory/TaskServerInstanceFactory.java 2010-08-04 16:13:15 UTC (rev 34521)
@@ -14,7 +14,6 @@
* limitations under the License.
* under the License.
*/
-
package org.drools.grid.services.factory;
import org.drools.SystemEventListenerFactory;
@@ -25,41 +24,37 @@
import org.drools.grid.task.RemoteMinaHumanTaskConnector;
public class TaskServerInstanceFactory {
- public static TaskServerInstance newTaskServerInstance(String name, GenericProvider provider){
+
+ public static TaskServerInstance newTaskServerInstance(String name, GenericProvider provider) {
return GenericProviderContainerFactoryHelper.doOnGenericProvider(provider, new TaskServerInstanceBuilder(name));
}
-
- private static class TaskServerInstanceBuilder implements GenericProviderContainerBuilder<TaskServerInstance>{
- private String name;
+ private static class TaskServerInstanceBuilder implements GenericProviderContainerBuilder<TaskServerInstance> {
- public TaskServerInstanceBuilder(String taskServerInstanceName) {
- this.name = taskServerInstanceName;
- }
-
- @Override
- public TaskServerInstance onHornetQProvider() {
+ private String name;
+
+ public TaskServerInstanceBuilder(String taskServerInstanceName) {
+ this.name = taskServerInstanceName;
+ }
+
+ public TaskServerInstance onHornetQProvider() {
throw new UnsupportedOperationException("We don't have a HortnetQ implementation for the Task Service. Yet!");
- }
+ }
- @Override
- public TaskServerInstance onLocalProvider() {
+ public TaskServerInstance onLocalProvider() {
throw new UnsupportedOperationException("We don't have a local implementation for the Task Service. Yet!");
- }
+ }
- @Override
- public TaskServerInstance onMinaProvider(MinaProvider provider) {
- return new TaskServerInstance(name,
+ public TaskServerInstance onMinaProvider(MinaProvider provider) {
+ return new TaskServerInstance(name,
new RemoteMinaHumanTaskConnector(name,
- ((MinaProvider)provider).getProviderAddress(),
- ((MinaProvider)provider).getProviderPort(),
- SystemEventListenerFactory.getSystemEventListener()));
- }
+ ((MinaProvider) provider).getProviderAddress(),
+ ((MinaProvider) provider).getProviderPort(),
+ SystemEventListenerFactory.getSystemEventListener()));
+ }
- @Override
- public TaskServerInstance onRioProvider(RioProvider rioProvider) {
+ public TaskServerInstance onRioProvider(RioProvider rioProvider) {
throw new UnsupportedOperationException("We don't have a Distributed Rio implementation for the Task Service. Yet!");
- }
-
+ }
}
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceImpl.java 2010-08-04 15:54:43 UTC (rev 34520)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-task/src/main/java/org/drools/grid/task/HumanTaskServiceImpl.java 2010-08-04 16:13:15 UTC (rev 34521)
@@ -424,12 +424,10 @@
client.write(msg, responseHandler);
}
- @Override
public String getId() throws ConnectorException, RemoteException {
return "Remote:Task:";
}
- @Override
public ServiceType getServiceType() throws ConnectorException, RemoteException {
return ServiceType.REMOTE;
}
Modified: labs/jbossrules/trunk/drools-grid/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-grid/pom.xml 2010-08-04 15:54:43 UTC (rev 34520)
+++ labs/jbossrules/trunk/drools-grid/pom.xml 2010-08-04 16:13:15 UTC (rev 34521)
@@ -18,6 +18,21 @@
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<modules>
<module>drools-grid-api</module>
More information about the jboss-svn-commits
mailing list