[jboss-svn-commits] JBL Code SVN: r23150 - in labs/jbossrules/trunk: drools-api/src/main/java/org/drools/builder and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Sep 28 21:25:54 EDT 2008
Author: michael.neale at jboss.com
Date: 2008-09-28 21:25:54 -0400 (Sun, 28 Sep 2008)
New Revision: 23150
Added:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/FactHandle.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/SessionClock.java
Removed:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/knowledge/
Modified:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBase.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeSessionFactory.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilder.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/KnowledgePackage.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/rule/Rule.java
labs/jbossrules/trunk/drools-compiler/.classpath
labs/jbossrules/trunk/drools-core/.classpath
Log:
rolling back accidental checkin from mark
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBase.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBase.java 2008-09-28 21:07:25 UTC (rev 23149)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBase.java 2008-09-29 01:25:54 UTC (rev 23150)
@@ -4,6 +4,4 @@
public interface KnowledgeBase {
void addKnowledgePackage(KnowledgePackage knowledgePackage);
-
- StatefulKnowledgeSession newStatefulKnowledgeSession();
}
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeSessionFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeSessionFactory.java 2008-09-28 21:07:25 UTC (rev 23149)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeSessionFactory.java 2008-09-29 01:25:54 UTC (rev 23150)
@@ -16,7 +16,7 @@
return provider.newStatefulKnowledgeSession();
}
-
+ @SuppressWarnings("unchecked")
private static void loadProvider() {
try {
ChainedProperties properties = new ChainedProperties( "drools-providers.conf" );
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilder.java 2008-09-28 21:07:25 UTC (rev 23149)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilder.java 2008-09-29 01:25:54 UTC (rev 23150)
@@ -1,10 +1,5 @@
package org.drools.builder;
-import java.util.Collection;
-
-import org.drools.knowledge.definitions.KnowledgePackage;
-
public interface KnowledgeBuilder extends RuleBuilder, ProcessBuilder {
-
- Collection<KnowledgePackage> getKnowledgePackages();
+
}
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 2008-09-28 21:07:25 UTC (rev 23149)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderFactory.java 2008-09-29 01:25:54 UTC (rev 23150)
@@ -1,9 +1,5 @@
package org.drools.builder;
-import org.drools.KnowledgeSessionProvider;
-import org.drools.ProviderInitializationException;
-import org.drools.util.ChainedProperties;
-
public class KnowledgeBuilderFactory {
private static KnowledgeBuilderProvider provider;
@@ -12,29 +8,6 @@
}
public static KnowledgeBuilder newKnowledgeBuilder() {
- if ( provider == null ) {
- loadProvider();
- }
return provider.newKnowledgeBuilder();
}
-
- private static void loadProvider() {
- try {
- // we didn't find anything in properties so lets try and us reflection
- Class<KnowledgeBuilderProvider> cls = ( Class<KnowledgeBuilderProvider> ) Class.forName( "org.drools.builder.impl.KnowledgeBuilderProviderImpl" );
- setKnowledgeBuilderProvider( cls.newInstance() );
- } catch ( Exception e2 ) {
- throw new ProviderInitializationException( "Provider was not set and the Factory was unable to load a provider from properties, nor could reflection find org.drools.builder.impl.KnowledgeBuilderProviderImpl.", e2 );
- }
-
-// try {
-// ChainedProperties properties = new ChainedProperties( "drools-providers.conf" );
-// String className = properties.getProperty( "KnowledgeBuilderProvider", null );
-// if ( className != null && className.trim().length() > 0 ) {
-// Class<KnowledgeBuilderProvider> cls = ( Class<KnowledgeBuilderProvider> ) Class.forName( className );
-// setKnowledgeBuilderProvider( cls.newInstance() );
-// }
-// } catch ( Exception e1 ) {
-// }
- }
}
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/KnowledgePackage.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/KnowledgePackage.java 2008-09-28 21:07:25 UTC (rev 23149)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/KnowledgePackage.java 2008-09-29 01:25:54 UTC (rev 23150)
@@ -6,10 +6,6 @@
import org.drools.knowledge.definitions.rule.Rule;
public interface KnowledgePackage {
- String getName();
-
Collection<Rule> getRules();
-
Collection<Process> getProcesses();
-
}
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/rule/Rule.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/rule/Rule.java 2008-09-28 21:07:25 UTC (rev 23149)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/rule/Rule.java 2008-09-29 01:25:54 UTC (rev 23150)
@@ -1,9 +1,5 @@
package org.drools.knowledge.definitions.rule;
public interface Rule {
-
- String getName();
-
- public String getPackageName();
-
+ String getRuleName();
}
Modified: labs/jbossrules/trunk/drools-compiler/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-compiler/.classpath 2008-09-28 21:07:25 UTC (rev 23149)
+++ labs/jbossrules/trunk/drools-compiler/.classpath 2008-09-29 01:25:54 UTC (rev 23150)
@@ -1,24 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/1.0.1/gunit-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0.1/antlr-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/1.0.1/gunit-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0.1/antlr-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-core/.classpath 2008-09-28 21:07:25 UTC (rev 23149)
+++ labs/jbossrules/trunk/drools-core/.classpath 2008-09-29 01:25:54 UTC (rev 23150)
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
+</classpath>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/FactHandle.java (from rev 23145, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/FactHandle.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/FactHandle.java (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/FactHandle.java 2008-09-29 01:25:54 UTC (rev 23150)
@@ -0,0 +1,36 @@
+package org.drools;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Persistent handle to an asserted fact.
+ *
+ * @see WorkingMemory#assertObject
+ *
+ * @author <a href="mailto:bob at werken.com">bob mcwhirter </a>
+ */
+
+
+public interface FactHandle {
+
+ /**
+ * Convert this handle to an external representation.
+ *
+ * @return The external string form.
+ */
+ String toExternalForm();
+}
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/SessionClock.java (from rev 23145, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/SessionClock.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/SessionClock.java (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/SessionClock.java 2008-09-29 01:25:54 UTC (rev 23150)
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2007 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Created on Oct 17, 2007
+ */
+package org.drools.time;
+
+
+/**
+ * A clock interface that all engine clocks must implement
+ *
+ * @author etirelli
+ */
+public interface SessionClock {
+
+ /**
+ * Returns the current time. There is no semantics attached
+ * to the long return value, so it will depend on the actual
+ * implementation. For isntance, for a real clock it may be
+ * milliseconds.
+ *
+ * @return The current time. The unit of the time, depends on
+ * the actual clock implementation.
+ *
+ */
+ public long getCurrentTime();
+
+}
More information about the jboss-svn-commits
mailing list