[jboss-svn-commits] JBL Code SVN: r31115 - in labs/jbossrules/trunk: drools-api/src/main/java/org/drools and 21 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Jan 17 23:30:40 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-01-17 23:30:38 -0500 (Sun, 17 Jan 2010)
New Revision: 31115
Added:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactoryService.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerService.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactoryService.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactoryService.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/logger/KnowledgeRuntimeLoggerFactoryService.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderFactoryServiceImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseFactoryServiceImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/SystemEventListenerServiceImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ResourceFactoryServiceImpl.java
Removed:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseProvider.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerProvider.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderProvider.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceProvider.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/logger/KnowledgeRuntimeLoggerProvider.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderProviderImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseProviderImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/SystemEventListenerProviderImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ResourceProviderImpl.java
Modified:
labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerFactory.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactory.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/logger/KnowledgeRuntimeLoggerFactory.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/persistence/jpa/JPAKnowledgeService.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ServiceRegistryImpl.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/vsm/ServiceManager.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/osgi/compiler/Activator.java
labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/KnowledgeRuntimeLoggerProviderImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/Activator.java
labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/osgi/decisiontables/Activator.java
labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java
labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/org/drools/process/workitem/email/EmailWorkItemHandlerTest.java
labs/jbossrules/trunk/drools-simulator/.classpath
labs/jbossrules/trunk/drools-simulator/pom.xml
labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/KnowledgeBaseProviderLocalClient.java
labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/KnowledgeBuilderProviderLocalClient.java
labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/ServiceManagerLocalClient.java
labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/remote/KnowledgeBaseProviderRemoteClient.java
labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/remote/KnowledgeBuilderProviderRemoteClient.java
labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/remote/ServiceManagerRemoteClient.java
labs/jbossrules/trunk/drools-vsm/src/test/java/org/drools/task/CommandBasedVSMWSHumanTaskHandlerTest.java
labs/jbossrules/trunk/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerHumanTaskMinaRemoteTest.java
labs/jbossrules/trunk/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerTestBase.java
Log:
JBRULES-2351 OSGi Ready
-Getting things compiling again.
Modified: labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF 2010-01-18 04:30:38 UTC (rev 31115)
@@ -2,7 +2,14 @@
Bundle-Activator: org.drools.osgi.api.Activator
Created-By: 1.5.0_16 (Sun Microsystems Inc.)
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bnd-LastModified: 1263462703475
+Import-Package: com.sun.tools.xjc;resolution:=optional;version="2.1",c
+ om.thoughtworks.xstream;resolution:=optional;version="1.3",javax.mana
+ gement;resolution:=optional,javax.xml.bind;resolution:=optional;versi
+ on="2.1",net.sf.jxls.reader;resolution:=optional,org.milyn;resolution
+ :=optional,org.osgi.framework;resolution:=optional;version="1.5",org.
+ osgi.util.tracker;resolution:=optional;version="1.4",org.quartz;resol
+ ution:=optional;version="1.6"
+Bnd-LastModified: 1263788844395
Export-Package: org.drools.logger;uses:="org.drools.event";version="5.
1.0.SNAPSHOT",org.drools.runtime;uses:="org.drools.command,org.drools
.time,org.drools.event,org.drools,org.drools.runtime.process,org.droo
@@ -17,10 +24,10 @@
ls.event,org.drools.runtime.process";version="5.1.0.SNAPSHOT",org.dro
ols.event.io;uses:="org.drools";version="5.1.0.SNAPSHOT",org.drools.c
onf;uses:="org.drools.runtime.rule";version="5.1.0.SNAPSHOT",org.droo
- ls.osgi.api;uses:="org.drools,org.drools.util,org.osgi.framework,org.
+ ls.osgi.api;uses:="org.osgi.framework,org.drools,org.drools.util,org.
osgi.util.tracker";version="5.1.0.SNAPSHOT",org.drools;uses:="org.dro
ols.io,org.drools.event.knowledgebase,org.drools.runtime,org.drools.d
- efinition,org.drools.definition.type,org.drools.definition.rule,org.d
+ efinition,org.drools.definition.rule,org.drools.definition.type,org.d
rools.definition.process,org.drools.conf,org.drools.util";version="5.
1.0.SNAPSHOT",org.drools.runtime.conf;uses:="org.drools.conf";version
="5.1.0.SNAPSHOT",org.drools.runtime.process;uses:="org.drools.runtim
@@ -46,13 +53,24 @@
lder;uses:="org.drools.io,org.drools.definition,org.drools,org.drools
.builder.conf,org.drools.util";version="5.1.0.SNAPSHOT",org.drools.io
;uses:="org.drools,org.drools.event.io,org.drools.util";version="5.1.
- 0.SNAPSHOT",org.drools.util;uses:="org.drools.builder,org.drools.io,o
- rg.drools";version="5.1.0.SNAPSHOT",org.drools.command.impl;uses:="or
+ 0.SNAPSHOT",org.drools.util;uses:="org.drools,org.drools.builder,org.
+ drools.io";version="5.1.0.SNAPSHOT",org.drools.command.impl;uses:="or
g.drools.command";version="5.1.0.SNAPSHOT",org.drools.definition.type
;version="5.1.0.SNAPSHOT",org.drools.definition.process;uses:="org.dr
ools.definition";version="5.1.0.SNAPSHOT",org.drools.agent;uses:="org
.drools.runtime,org.drools,org.drools.io";version="5.1.0.SNAPSHOT"
Bundle-Version: 5.1.0.SNAPSHOT
+Ignore-Package: org.drools.logger,org.drools.runtime,org.drools.task.s
+ ervice,org.drools.marshalling,org.drools.runtime.rule,org.drools.time
+ ,org.drools.command,org.drools.event.io,org.drools.event.process,org.
+ drools.management,org.drools.conf,org.drools.osgi.api,org.drools,org.
+ drools.runtime.conf,org.drools.runtime.process,org.drools.event.rule,
+ org.drools.builder.help,org.drools.vsm,org.drools.builder.conf,org.dr
+ ools.definition,org.drools.definition.rule,org.drools.runtime.pipelin
+ e,org.drools.runtime.help,org.drools.event,org.drools.event.knowledge
+ base,org.drools.persistence.jpa,org.drools.builder,org.drools.io,org.
+ drools.util,org.drools.command.impl,org.drools.definition.type,org.dr
+ ools.definition.process,org.drools.agent
Bundle-Name: Drools :: API
Bundle-Description: A rule production system
Bundle-DocURL: http://www.jboss.org/
@@ -61,3 +79,4 @@
Bundle-SymbolicName: org.drools.api
Tool: Bnd-0.0.357
DynamicImport-Package: *
+
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactory.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -2,7 +2,7 @@
import java.util.Properties;
-import org.drools.builder.KnowledgeBuilderProvider;
+import org.drools.builder.KnowledgeBuilderFactoryService;
import org.drools.runtime.Environment;
import org.drools.runtime.KnowledgeSessionConfiguration;
import org.drools.util.ServiceRegistryImpl;
@@ -36,7 +36,7 @@
* @see org.drools.KnowledgeBase
*/
public class KnowledgeBaseFactory {
- private static KnowledgeBaseProvider provider;
+ private static KnowledgeBaseFactoryService provider;
/**
* Create a new KnowledgeBase using the default KnowledgeBaseConfiguration
@@ -132,18 +132,18 @@
return getKnowledgeBaseProvider().newEnvironment();
}
-// private static synchronized KnowledgeBaseProvider getKnowledgeBaseProvider() {
+// private static synchronized KnowledgeBaseFactoryService getKnowledgeBaseProvider() {
// if ( provider == null ) {
-// provider = newProviderFor( KnowledgeBaseProvider.class );
+// provider = newProviderFor( KnowledgeBaseFactoryService.class );
// }
// return provider;
// }
- private static synchronized void setKnowledgeBaseProvider(KnowledgeBaseProvider provider) {
+ private static synchronized void setKnowledgeBaseProvider(KnowledgeBaseFactoryService provider) {
KnowledgeBaseFactory.provider = provider;
}
- private static synchronized KnowledgeBaseProvider getKnowledgeBaseProvider() {
+ private static synchronized KnowledgeBaseFactoryService getKnowledgeBaseProvider() {
if ( provider == null ) {
loadProvider();
}
@@ -152,6 +152,6 @@
@SuppressWarnings("unchecked")
private static void loadProvider() {
- setKnowledgeBaseProvider( ServiceRegistryImpl.getInstance().get( KnowledgeBaseProvider.class ) );
+ setKnowledgeBaseProvider( ServiceRegistryImpl.getInstance().get( KnowledgeBaseFactoryService.class ) );
}
}
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactoryService.java (from rev 31079, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseProvider.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactoryService.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseFactoryService.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -0,0 +1,114 @@
+package org.drools;
+
+import java.util.Properties;
+
+import org.drools.runtime.Environment;
+import org.drools.runtime.KnowledgeSessionConfiguration;
+
+/**
+ * KnowledgeBaseFactoryService is used by the KnowledgeBaseFacotry to "provide" it's concrete implementation.
+ *
+ * This class is not considered stable and may change, the user is protected from this change by using
+ * the KnowledgeBaseFactory api, which is considered stable.
+ *
+ */
+public interface KnowledgeBaseFactoryService extends Service {
+
+ /**
+ * Instantiate and return a new KnowledgeBaseConfiguration
+ *
+ * @return
+ * the KnowledgeBaseConfiguration
+ */
+ public KnowledgeBaseConfiguration newKnowledgeBaseConfiguration();
+
+ /**
+ * Instantiate and return a new KnowledgeBaseConfiguration
+ *
+ * @param properties
+ * Properties file to process, can be null;
+ * @param classLoader
+ * Provided ClassLoader, can be null and then ClassLoader defaults to Thread.currentThread().getContextClassLoader()
+ * @return
+ * The KnowledgeBaseConfiguration
+ */
+ public KnowledgeBaseConfiguration newKnowledgeBaseConfiguration(Properties properties,
+ ClassLoader classLoader);
+
+ /**
+ * Instantiate and return a new KnowledgeSessionConfiguration
+ *
+ * @return
+ * the KnowledgeSessionConfiguration
+ */
+ public KnowledgeSessionConfiguration newKnowledgeSessionConfiguration();
+
+ /**
+ * Instantiate and return a new KnowledgeSessionConfiguration
+ *
+ * @param properties
+ * Properties file to process, can be null;
+ * @param classLoader
+ * Provided ClassLoader, can be null and then ClassLoader defaults to Thread.currentThread().getContextClassLoader()
+ * @return
+ * The KnowledgeSessionConfiguration
+ */
+ public KnowledgeSessionConfiguration newKnowledgeSessionConfiguration(Properties properties);
+
+ /**
+ * Instantiate and return a KnowledgeBase using a default KnowledgeBaseConfiguration
+ *
+ * @return
+ * The KnowledgeBase
+ */
+ KnowledgeBase newKnowledgeBase();
+
+ /**
+ * Instantiate and return a KnowledgeBase using a default KnowledgeBaseConfiguration
+ * and the given KnowledgeBase ID.
+ *
+ * @param kbaseId
+ * A string Identifier for the knowledge base. Specially useful when enabling
+ * JMX monitoring and management, as that ID will be used to compose the
+ * JMX ObjectName for all related MBeans. The application must ensure all kbase
+ * IDs are unique.
+ * @return
+ * The KnowledgeBase
+ */
+ KnowledgeBase newKnowledgeBase( String kbaseId );
+
+ /**
+ * Instantiate and return a KnowledgeBase using the given KnowledgeBaseConfiguration
+ *
+ * @param conf
+ * The KnowledgeBaseConfiguration to be used
+ * @return
+ * The KnowledgeBase
+ */
+ KnowledgeBase newKnowledgeBase(KnowledgeBaseConfiguration conf);
+
+ /**
+ * Instantiate and return a KnowledgeBase using the given KnowledgeBaseConfiguration and
+ * the given KnowledgeBase ID.
+ *
+ * @param kbaseId
+ * A string Identifier for the knowledge base. Specially useful when enabling
+ * JMX monitoring and management, as that ID will be used to compose the
+ * JMX ObjectName for all related MBeans. The application must ensure all kbase
+ * IDs are unique.
+ * @param conf
+ * The KnowledgeBaseConfiguration to be used
+ * @return
+ * The KnowledgeBase
+ */
+ KnowledgeBase newKnowledgeBase(String kbaseId, KnowledgeBaseConfiguration conf);
+
+ /**
+ * Instantiate and return an Environment
+ *
+ * @return
+ * The Environment
+ */
+ Environment newEnvironment();
+
+}
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseProvider.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBaseProvider.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -1,114 +0,0 @@
-package org.drools;
-
-import java.util.Properties;
-
-import org.drools.runtime.Environment;
-import org.drools.runtime.KnowledgeSessionConfiguration;
-
-/**
- * KnowledgeBaseProvider is used by the KnowledgeBaseFacotry to "provide" it's concrete implementation.
- *
- * This class is not considered stable and may change, the user is protected from this change by using
- * the KnowledgeBaseFactory api, which is considered stable.
- *
- */
-public interface KnowledgeBaseProvider extends Service {
-
- /**
- * Instantiate and return a new KnowledgeBaseConfiguration
- *
- * @return
- * the KnowledgeBaseConfiguration
- */
- public KnowledgeBaseConfiguration newKnowledgeBaseConfiguration();
-
- /**
- * Instantiate and return a new KnowledgeBaseConfiguration
- *
- * @param properties
- * Properties file to process, can be null;
- * @param classLoader
- * Provided ClassLoader, can be null and then ClassLoader defaults to Thread.currentThread().getContextClassLoader()
- * @return
- * The KnowledgeBaseConfiguration
- */
- public KnowledgeBaseConfiguration newKnowledgeBaseConfiguration(Properties properties,
- ClassLoader classLoader);
-
- /**
- * Instantiate and return a new KnowledgeSessionConfiguration
- *
- * @return
- * the KnowledgeSessionConfiguration
- */
- public KnowledgeSessionConfiguration newKnowledgeSessionConfiguration();
-
- /**
- * Instantiate and return a new KnowledgeSessionConfiguration
- *
- * @param properties
- * Properties file to process, can be null;
- * @param classLoader
- * Provided ClassLoader, can be null and then ClassLoader defaults to Thread.currentThread().getContextClassLoader()
- * @return
- * The KnowledgeSessionConfiguration
- */
- public KnowledgeSessionConfiguration newKnowledgeSessionConfiguration(Properties properties);
-
- /**
- * Instantiate and return a KnowledgeBase using a default KnowledgeBaseConfiguration
- *
- * @return
- * The KnowledgeBase
- */
- KnowledgeBase newKnowledgeBase();
-
- /**
- * Instantiate and return a KnowledgeBase using a default KnowledgeBaseConfiguration
- * and the given KnowledgeBase ID.
- *
- * @param kbaseId
- * A string Identifier for the knowledge base. Specially useful when enabling
- * JMX monitoring and management, as that ID will be used to compose the
- * JMX ObjectName for all related MBeans. The application must ensure all kbase
- * IDs are unique.
- * @return
- * The KnowledgeBase
- */
- KnowledgeBase newKnowledgeBase( String kbaseId );
-
- /**
- * Instantiate and return a KnowledgeBase using the given KnowledgeBaseConfiguration
- *
- * @param conf
- * The KnowledgeBaseConfiguration to be used
- * @return
- * The KnowledgeBase
- */
- KnowledgeBase newKnowledgeBase(KnowledgeBaseConfiguration conf);
-
- /**
- * Instantiate and return a KnowledgeBase using the given KnowledgeBaseConfiguration and
- * the given KnowledgeBase ID.
- *
- * @param kbaseId
- * A string Identifier for the knowledge base. Specially useful when enabling
- * JMX monitoring and management, as that ID will be used to compose the
- * JMX ObjectName for all related MBeans. The application must ensure all kbase
- * IDs are unique.
- * @param conf
- * The KnowledgeBaseConfiguration to be used
- * @return
- * The KnowledgeBase
- */
- KnowledgeBase newKnowledgeBase(String kbaseId, KnowledgeBaseConfiguration conf);
-
- /**
- * Instantiate and return an Environment
- *
- * @return
- * The Environment
- */
- Environment newEnvironment();
-
-}
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerFactory.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerFactory.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -10,7 +10,7 @@
*
*/
public class SystemEventListenerFactory {
- private static SystemEventListenerProvider provider;
+ private static SystemEventListenerService provider;
/**
* Set the SystemEventListener
@@ -29,11 +29,11 @@
return getSystemEventListenerProvider().getSystemEventListener();
}
- private static synchronized void setSystemEventListenerProvider(SystemEventListenerProvider provider) {
+ private static synchronized void setSystemEventListenerProvider(SystemEventListenerService provider) {
SystemEventListenerFactory.provider = provider;
}
- private static synchronized SystemEventListenerProvider getSystemEventListenerProvider() {
+ private static synchronized SystemEventListenerService getSystemEventListenerProvider() {
if ( provider == null ) {
loadProvider();
}
@@ -41,6 +41,6 @@
}
private static void loadProvider() {
- setSystemEventListenerProvider( ServiceRegistryImpl.getInstance().get( SystemEventListenerProvider.class ) );
+ setSystemEventListenerProvider( ServiceRegistryImpl.getInstance().get( SystemEventListenerService.class ) );
}
}
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerProvider.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerProvider.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -1,25 +0,0 @@
-package org.drools;
-
-/**
- * KnowledgeBaseProvider is used by the KnowledgeBaseFacotry to "provide" it's concrete implementation.
- *
- * This class is not considered stable and may change, the user is protected from this change by using
- * the KnowledgeBaseFactory api, which is considered stable.
- *
- */
-public interface SystemEventListenerProvider {
-
- /**
- * Set the SystemEventListener
- *
- * @param listener
- */
- void setSystemEventListener(SystemEventListener listener);
-
- /**
- * Get the SystemEventListener
- * @return
- */
- SystemEventListener getSystemEventListener();
-
-}
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerService.java (from rev 31114, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerProvider.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerService.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/SystemEventListenerService.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -0,0 +1,25 @@
+package org.drools;
+
+/**
+ * KnowledgeBaseFactoryService is used by the KnowledgeBaseFacotry to "provide" it's concrete implementation.
+ *
+ * This class is not considered stable and may change, the user is protected from this change by using
+ * the KnowledgeBaseFactory api, which is considered stable.
+ *
+ */
+public interface SystemEventListenerService {
+
+ /**
+ * Set the SystemEventListener
+ *
+ * @param listener
+ */
+ void setSystemEventListener(SystemEventListener listener);
+
+ /**
+ * Get the SystemEventListener
+ * @return
+ */
+ SystemEventListener getSystemEventListener();
+
+}
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -18,7 +18,7 @@
*
*/
public class KnowledgeBuilderFactory {
- private static volatile KnowledgeBuilderProvider provider;
+ private static volatile KnowledgeBuilderFactoryService provider;
/**
* Create and return a new KnowledgeBuilder, using the default KnowledgeBuilderConfigurations
@@ -92,11 +92,11 @@
return getKnowledgeBuilderProvider().newDecisionTableConfiguration();
}
- private static synchronized void setKnowledgeBuilderProvider(KnowledgeBuilderProvider provider) {
+ private static synchronized void setKnowledgeBuilderFactoryService(KnowledgeBuilderFactoryService provider) {
KnowledgeBuilderFactory.provider = provider;
}
- private static synchronized KnowledgeBuilderProvider getKnowledgeBuilderProvider() {
+ private static synchronized KnowledgeBuilderFactoryService getKnowledgeBuilderProvider() {
if ( provider == null ) {
loadProvider();
}
@@ -104,6 +104,6 @@
}
private static void loadProvider() {
- setKnowledgeBuilderProvider( ServiceRegistryImpl.getInstance().get( KnowledgeBuilderProvider.class ) );
+ setKnowledgeBuilderFactoryService( ServiceRegistryImpl.getInstance().get( KnowledgeBuilderFactoryService.class ) );
}
}
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactoryService.java (from rev 31079, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderProvider.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactoryService.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactoryService.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -0,0 +1,66 @@
+package org.drools.builder;
+
+import java.util.Properties;
+
+import org.drools.KnowledgeBase;
+import org.drools.Service;
+
+/**
+ * KnowledgeBuilderFactoryService is used by the KnowledgeBuilderFacotry to "provide" it's concrete implementation.
+ *
+ * This class is not considered stable and may change, the user is protected from this change by using
+ * the Factory api, which is considered stable.
+ *
+ */
+public interface KnowledgeBuilderFactoryService extends Service {
+ /**
+ * Instantiate and return a new KnowledgeBuilderConfiguration
+ * @return
+ * the KnowledgeBuilderConfiguration
+ */
+ public KnowledgeBuilderConfiguration newKnowledgeBuilderConfiguration();
+
+ /**
+ * Instantiate and return a new KnowledgeBuilderConfiguration
+ *
+ * @param properties
+ * Properties file to process, can be null;
+ * @param classLoader
+ * Provided ClassLoader, can be null and then ClassLoader defaults to Thread.currentThread().getContextClassLoader()
+ * @return
+ */
+ public KnowledgeBuilderConfiguration newKnowledgeBuilderConfiguration(Properties properties,
+ ClassLoader classLoader);
+
+ /**
+ * DecisionTables need to take a configuration of the InputType and XLS based
+ * ones can also take a Worksheet name.
+ *
+ * @return
+ * The DecisionTableConfiguration
+ */
+ public DecisionTableConfiguration newDecisionTableConfiguration();
+
+ /**
+ * Instantiate and return a new KnowledgeBuilder using the default KnowledgeBuilderConfiguration
+ *
+ * @return
+ * The KnowledgeBuilder
+ */
+ KnowledgeBuilder newKnowledgeBuilder();
+
+ /**
+ * Instantiate and return a new KnowledgeBuilder using the given KnowledgeBuilderConfiguration
+ *
+ * @param conf
+ * The KnowledgeBuilderConfiguration
+ * @return
+ * The KnowledgeBuilder
+ */
+ KnowledgeBuilder newKnowledgeBuilder(KnowledgeBuilderConfiguration conf);
+
+ public KnowledgeBuilder newKnowledgeBuilder(KnowledgeBase kbase);
+
+ public KnowledgeBuilder newKnowledgeBuilder(KnowledgeBase kbase,
+ KnowledgeBuilderConfiguration conf);
+}
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderProvider.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderProvider.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -1,66 +0,0 @@
-package org.drools.builder;
-
-import java.util.Properties;
-
-import org.drools.KnowledgeBase;
-import org.drools.Service;
-
-/**
- * KnowledgeBuilderProvider is used by the KnowledgeBuilderFacotry to "provide" it's concrete implementation.
- *
- * This class is not considered stable and may change, the user is protected from this change by using
- * the Factory api, which is considered stable.
- *
- */
-public interface KnowledgeBuilderProvider extends Service {
- /**
- * Instantiate and return a new KnowledgeBuilderConfiguration
- * @return
- * the KnowledgeBuilderConfiguration
- */
- public KnowledgeBuilderConfiguration newKnowledgeBuilderConfiguration();
-
- /**
- * Instantiate and return a new KnowledgeBuilderConfiguration
- *
- * @param properties
- * Properties file to process, can be null;
- * @param classLoader
- * Provided ClassLoader, can be null and then ClassLoader defaults to Thread.currentThread().getContextClassLoader()
- * @return
- */
- public KnowledgeBuilderConfiguration newKnowledgeBuilderConfiguration(Properties properties,
- ClassLoader classLoader);
-
- /**
- * DecisionTables need to take a configuration of the InputType and XLS based
- * ones can also take a Worksheet name.
- *
- * @return
- * The DecisionTableConfiguration
- */
- public DecisionTableConfiguration newDecisionTableConfiguration();
-
- /**
- * Instantiate and return a new KnowledgeBuilder using the default KnowledgeBuilderConfiguration
- *
- * @return
- * The KnowledgeBuilder
- */
- KnowledgeBuilder newKnowledgeBuilder();
-
- /**
- * Instantiate and return a new KnowledgeBuilder using the given KnowledgeBuilderConfiguration
- *
- * @param conf
- * The KnowledgeBuilderConfiguration
- * @return
- * The KnowledgeBuilder
- */
- KnowledgeBuilder newKnowledgeBuilder(KnowledgeBuilderConfiguration conf);
-
- public KnowledgeBuilder newKnowledgeBuilder(KnowledgeBase kbase);
-
- public KnowledgeBuilder newKnowledgeBuilder(KnowledgeBase kbase,
- KnowledgeBuilderConfiguration conf);
-}
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactory.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactory.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -5,7 +5,7 @@
import java.io.Reader;
import java.net.URL;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
import org.drools.util.ServiceRegistryImpl;
/**
@@ -27,7 +27,7 @@
*
*/
public class ResourceFactory {
- private static ResourceProvider resourceProvider;
+ private static ResourceFactoryService resourceFactoryService;
/**
* A Service that can be started, to provide notifications of changed Resources.
@@ -97,19 +97,19 @@
classLoader );
}
- private static synchronized void setResourceProvider(ResourceProvider provider) {
- ResourceFactory.resourceProvider = provider;
+ private static synchronized void setResourceProvider(ResourceFactoryService provider) {
+ ResourceFactory.resourceFactoryService = provider;
}
- private static synchronized ResourceProvider getResourceProvider() {
- if ( resourceProvider == null ) {
+ private static synchronized ResourceFactoryService getResourceProvider() {
+ if ( resourceFactoryService == null ) {
loadProvider();
}
- return resourceProvider;
+ return resourceFactoryService;
}
private static void loadProvider() {
- setResourceProvider( ServiceRegistryImpl.getInstance().get( ResourceProvider.class ) );
+ setResourceProvider( ServiceRegistryImpl.getInstance().get( ResourceFactoryService.class ) );
}
}
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactoryService.java (from rev 31079, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceProvider.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactoryService.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceFactoryService.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -0,0 +1,46 @@
+package org.drools.io;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.Reader;
+import java.net.URL;
+
+import org.drools.Service;
+
+/**
+ * ResourceFactoryService is used by the ResourceFactory to "provide" it's concrete implementation.
+ *
+ * This class is not considered stable and may change, the user is protected from this change by using
+ * the Factory api, which is considered stable.
+ *
+ */
+public interface ResourceFactoryService extends Service {
+ ResourceChangeNotifier getResourceChangeNotifierService();
+
+ ResourceChangeScanner getResourceChangeScannerService();
+
+ Resource newUrlResource(URL url);
+
+ Resource newUrlResource(String path);
+
+ Resource newFileSystemResource(File file);
+
+ Resource newFileSystemResource(String fileName);
+
+ Resource newByteArrayResource(byte[] bytes);
+
+ Resource newInputStreamResource(InputStream stream);
+
+ Resource newReaderResource(Reader reader);
+
+ Resource newReaderResource(Reader reader,
+ String encoding);
+
+ Resource newClassPathResource(String path);
+
+ Resource newClassPathResource(String path,
+ ClassLoader classLoader);
+
+ Resource newClassPathResource(String path,
+ Class clazz);
+}
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceProvider.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/io/ResourceProvider.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -1,46 +0,0 @@
-package org.drools.io;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.Reader;
-import java.net.URL;
-
-import org.drools.Service;
-
-/**
- * ResourceProvider is used by the ResourceFactory to "provide" it's concrete implementation.
- *
- * This class is not considered stable and may change, the user is protected from this change by using
- * the Factory api, which is considered stable.
- *
- */
-public interface ResourceProvider extends Service {
- ResourceChangeNotifier getResourceChangeNotifierService();
-
- ResourceChangeScanner getResourceChangeScannerService();
-
- Resource newUrlResource(URL url);
-
- Resource newUrlResource(String path);
-
- Resource newFileSystemResource(File file);
-
- Resource newFileSystemResource(String fileName);
-
- Resource newByteArrayResource(byte[] bytes);
-
- Resource newInputStreamResource(InputStream stream);
-
- Resource newReaderResource(Reader reader);
-
- Resource newReaderResource(Reader reader,
- String encoding);
-
- Resource newClassPathResource(String path);
-
- Resource newClassPathResource(String path,
- ClassLoader classLoader);
-
- Resource newClassPathResource(String path,
- Class clazz);
-}
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/logger/KnowledgeRuntimeLoggerFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/logger/KnowledgeRuntimeLoggerFactory.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/logger/KnowledgeRuntimeLoggerFactory.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -21,7 +21,7 @@
*/
public class KnowledgeRuntimeLoggerFactory {
- private static KnowledgeRuntimeLoggerProvider knowledgeRuntimeLoggerProvider;
+ private static KnowledgeRuntimeLoggerFactoryService knowledgeRuntimeLoggerFactoryService;
/**
* Creates a file logger in the current thread. The file is in XML format, suitable for interpretation by Eclipse's Drools Audit View
@@ -66,21 +66,21 @@
return getKnowledgeRuntimeLoggerProvider().newConsoleLogger( session );
}
- private static synchronized void setKnowledgeRuntimeLoggerProvider(KnowledgeRuntimeLoggerProvider provider) {
- KnowledgeRuntimeLoggerFactory.knowledgeRuntimeLoggerProvider = provider;
+ private static synchronized void setKnowledgeRuntimeLoggerProvider(KnowledgeRuntimeLoggerFactoryService provider) {
+ KnowledgeRuntimeLoggerFactory.knowledgeRuntimeLoggerFactoryService = provider;
}
- private static synchronized KnowledgeRuntimeLoggerProvider getKnowledgeRuntimeLoggerProvider() {
- if ( knowledgeRuntimeLoggerProvider == null ) {
+ private static synchronized KnowledgeRuntimeLoggerFactoryService getKnowledgeRuntimeLoggerProvider() {
+ if ( knowledgeRuntimeLoggerFactoryService == null ) {
loadProvider();
}
- return knowledgeRuntimeLoggerProvider;
+ return knowledgeRuntimeLoggerFactoryService;
}
@SuppressWarnings("unchecked")
private static void loadProvider() {
try {
- Class<KnowledgeRuntimeLoggerProvider> cls = (Class<KnowledgeRuntimeLoggerProvider>) Class.forName( "org.drools.audit.KnowledgeRuntimeLoggerProviderImpl" );
+ Class<KnowledgeRuntimeLoggerFactoryService> cls = (Class<KnowledgeRuntimeLoggerFactoryService>) Class.forName( "org.drools.audit.KnowledgeRuntimeLoggerProviderImpl" );
setKnowledgeRuntimeLoggerProvider( cls.newInstance() );
} catch ( Exception e ) {
throw new RuntimeException( "Provider org.drools.audit.KnowledgeRuntimeLoggerProviderImpl could not be set.",
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/logger/KnowledgeRuntimeLoggerFactoryService.java (from rev 31078, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/logger/KnowledgeRuntimeLoggerProvider.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/logger/KnowledgeRuntimeLoggerFactoryService.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/logger/KnowledgeRuntimeLoggerFactoryService.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -0,0 +1,16 @@
+package org.drools.logger;
+
+import org.drools.event.KnowledgeRuntimeEventManager;
+
+public interface KnowledgeRuntimeLoggerFactoryService {
+
+ KnowledgeRuntimeLogger newFileLogger(KnowledgeRuntimeEventManager session,
+ String fileName);
+
+ KnowledgeRuntimeLogger newThreadedFileLogger(KnowledgeRuntimeEventManager session,
+ String fileName,
+ int interval);
+
+ KnowledgeRuntimeLogger newConsoleLogger(KnowledgeRuntimeEventManager session);
+
+}
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/logger/KnowledgeRuntimeLoggerProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/logger/KnowledgeRuntimeLoggerProvider.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/logger/KnowledgeRuntimeLoggerProvider.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -1,16 +0,0 @@
-package org.drools.logger;
-
-import org.drools.event.KnowledgeRuntimeEventManager;
-
-public interface KnowledgeRuntimeLoggerProvider {
-
- KnowledgeRuntimeLogger newFileLogger(KnowledgeRuntimeEventManager session,
- String fileName);
-
- KnowledgeRuntimeLogger newThreadedFileLogger(KnowledgeRuntimeEventManager session,
- String fileName,
- int interval);
-
- KnowledgeRuntimeLogger newConsoleLogger(KnowledgeRuntimeEventManager session);
-
-}
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/persistence/jpa/JPAKnowledgeService.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/persistence/jpa/JPAKnowledgeService.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/persistence/jpa/JPAKnowledgeService.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -1,7 +1,7 @@
package org.drools.persistence.jpa;
import org.drools.KnowledgeBase;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
import org.drools.runtime.Environment;
import org.drools.runtime.KnowledgeSessionConfiguration;
import org.drools.runtime.StatefulKnowledgeSession;
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ServiceRegistryImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ServiceRegistryImpl.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/util/ServiceRegistryImpl.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -20,10 +20,12 @@
import java.util.Map;
import java.util.concurrent.Callable;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
import org.drools.Service;
-import org.drools.builder.KnowledgeBuilderProvider;
-import org.drools.io.ResourceProvider;
+import org.drools.SystemEventListener;
+import org.drools.SystemEventListenerService;
+import org.drools.builder.KnowledgeBuilderFactoryService;
+import org.drools.io.ResourceFactoryService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
@@ -155,14 +157,21 @@
}
private void init() {
- addDefault( KnowledgeBuilderProvider.class,
- "org.drools.builder.impl.KnowledgeBuilderProviderImpl" );
+ addDefault( KnowledgeBuilderFactoryService.class,
+ "org.drools.builder.impl.KnowledgeBuilderFactoryServiceImpl" );
- addDefault( KnowledgeBaseProvider.class,
- "org.drools.impl.KnowledgeBaseProviderImpl" );
+ addDefault( KnowledgeBaseFactoryService.class,
+ "org.drools.impl.KnowledgeBaseFactoryServiceImpl" );
- addDefault( ResourceProvider.class,
- "org.drools.io.impl.ResourceProviderImpl" );
+ addDefault( ResourceFactoryService.class,
+ "org.drools.io.impl.ResourceFactoryServiceImpl" );
+
+ addDefault( SystemEventListenerService.class,
+ "org.drools.impl.SystemEventListenerServiceImpl" );
+
+
+// addDefault( SystemE.class,
+// "org.drools.io.impl.ResourceFactoryServiceImpl" );
}
private void addDefault(Class cls,
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/vsm/ServiceManager.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/vsm/ServiceManager.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/vsm/ServiceManager.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -2,17 +2,17 @@
import java.util.Collection;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
import org.drools.agent.KnowledgeAgentProvider;
-import org.drools.builder.KnowledgeBuilderProvider;
+import org.drools.builder.KnowledgeBuilderFactoryService;
import org.drools.persistence.jpa.JPAKnowledgeServiceProvider;
import org.drools.runtime.CommandExecutor;
import org.drools.runtime.Environment;
public interface ServiceManager extends CommandExecutor {
- KnowledgeBuilderProvider getKnowledgeBuilderFactory();
+ KnowledgeBuilderFactoryService getKnowledgeBuilderFactoryService();
- KnowledgeBaseProvider getKnowledgeBaseFactory();
+ KnowledgeBaseFactoryService getKnowledgeBaseFactoryService();
KnowledgeAgentProvider getKnowledgeAgentFactory();
Copied: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderFactoryServiceImpl.java (from rev 31078, labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderProviderImpl.java)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderFactoryServiceImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderFactoryServiceImpl.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -0,0 +1,45 @@
+package org.drools.builder.impl;
+
+import java.util.Properties;
+
+import org.drools.KnowledgeBase;
+import org.drools.builder.DecisionTableConfiguration;
+import org.drools.builder.KnowledgeBuilder;
+import org.drools.builder.KnowledgeBuilderConfiguration;
+import org.drools.builder.KnowledgeBuilderFactoryService;
+import org.drools.builder.conf.impl.DecisionTableConfigurationImpl;
+import org.drools.compiler.PackageBuilder;
+import org.drools.compiler.PackageBuilderConfiguration;
+import org.drools.impl.KnowledgeBaseImpl;
+
+public class KnowledgeBuilderFactoryServiceImpl implements KnowledgeBuilderFactoryService {
+
+ public KnowledgeBuilderConfiguration newKnowledgeBuilderConfiguration() {
+ return new PackageBuilderConfiguration();
+ }
+
+ public KnowledgeBuilderConfiguration newKnowledgeBuilderConfiguration(Properties properties, ClassLoader classLoader) {
+ return new PackageBuilderConfiguration(classLoader, properties);
+ }
+
+ public DecisionTableConfiguration newDecisionTableConfiguration() {
+ return new DecisionTableConfigurationImpl();
+ }
+
+ public KnowledgeBuilder newKnowledgeBuilder() {
+ return new KnowledgeBuilderImpl( new PackageBuilder() );
+ }
+
+ public KnowledgeBuilder newKnowledgeBuilder(KnowledgeBuilderConfiguration conf) {
+ return new KnowledgeBuilderImpl( new PackageBuilder( (PackageBuilderConfiguration) conf ) );
+ }
+
+ public KnowledgeBuilder newKnowledgeBuilder(KnowledgeBase kbase) {
+ return new KnowledgeBuilderImpl( new PackageBuilder( ((KnowledgeBaseImpl) kbase).ruleBase ) );
+ }
+
+ public KnowledgeBuilder newKnowledgeBuilder(KnowledgeBase kbase,
+ KnowledgeBuilderConfiguration conf) {
+ return new KnowledgeBuilderImpl( new PackageBuilder( ((KnowledgeBaseImpl) kbase).ruleBase, (PackageBuilderConfiguration) conf ) );
+ }
+}
Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderProviderImpl.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderProviderImpl.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -1,45 +0,0 @@
-package org.drools.builder.impl;
-
-import java.util.Properties;
-
-import org.drools.KnowledgeBase;
-import org.drools.builder.DecisionTableConfiguration;
-import org.drools.builder.KnowledgeBuilder;
-import org.drools.builder.KnowledgeBuilderConfiguration;
-import org.drools.builder.KnowledgeBuilderProvider;
-import org.drools.builder.conf.impl.DecisionTableConfigurationImpl;
-import org.drools.compiler.PackageBuilder;
-import org.drools.compiler.PackageBuilderConfiguration;
-import org.drools.impl.KnowledgeBaseImpl;
-
-public class KnowledgeBuilderProviderImpl implements KnowledgeBuilderProvider {
-
- public KnowledgeBuilderConfiguration newKnowledgeBuilderConfiguration() {
- return new PackageBuilderConfiguration();
- }
-
- public KnowledgeBuilderConfiguration newKnowledgeBuilderConfiguration(Properties properties, ClassLoader classLoader) {
- return new PackageBuilderConfiguration(classLoader, properties);
- }
-
- public DecisionTableConfiguration newDecisionTableConfiguration() {
- return new DecisionTableConfigurationImpl();
- }
-
- public KnowledgeBuilder newKnowledgeBuilder() {
- return new KnowledgeBuilderImpl( new PackageBuilder() );
- }
-
- public KnowledgeBuilder newKnowledgeBuilder(KnowledgeBuilderConfiguration conf) {
- return new KnowledgeBuilderImpl( new PackageBuilder( (PackageBuilderConfiguration) conf ) );
- }
-
- public KnowledgeBuilder newKnowledgeBuilder(KnowledgeBase kbase) {
- return new KnowledgeBuilderImpl( new PackageBuilder( ((KnowledgeBaseImpl) kbase).ruleBase ) );
- }
-
- public KnowledgeBuilder newKnowledgeBuilder(KnowledgeBase kbase,
- KnowledgeBuilderConfiguration conf) {
- return new KnowledgeBuilderImpl( new PackageBuilder( ((KnowledgeBaseImpl) kbase).ruleBase, (PackageBuilderConfiguration) conf ) );
- }
-}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/osgi/compiler/Activator.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/osgi/compiler/Activator.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/osgi/compiler/Activator.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -4,8 +4,8 @@
import java.util.Hashtable;
import org.drools.Service;
-import org.drools.builder.KnowledgeBuilderProvider;
-import org.drools.builder.impl.KnowledgeBuilderProviderImpl;
+import org.drools.builder.KnowledgeBuilderFactoryService;
+import org.drools.builder.impl.KnowledgeBuilderFactoryServiceImpl;
import org.drools.compiler.DecisionTableProvider;
import org.drools.osgi.api.Activator.BundleContextInstantiator;
import org.drools.util.ServiceRegistryImpl;
@@ -25,8 +25,8 @@
public void start(BundleContext bc) throws Exception {
System.out.println( "registering compiler services" );
- this.kbuilderReg = bc.registerService( new String[]{KnowledgeBuilderProvider.class.getName(), Service.class.getName()},
- new KnowledgeBuilderProviderImpl(),
+ this.kbuilderReg = bc.registerService( new String[]{KnowledgeBuilderFactoryService.class.getName(), Service.class.getName()},
+ new KnowledgeBuilderFactoryServiceImpl(),
new Hashtable() );
this.dtableTracker = new ServiceTracker( bc,
Modified: labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF 2010-01-18 04:30:38 UTC (rev 31115)
@@ -12,7 +12,7 @@
ler,org.mvel2.debug,org.mvel2.integration,org.mvel2.integration.impl,
org.mvel2.optimizers,org.mvel2.templates,org.mvel2.util,org.osgi.fram
ework;version="1.5",org.w3c.dom,org.xml.sax,org.xml.sax.helpers
-Bnd-LastModified: 1263462717947
+Bnd-LastModified: 1263788852558
Export-Package: org.drools.process.instance.context.swimlane;uses:="or
g.drools.process.core.context.swimlane,org.drools.process.core,org.dr
ools.process.instance.context";version="5.1.0.SNAPSHOT",org.drools.pr
@@ -20,7 +20,7 @@
lidation;uses:="org.mvel2.compiler,org.drools.process.core.timer,org.
drools.process.core.validation,org.drools.process.core.datatype,org.d
rools.workflow.core.node,org.drools.process.core.context.variable,org
- .drools.time,org.drools.workflow.core.impl,org.mvel2,org.drools.proce
+ .drools.workflow.core.impl,org.mvel2,org.drools.time,org.drools.proce
ss.core.validation.impl,org.drools,org.drools.ruleflow.core,org.drool
s.process.core,org.drools.workflow.core";version="5.1.0.SNAPSHOT",org
.drools.ruleflow.instance;uses:="org.drools.workflow.instance.impl,or
@@ -39,8 +39,8 @@
uses:="org.drools,org.drools.impl,org.osgi.framework,org.drools.io.im
pl";version="5.1.0.SNAPSHOT",org.drools.ruleflow.core.factory;uses:="
org.drools.workflow.core.impl,org.drools.ruleflow.core,org.drools.wor
- kflow.core.node,org.drools.workflow.core,org.drools.process.core,org.
- drools.process.core.datatype,org.drools.process.core.context.exceptio
+ kflow.core.node,org.drools.workflow.core,org.drools.process.core.data
+ type,org.drools.process.core,org.drools.process.core.context.exceptio
n,org.drools.process.core.context.variable,org.drools.process.core.ev
ent,org.drools.process.core.timer,org.drools.process.core.impl";versi
on="5.1.0.SNAPSHOT",org.drools.marshalling.impl;uses:="org.drools.wor
@@ -48,7 +48,7 @@
drools.process.instance,org.drools.workflow.instance.node,org.drools.
workflow.instance,org.drools.process.core,org.drools.process.instance
.context.variable,org.drools.common,org.drools.util,org.drools.impl,o
- rg.drools.concurrent,org.drools,org.drools.spi,org.drools.process.ins
+ rg.drools,org.drools.concurrent,org.drools.spi,org.drools.process.ins
tance.timer,org.drools.base,org.drools.rule,org.drools.process.instan
ce.impl,org.drools.process.instance.event,org.drools.ruleflow.instanc
e";version="5.1.0.SNAPSHOT",org.drools.time;uses:="org.drools.rule,or
@@ -74,8 +74,8 @@
tance.context,org.drools.common";version="5.1.0.SNAPSHOT",org.drools.
audit;uses:="org.drools.event,org.drools,org.drools.audit.event,com.t
houghtworks.xstream,org.drools.impl,org.drools.workflow.core.node,org
- .drools.command,org.drools.workflow.instance.node,org.drools.workflow
- .instance,org.drools.rule,org.drools.spi,org.drools.command.impl,org.
+ .drools.command,org.drools.workflow.instance,org.drools.workflow.inst
+ ance.node,org.drools.rule,org.drools.spi,org.drools.command.impl,org.
drools.common";version="5.1.0.SNAPSHOT",org.drools.base.extractors;us
es:="org.drools.base,org.drools.util,org.drools.spi,org.drools.common
,org.drools,org.mvel2,org.mvel2.compiler";version="5.1.0.SNAPSHOT",or
@@ -88,7 +88,7 @@
e.context.variable,org.drools.process.instance.context.variable,org.d
rools.common,org.drools.ruleflow.instance,org.drools.ruleflow.core";v
ersion="5.1.0.SNAPSHOT",org.drools.process.core.context.variable;uses
- :="org.drools.process.core.datatype,org.drools.process.core,org.drool
+ :="org.drools.process.core,org.drools.process.core.datatype,org.drool
s.process.core.datatype.impl.type,org.drools.process.core.context";ve
rsion="5.1.0.SNAPSHOT",org.drools.event.rule.impl;uses:="org.drools.e
vent,org.drools,org.drools.spi,org.drools.common,org.drools.impl";ver
@@ -104,7 +104,7 @@
g.xml.sax,org.drools.xml.changeset,javax.xml.parsers,org.xml.sax.help
ers,org.w3c.dom,org.drools";version="5.1.0.SNAPSHOT",org.drools.factt
emplates;uses:="org.drools.rule,org.drools.base,org.drools,org.drools
- .util,org.drools.spi,org.drools.common";version="5.1.0.SNAPSHOT",org.
+ .spi,org.drools.util,org.drools.common";version="5.1.0.SNAPSHOT",org.
drools.base.field;uses:="org.drools,org.drools.spi,org.drools.util,or
g.drools.common";version="5.1.0.SNAPSHOT",org.drools.runtime.rule.imp
l;uses:="org.drools.spi,org.drools.common,org.drools,org.drools.rule"
@@ -145,8 +145,8 @@
.SNAPSHOT",org.drools.base.evaluators;uses:="org.drools.time,org.droo
ls.base,org.drools,org.drools.rule,org.drools.spi,org.drools.common,o
rg.drools.util,org.drools.type,org.mvel2.util";version="5.1.0.SNAPSHO
- T",org.drools.impl;uses:="org.drools.event,org.drools.definitions.rul
- e.impl,org.drools,org.drools.rule,org.drools.definitions.impl,org.dro
+ T",org.drools.impl;uses:="org.drools,org.drools.event,org.drools.defi
+ nitions.rule.impl,org.drools.rule,org.drools.definitions.impl,org.dro
ols.event.knowlegebase.impl,org.drools.command,org.drools.command.imp
l,org.drools.agent,org.drools.common,org.drools.spi,org.drools.event.
rule.impl,org.drools.event.process.impl,org.drools.runtime.impl,org.d
@@ -167,7 +167,7 @@
ls.util.asm,org.drools.util,org.drools.common,org.drools.time,org.dro
ols.base.evaluators,org.drools.base.extractors,org.mvel2.asm,org.droo
ls.rule,org.drools.impl,org.drools.base.field,org.drools.type,org.mve
- l2.ast,org.mvel2.compiler,org.mvel2.integration,org.drools.base.mvel,
+ l2.ast,org.mvel2.integration,org.mvel2.compiler,org.drools.base.mvel,
org.drools.facttemplates";version="5.1.0.SNAPSHOT",org.drools;uses:="
org.drools.spi,org.drools.time,org.drools.time.impl,org.drools.rule,o
rg.drools.common,org.drools.workflow.instance.impl,org.drools.process
@@ -180,7 +180,7 @@
.mvel2,org.drools.util,org.drools.command.impl";version="5.1.0.SNAPSH
OT",org.drools.agent.impl;uses:="org.drools,org.drools.spi,org.drools
.rule,org.drools.definitions.impl,org.drools.util,org.drools.agent,or
- g.drools.impl,org.drools.xml,org.drools.io.internal,org.drools.proces
+ g.drools.impl,org.drools.io.internal,org.drools.xml,org.drools.proces
s.core,org.drools.io.impl,org.drools.common";version="5.1.0.SNAPSHOT"
,org.drools.spi;uses:="org.drools.base,org.drools,org.drools.rule,org
.drools.common,org.drools.util,org.drools.time,org.drools.concurrent,
@@ -205,8 +205,8 @@
n="5.1.0.SNAPSHOT",org.drools.process.core.validation;version="5.1.0.
SNAPSHOT",org.drools.process.instance.context.exception;uses:="org.dr
ools.base,org.drools.workflow.instance,org.drools,org.drools.spi,org.
- drools.process.instance,org.drools.process.core.context.exception,org
- .drools.workflow.core,org.drools.common,org.drools.process.core,org.d
+ drools.process.instance,org.drools.workflow.core,org.drools.process.c
+ ore.context.exception,org.drools.common,org.drools.process.core,org.d
rools.process.instance.context";version="5.1.0.SNAPSHOT",org.drools.x
ml.changeset;uses:="org.drools.xml,org.xml.sax,org.drools,org.w3c.dom
,org.drools.io.impl,org.drools.io.internal,org.drools.builder.conf.im
@@ -214,8 +214,8 @@
nce.timer;uses:="org.drools.time,org.drools,org.drools.process.instan
ce.event,org.drools.process.instance,org.drools.time.impl";version="5
.1.0.SNAPSHOT",org.drools.base.dataproviders;uses:="org.mvel2,org.mve
- l2.integration,org.drools,org.drools.rule,org.drools.spi,org.drools.u
- til,org.drools.base.mvel";version="5.1.0.SNAPSHOT",org.drools.process
+ l2.integration,org.drools,org.drools.rule,org.drools.util,org.drools.
+ base.mvel,org.drools.spi";version="5.1.0.SNAPSHOT",org.drools.process
.instance.impl.factory;uses:="org.drools.process.core,org.drools.proc
ess.instance,org.drools.process.instance.impl,org.drools.process.inst
ance.context";version="5.1.0.SNAPSHOT",org.drools.workflow.instance;u
@@ -266,8 +266,8 @@
untime.pipeline,org.drools.command,org.drools.command.runtime.rule,or
g.mvel2,org.mvel2.compiler,org.drools.common,org.drools,org.drools.im
pl,org.drools.rule";version="5.1.0.SNAPSHOT",org.drools.command.runti
- me.rule;uses:="org.drools.command,org.drools.command.impl,org.drools,
- org.drools.impl,org.drools.spi,org.drools.runtime.impl,org.drools.com
+ me.rule;uses:="org.drools.command,org.drools.command.impl,org.drools.
+ impl,org.drools,org.drools.spi,org.drools.runtime.impl,org.drools.com
mon,org.mvel2";version="5.1.0.SNAPSHOT",org.drools.command.runtime;us
es:="org.drools.command,org.drools.command.impl,org.drools.runtime.im
pl,org.drools.impl,org.drools";version="5.1.0.SNAPSHOT"
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/KnowledgeRuntimeLoggerProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/KnowledgeRuntimeLoggerProviderImpl.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/KnowledgeRuntimeLoggerProviderImpl.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -2,9 +2,9 @@
import org.drools.event.KnowledgeRuntimeEventManager;
import org.drools.logger.KnowledgeRuntimeLogger;
-import org.drools.logger.KnowledgeRuntimeLoggerProvider;
+import org.drools.logger.KnowledgeRuntimeLoggerFactoryService;
-public class KnowledgeRuntimeLoggerProviderImpl implements KnowledgeRuntimeLoggerProvider {
+public class KnowledgeRuntimeLoggerProviderImpl implements KnowledgeRuntimeLoggerFactoryService {
public KnowledgeRuntimeLogger newFileLogger(KnowledgeRuntimeEventManager session, String fileName) {
WorkingMemoryFileLogger logger = new WorkingMemoryFileLogger(session);
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseFactoryServiceImpl.java (from rev 31082, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseProviderImpl.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseFactoryServiceImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseFactoryServiceImpl.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -0,0 +1,53 @@
+package org.drools.impl;
+
+import java.util.Properties;
+
+import org.drools.KnowledgeBase;
+import org.drools.KnowledgeBaseConfiguration;
+import org.drools.KnowledgeBaseFactoryService;
+import org.drools.RuleBaseConfiguration;
+import org.drools.RuleBaseFactory;
+import org.drools.SessionConfiguration;
+import org.drools.runtime.Environment;
+import org.drools.runtime.KnowledgeSessionConfiguration;
+
+public class KnowledgeBaseFactoryServiceImpl implements KnowledgeBaseFactoryService {
+
+ public KnowledgeBaseConfiguration newKnowledgeBaseConfiguration() {
+ return new RuleBaseConfiguration();
+ }
+
+ public KnowledgeBaseConfiguration newKnowledgeBaseConfiguration(Properties properties, ClassLoader classLoader) {
+ return new RuleBaseConfiguration(classLoader, properties);
+ }
+
+ public KnowledgeSessionConfiguration newKnowledgeSessionConfiguration() {
+ return new SessionConfiguration();
+ }
+
+ public KnowledgeSessionConfiguration newKnowledgeSessionConfiguration(Properties properties) {
+ return new SessionConfiguration(properties);
+ }
+
+ public KnowledgeBase newKnowledgeBase() {
+ return new KnowledgeBaseImpl( RuleBaseFactory.newRuleBase() );
+ }
+
+ public KnowledgeBase newKnowledgeBase( String kbaseId ) {
+ return new KnowledgeBaseImpl( RuleBaseFactory.newRuleBase(kbaseId) );
+ }
+
+ public KnowledgeBase newKnowledgeBase(KnowledgeBaseConfiguration conf) {
+ return new KnowledgeBaseImpl( RuleBaseFactory.newRuleBase( ( RuleBaseConfiguration ) conf ) );
+ }
+
+ public KnowledgeBase newKnowledgeBase(String kbaseId,
+ KnowledgeBaseConfiguration conf) {
+ return new KnowledgeBaseImpl( RuleBaseFactory.newRuleBase( kbaseId,
+ ( RuleBaseConfiguration ) conf ) );
+ }
+
+ public Environment newEnvironment() {
+ return new EnvironmentImpl(); //EnvironmentFactory.newEnvironment();
+ }
+}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseProviderImpl.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseProviderImpl.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -1,53 +0,0 @@
-package org.drools.impl;
-
-import java.util.Properties;
-
-import org.drools.KnowledgeBase;
-import org.drools.KnowledgeBaseConfiguration;
-import org.drools.KnowledgeBaseProvider;
-import org.drools.RuleBaseConfiguration;
-import org.drools.RuleBaseFactory;
-import org.drools.SessionConfiguration;
-import org.drools.runtime.Environment;
-import org.drools.runtime.KnowledgeSessionConfiguration;
-
-public class KnowledgeBaseProviderImpl implements KnowledgeBaseProvider {
-
- public KnowledgeBaseConfiguration newKnowledgeBaseConfiguration() {
- return new RuleBaseConfiguration();
- }
-
- public KnowledgeBaseConfiguration newKnowledgeBaseConfiguration(Properties properties, ClassLoader classLoader) {
- return new RuleBaseConfiguration(classLoader, properties);
- }
-
- public KnowledgeSessionConfiguration newKnowledgeSessionConfiguration() {
- return new SessionConfiguration();
- }
-
- public KnowledgeSessionConfiguration newKnowledgeSessionConfiguration(Properties properties) {
- return new SessionConfiguration(properties);
- }
-
- public KnowledgeBase newKnowledgeBase() {
- return new KnowledgeBaseImpl( RuleBaseFactory.newRuleBase() );
- }
-
- public KnowledgeBase newKnowledgeBase( String kbaseId ) {
- return new KnowledgeBaseImpl( RuleBaseFactory.newRuleBase(kbaseId) );
- }
-
- public KnowledgeBase newKnowledgeBase(KnowledgeBaseConfiguration conf) {
- return new KnowledgeBaseImpl( RuleBaseFactory.newRuleBase( ( RuleBaseConfiguration ) conf ) );
- }
-
- public KnowledgeBase newKnowledgeBase(String kbaseId,
- KnowledgeBaseConfiguration conf) {
- return new KnowledgeBaseImpl( RuleBaseFactory.newRuleBase( kbaseId,
- ( RuleBaseConfiguration ) conf ) );
- }
-
- public Environment newEnvironment() {
- return new EnvironmentImpl(); //EnvironmentFactory.newEnvironment();
- }
-}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/SystemEventListenerProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/SystemEventListenerProviderImpl.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/SystemEventListenerProviderImpl.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -1,20 +0,0 @@
-package org.drools.impl;
-
-import org.drools.SystemEventListener;
-import org.drools.SystemEventListenerProvider;
-import org.drools.agent.impl.PrintStreamSystemEventListener;
-import org.drools.util.DelegatingSystemEventListener;
-
-public class SystemEventListenerProviderImpl implements SystemEventListenerProvider{
-
- private DelegatingSystemEventListener listener = new DelegatingSystemEventListener( new PrintStreamSystemEventListener() );
-
- public SystemEventListener getSystemEventListener() {
- return this.listener;
- }
-
- public void setSystemEventListener(SystemEventListener listener) {
- this.listener.setSystemEventListener( listener );
- }
-
-}
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/SystemEventListenerServiceImpl.java (from rev 31114, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/SystemEventListenerProviderImpl.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/SystemEventListenerServiceImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/SystemEventListenerServiceImpl.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -0,0 +1,20 @@
+package org.drools.impl;
+
+import org.drools.SystemEventListener;
+import org.drools.SystemEventListenerService;
+import org.drools.agent.impl.PrintStreamSystemEventListener;
+import org.drools.util.DelegatingSystemEventListener;
+
+public class SystemEventListenerServiceImpl implements SystemEventListenerService{
+
+ private DelegatingSystemEventListener listener = new DelegatingSystemEventListener( new PrintStreamSystemEventListener() );
+
+ public SystemEventListener getSystemEventListener() {
+ return this.listener;
+ }
+
+ public void setSystemEventListener(SystemEventListener listener) {
+ this.listener.setSystemEventListener( listener );
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ResourceFactoryServiceImpl.java (from rev 31082, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ResourceProviderImpl.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ResourceFactoryServiceImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ResourceFactoryServiceImpl.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -0,0 +1,91 @@
+package org.drools.io.impl;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.Reader;
+import java.net.URL;
+
+import org.drools.SystemEventListener;
+import org.drools.agent.impl.PrintStreamSystemEventListener;
+import org.drools.io.Resource;
+import org.drools.io.ResourceChangeNotifier;
+import org.drools.io.ResourceChangeScanner;
+import org.drools.io.ResourceFactoryService;
+import org.drools.util.DelegatingSystemEventListener;
+
+public class ResourceFactoryServiceImpl
+ implements
+ ResourceFactoryService {
+
+ private ResourceChangeNotifier notifier;
+ private ResourceChangeScanner scanner;
+ private Object lock = new Object();
+
+ public ResourceChangeNotifier getResourceChangeNotifierService() {
+ synchronized ( this.lock ) {
+ if ( this.notifier == null ) {
+ this.notifier = new ResourceChangeNotifierImpl( );
+ }
+ return this.notifier;
+ }
+ }
+
+ public ResourceChangeScanner getResourceChangeScannerService() {
+ synchronized ( this.lock ) {
+ if ( scanner == null ) {
+ this.scanner = new ResourceChangeScannerImpl( );
+ }
+ return this.scanner;
+ }
+ }
+
+ public Resource newByteArrayResource(byte[] bytes) {
+ return new ByteArrayResource( bytes );
+ }
+
+ public Resource newClassPathResource(String path) {
+ return new ClassPathResource( path );
+ }
+
+ public Resource newClassPathResource(String path,
+ ClassLoader classLoader) {
+ return new ClassPathResource( path,
+ classLoader );
+ }
+
+ public Resource newClassPathResource(String path,
+ Class clazz) {
+ return new ClassPathResource( path,
+ clazz );
+ }
+
+ public Resource newFileSystemResource(File file) {
+ return new FileSystemResource( file );
+ }
+
+ public Resource newFileSystemResource(String fileName) {
+ return new FileSystemResource( fileName );
+ }
+
+ public Resource newInputStreamResource(InputStream stream) {
+ return new InputStreamResource( stream );
+ }
+
+ public Resource newReaderResource(Reader reader) {
+ return new ReaderResource( reader );
+ }
+
+ public Resource newReaderResource(Reader reader,
+ String encoding) {
+ return new ReaderResource( reader,
+ encoding );
+ }
+
+ public Resource newUrlResource(URL url) {
+ return new UrlResource( url );
+ }
+
+ public Resource newUrlResource(String path) {
+ return new UrlResource( path );
+ }
+}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ResourceProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ResourceProviderImpl.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/io/impl/ResourceProviderImpl.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -1,91 +0,0 @@
-package org.drools.io.impl;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.Reader;
-import java.net.URL;
-
-import org.drools.SystemEventListener;
-import org.drools.agent.impl.PrintStreamSystemEventListener;
-import org.drools.io.Resource;
-import org.drools.io.ResourceChangeNotifier;
-import org.drools.io.ResourceChangeScanner;
-import org.drools.io.ResourceProvider;
-import org.drools.util.DelegatingSystemEventListener;
-
-public class ResourceProviderImpl
- implements
- ResourceProvider {
-
- private ResourceChangeNotifier notifier;
- private ResourceChangeScanner scanner;
- private Object lock = new Object();
-
- public ResourceChangeNotifier getResourceChangeNotifierService() {
- synchronized ( this.lock ) {
- if ( this.notifier == null ) {
- this.notifier = new ResourceChangeNotifierImpl( );
- }
- return this.notifier;
- }
- }
-
- public ResourceChangeScanner getResourceChangeScannerService() {
- synchronized ( this.lock ) {
- if ( scanner == null ) {
- this.scanner = new ResourceChangeScannerImpl( );
- }
- return this.scanner;
- }
- }
-
- public Resource newByteArrayResource(byte[] bytes) {
- return new ByteArrayResource( bytes );
- }
-
- public Resource newClassPathResource(String path) {
- return new ClassPathResource( path );
- }
-
- public Resource newClassPathResource(String path,
- ClassLoader classLoader) {
- return new ClassPathResource( path,
- classLoader );
- }
-
- public Resource newClassPathResource(String path,
- Class clazz) {
- return new ClassPathResource( path,
- clazz );
- }
-
- public Resource newFileSystemResource(File file) {
- return new FileSystemResource( file );
- }
-
- public Resource newFileSystemResource(String fileName) {
- return new FileSystemResource( fileName );
- }
-
- public Resource newInputStreamResource(InputStream stream) {
- return new InputStreamResource( stream );
- }
-
- public Resource newReaderResource(Reader reader) {
- return new ReaderResource( reader );
- }
-
- public Resource newReaderResource(Reader reader,
- String encoding) {
- return new ReaderResource( reader,
- encoding );
- }
-
- public Resource newUrlResource(URL url) {
- return new UrlResource( url );
- }
-
- public Resource newUrlResource(String path) {
- return new UrlResource( path );
- }
-}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/Activator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/Activator.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/Activator.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -3,12 +3,12 @@
import java.util.Hashtable;
import java.util.concurrent.Callable;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
import org.drools.Service;
-import org.drools.builder.KnowledgeBuilderProvider;
-import org.drools.impl.KnowledgeBaseProviderImpl;
-import org.drools.io.ResourceProvider;
-import org.drools.io.impl.ResourceProviderImpl;
+import org.drools.builder.KnowledgeBuilderFactoryService;
+import org.drools.impl.KnowledgeBaseFactoryServiceImpl;
+import org.drools.io.ResourceFactoryService;
+import org.drools.io.impl.ResourceFactoryServiceImpl;
import org.drools.util.ServiceRegistry;
import org.drools.util.ServiceRegistryImpl;
import org.osgi.framework.BundleActivator;
@@ -26,11 +26,11 @@
public void start(BundleContext bc) throws Exception {
System.out.println( "registering core services" );
- this.resourceReg = bc.registerService( new String[]{ResourceProvider.class.getName(), Service.class.getName()},
- new ResourceProviderImpl(),
+ this.resourceReg = bc.registerService( new String[]{ResourceFactoryService.class.getName(), Service.class.getName()},
+ new ResourceFactoryServiceImpl(),
new Hashtable() );
- this.kbaseReg = bc.registerService( new String[]{KnowledgeBaseProvider.class.getName(), Service.class.getName()},
- new KnowledgeBaseProviderImpl(),
+ this.kbaseReg = bc.registerService( new String[]{KnowledgeBaseFactoryService.class.getName(), Service.class.getName()},
+ new KnowledgeBaseFactoryServiceImpl(),
new Hashtable() );
System.out.println( "core services registered" );
Modified: labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/osgi/decisiontables/Activator.java
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/osgi/decisiontables/Activator.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/osgi/decisiontables/Activator.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -3,12 +3,12 @@
import java.util.Hashtable;
-//import org.drools.KnowledgeBaseProvider;
-//import org.drools.builder.KnowledgeBuilderProvider;
-//import org.drools.builder.impl.KnowledgeBuilderProviderImpl;
-//import org.drools.impl.KnowledgeBaseProviderImpl;
-//import org.drools.io.ResourceProvider;
-//import org.drools.io.impl.ResourceProviderImpl;
+//import org.drools.KnowledgeBaseFactoryService;
+//import org.drools.builder.KnowledgeBuilderFactoryService;
+//import org.drools.builder.impl.KnowledgeBuilderFactoryServiceImpl;
+//import org.drools.impl.KnowledgeBaseFactoryServiceImpl;
+//import org.drools.io.ResourceFactoryService;
+//import org.drools.io.impl.ResourceFactoryServiceImpl;
import org.drools.compiler.DecisionTableProvider;
import org.drools.decisiontable.DecisionTableProviderImpl;
import org.osgi.framework.BundleActivator;
Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -1989,7 +1989,7 @@
private StatefulKnowledgeSession getVsmSessionStateful(ServiceManager sm,
Resource resource) throws Exception {
- KnowledgeBuilder kbuilder = sm.getKnowledgeBuilderFactory().newKnowledgeBuilder();
+ KnowledgeBuilder kbuilder = sm.getKnowledgeBuilderFactoryService().newKnowledgeBuilder();
kbuilder.add( resource,
ResourceType.DRL );
@@ -2000,7 +2000,7 @@
assertFalse( kbuilder.hasErrors() );
Collection<KnowledgePackage> pkgs = kbuilder.getKnowledgePackages();
- KnowledgeBase kbase = sm.getKnowledgeBaseFactory().newKnowledgeBase();
+ KnowledgeBase kbase = sm.getKnowledgeBaseFactoryService().newKnowledgeBase();
kbase.addKnowledgePackages( pkgs );
StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
Modified: labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/org/drools/process/workitem/email/EmailWorkItemHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/org/drools/process/workitem/email/EmailWorkItemHandlerTest.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/org/drools/process/workitem/email/EmailWorkItemHandlerTest.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -14,7 +14,6 @@
import org.drools.runtime.process.WorkItemManager;
import org.drools.util.ChainedProperties;
import org.drools.util.ClassLoaderUtil;
-import org.drools.util.ProviderLocator;
import org.subethamail.wiser.Wiser;
import org.subethamail.wiser.WiserMessage;
Modified: labs/jbossrules/trunk/drools-simulator/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-simulator/.classpath 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-simulator/.classpath 2010-01-18 04:30:38 UTC (rev 31115)
@@ -21,5 +21,6 @@
<classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
<classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/yaml/snakeyaml/1.4/snakeyaml-1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-simulator/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-simulator/pom.xml 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-simulator/pom.xml 2010-01-18 04:30:38 UTC (rev 31115)
@@ -31,7 +31,11 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
- </dependency>
- </dependencies>
-
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.4</version>
+ </dependency>
+ </dependencies>
</project>
Modified: labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/KnowledgeBaseProviderLocalClient.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/KnowledgeBaseProviderLocalClient.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/KnowledgeBaseProviderLocalClient.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -5,13 +5,13 @@
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseConfiguration;
import org.drools.KnowledgeBaseFactory;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
import org.drools.runtime.Environment;
import org.drools.runtime.KnowledgeSessionConfiguration;
public class KnowledgeBaseProviderLocalClient
implements
- KnowledgeBaseProvider {
+ KnowledgeBaseFactoryService {
public Environment newEnvironment() {
return KnowledgeBaseFactory.newEnvironment();
Modified: labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/KnowledgeBuilderProviderLocalClient.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/KnowledgeBuilderProviderLocalClient.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/KnowledgeBuilderProviderLocalClient.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -10,11 +10,11 @@
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderConfiguration;
import org.drools.builder.KnowledgeBuilderFactory;
-import org.drools.builder.KnowledgeBuilderProvider;
+import org.drools.builder.KnowledgeBuilderFactoryService;
public class KnowledgeBuilderProviderLocalClient
implements
- KnowledgeBuilderProvider {
+ KnowledgeBuilderFactoryService {
public DecisionTableConfiguration newDecisionTableConfiguration() {
return KnowledgeBuilderFactory.newDecisionTableConfiguration();
Modified: labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/ServiceManagerLocalClient.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/ServiceManagerLocalClient.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/local/ServiceManagerLocalClient.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -4,12 +4,12 @@
import java.util.Properties;
import org.drools.KnowledgeBase;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
import org.drools.agent.KnowledgeAgentProvider;
import org.drools.builder.DecisionTableConfiguration;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderConfiguration;
-import org.drools.builder.KnowledgeBuilderProvider;
+import org.drools.builder.KnowledgeBuilderFactoryService;
import org.drools.command.Command;
import org.drools.persistence.jpa.JPAKnowledgeServiceProvider;
import org.drools.persistence.jpa.impl.JPAKnowledgeServiceProviderImpl;
@@ -38,11 +38,11 @@
}
- public KnowledgeBuilderProvider getKnowledgeBuilderFactory() {
+ public KnowledgeBuilderFactoryService getKnowledgeBuilderFactoryService() {
return new KnowledgeBuilderProviderLocalClient();
}
- public KnowledgeBaseProvider getKnowledgeBaseFactory() {
+ public KnowledgeBaseFactoryService getKnowledgeBaseFactoryService() {
return new KnowledgeBaseProviderLocalClient();
}
@@ -87,9 +87,9 @@
return new HumanTaskServiceLocalProviderImpl(this);
}
- public static class RemoveKnowledgeBuilderProvider
+ public static class RemoveKnowledgeBuilderFactoryService
implements
- KnowledgeBuilderProvider {
+ KnowledgeBuilderFactoryService {
public DecisionTableConfiguration newDecisionTableConfiguration() {
// TODO Auto-generated method stub
Modified: labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/remote/KnowledgeBaseProviderRemoteClient.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/remote/KnowledgeBaseProviderRemoteClient.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/remote/KnowledgeBaseProviderRemoteClient.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -5,7 +5,7 @@
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseConfiguration;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
import org.drools.command.FinishedCommand;
import org.drools.command.NewKnowledgeBaseCommand;
import org.drools.command.SetVariableCommand;
@@ -15,7 +15,7 @@
public class KnowledgeBaseProviderRemoteClient
implements
- KnowledgeBaseProvider {
+ KnowledgeBaseFactoryService {
private ServiceManagerRemoteClient serviceManager;
public KnowledgeBaseProviderRemoteClient(ServiceManagerRemoteClient serviceManager) {
Modified: labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/remote/KnowledgeBuilderProviderRemoteClient.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/remote/KnowledgeBuilderProviderRemoteClient.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/remote/KnowledgeBuilderProviderRemoteClient.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -10,7 +10,7 @@
import org.drools.builder.DecisionTableConfiguration;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderConfiguration;
-import org.drools.builder.KnowledgeBuilderProvider;
+import org.drools.builder.KnowledgeBuilderFactoryService;
import org.drools.command.FinishedCommand;
import org.drools.command.SetVariableCommand;
import org.drools.command.builder.NewKnowledgeBuilderCommand;
@@ -18,7 +18,7 @@
public class KnowledgeBuilderProviderRemoteClient
implements
- KnowledgeBuilderProvider {
+ KnowledgeBuilderFactoryService {
private ServiceManagerRemoteClient serviceManager;
public KnowledgeBuilderProviderRemoteClient(ServiceManagerRemoteClient serviceManager) {
Modified: labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/remote/ServiceManagerRemoteClient.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/remote/ServiceManagerRemoteClient.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/remote/ServiceManagerRemoteClient.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -6,12 +6,12 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.drools.KnowledgeBase;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
import org.drools.agent.KnowledgeAgentProvider;
import org.drools.builder.DecisionTableConfiguration;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderConfiguration;
-import org.drools.builder.KnowledgeBuilderProvider;
+import org.drools.builder.KnowledgeBuilderFactoryService;
import org.drools.command.Command;
import org.drools.command.FinishedCommand;
import org.drools.command.KnowledgeContextResolveFromContextCommand;
@@ -106,11 +106,11 @@
}
}
- public KnowledgeBuilderProvider getKnowledgeBuilderFactory() {
+ public KnowledgeBuilderFactoryService getKnowledgeBuilderFactoryService() {
return new KnowledgeBuilderProviderRemoteClient( this );
}
- public KnowledgeBaseProvider getKnowledgeBaseFactory() {
+ public KnowledgeBaseFactoryService getKnowledgeBaseFactoryService() {
return new KnowledgeBaseProviderRemoteClient( this );
}
@@ -225,7 +225,7 @@
return new HumanTaskServiceRemoteProviderImpl(this);
}
- public static class RemoveKnowledgeBuilderProvider implements KnowledgeBuilderProvider {
+ public static class RemoveKnowledgeBuilderFactoryService implements KnowledgeBuilderFactoryService {
public DecisionTableConfiguration newDecisionTableConfiguration() {
// TODO Auto-generated method stub
Modified: labs/jbossrules/trunk/drools-vsm/src/test/java/org/drools/task/CommandBasedVSMWSHumanTaskHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/test/java/org/drools/task/CommandBasedVSMWSHumanTaskHandlerTest.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-vsm/src/test/java/org/drools/task/CommandBasedVSMWSHumanTaskHandlerTest.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -15,7 +15,7 @@
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.drools.KnowledgeBase;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
import org.drools.SystemEventListenerFactory;
import org.drools.process.instance.impl.WorkItemImpl;
import org.drools.runtime.process.WorkItem;
@@ -103,7 +103,7 @@
HumanTaskServiceProvider humanTaskServiceFactory = this.client.getHumanTaskService();
this.humanTaskClient = (HumanTaskServiceImpl) humanTaskServiceFactory.newHumanTaskServiceClient();
- KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+ KnowledgeBaseFactoryService kbaseFactory = this.client.getKnowledgeBaseFactoryService();
KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
this.handler = new CommandBasedVSMWSHumanTaskHandler(kbase.newStatefulKnowledgeSession());
Modified: labs/jbossrules/trunk/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerHumanTaskMinaRemoteTest.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerHumanTaskMinaRemoteTest.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerHumanTaskMinaRemoteTest.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -19,10 +19,10 @@
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.drools.KnowledgeBase;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
import org.drools.SystemEventListenerFactory;
import org.drools.builder.KnowledgeBuilder;
-import org.drools.builder.KnowledgeBuilderProvider;
+import org.drools.builder.KnowledgeBuilderFactoryService;
import org.drools.builder.ResourceType;
import org.drools.io.impl.ClassPathResource;
import org.drools.runtime.StatefulKnowledgeSession;
@@ -186,7 +186,7 @@
}
public void testHumanTasks() throws Exception {
- KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+ KnowledgeBuilderFactoryService kbuilderFactory = this.client.getKnowledgeBuilderFactoryService();
KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
kbuilder.add( new ClassPathResource("rules/humanTasks.rf"),
ResourceType.DRF );
@@ -195,7 +195,7 @@
System.out.println( "Errors: " + kbuilder.getErrors() );
}
- KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+ KnowledgeBaseFactoryService kbaseFactory = this.client.getKnowledgeBaseFactoryService();
KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
Modified: labs/jbossrules/trunk/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerTestBase.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerTestBase.java 2010-01-18 02:07:59 UTC (rev 31114)
+++ labs/jbossrules/trunk/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerTestBase.java 2010-01-18 04:30:38 UTC (rev 31115)
@@ -3,9 +3,9 @@
import junit.framework.TestCase;
import org.drools.KnowledgeBase;
-import org.drools.KnowledgeBaseProvider;
+import org.drools.KnowledgeBaseFactoryService;
import org.drools.builder.KnowledgeBuilder;
-import org.drools.builder.KnowledgeBuilderProvider;
+import org.drools.builder.KnowledgeBuilderFactoryService;
import org.drools.builder.ResourceType;
import org.drools.command.runtime.rule.FireAllRulesCommand;
import org.drools.io.ResourceFactory;
@@ -37,7 +37,7 @@
str += " System.out.println( \"hello2!!!\" ); \n";
str += "end \n";
- KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+ KnowledgeBuilderFactoryService kbuilderFactory = this.client.getKnowledgeBuilderFactoryService();
KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
ResourceType.DRL );
@@ -46,7 +46,7 @@
System.out.println( "Errors: " + kbuilder.getErrors() );
}
- KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+ KnowledgeBaseFactoryService kbaseFactory = this.client.getKnowledgeBaseFactoryService();
KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
@@ -74,7 +74,7 @@
str += " System.out.println( \"hello2!!!\" ); \n";
str += "end \n";
- KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+ KnowledgeBuilderFactoryService kbuilderFactory = this.client.getKnowledgeBuilderFactoryService();
KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
ResourceType.DRL );
@@ -83,7 +83,7 @@
System.out.println( "Errors: " + kbuilder.getErrors() );
}
- KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+ KnowledgeBaseFactoryService kbaseFactory = this.client.getKnowledgeBaseFactoryService();
KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
@@ -113,7 +113,7 @@
str += " System.out.println( \"hello2!!!\" ); \n";
str += "end \n";
- KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+ KnowledgeBuilderFactoryService kbuilderFactory = this.client.getKnowledgeBuilderFactoryService();
KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
ResourceType.DRL );
@@ -122,7 +122,7 @@
System.out.println( "Errors: " + kbuilder.getErrors() );
}
- KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+ KnowledgeBaseFactoryService kbaseFactory = this.client.getKnowledgeBaseFactoryService();
KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
@@ -155,7 +155,7 @@
str += " System.out.println( \"hello2!!!\" ); \n";
str += "end \n";
- KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+ KnowledgeBuilderFactoryService kbuilderFactory = this.client.getKnowledgeBuilderFactoryService();
KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
ResourceType.DRL );
@@ -164,7 +164,7 @@
System.out.println( "Errors: " + kbuilder.getErrors() );
}
- KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+ KnowledgeBaseFactoryService kbaseFactory = this.client.getKnowledgeBaseFactoryService();
KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
More information about the jboss-svn-commits
mailing list