[jboss-svn-commits] JBL Code SVN: r23700 - in labs/jbossrules/trunk/drools-core/src: main/java/org/drools/event/rule/impl and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 4 20:00:17 EST 2008
Author: mark.proctor at jboss.com
Date: 2008-11-04 20:00:16 -0500 (Tue, 04 Nov 2008)
New Revision: 23700
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgeBaseLockedEventImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageAddedEventImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageRemovedEventImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleAddedEventImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleRemovedEventImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageAddedEventImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageRemovedEventImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleAddedEventImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleRemovedEventImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/ObjectInsertedEventImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/ObjectRetractedEventImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/ObjectUpdatedEventImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/SerializableActivation.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/SerializablePropagationContext.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/SerializedRule.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/knowledge/definitions/impl/KnowledgePackageImp.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/knowledge/definitions/rule/impl/RuleImpl.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java
Log:
JBRULES-1734 Drools API
-refactored to move org.drools.knowledge.defintions to org.drools.defintion
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgeBaseLockedEventImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgeBaseLockedEventImpl.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgeBaseLockedEventImpl.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.rule.Rule;
import org.drools.event.knowledgebase.AfterKnowledgeBaseLockedEvent;
-import org.drools.knowledge.definitions.rule.Rule;
public class AfterKnowledgeBaseLockedEventImpl extends KnowledgeBaseEventImpl implements AfterKnowledgeBaseLockedEvent {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageAddedEventImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageAddedEventImpl.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageAddedEventImpl.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.KnowledgePackage;
import org.drools.event.knowledgebase.AfterKnowledgePackageAddedEvent;
-import org.drools.knowledge.definitions.KnowledgePackage;
public class AfterKnowledgePackageAddedEventImpl extends KnowledgeBaseEventImpl implements AfterKnowledgePackageAddedEvent {
private KnowledgePackage knowledgePackage;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageRemovedEventImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageRemovedEventImpl.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageRemovedEventImpl.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.KnowledgePackage;
import org.drools.event.knowledgebase.AfterKnowledgePackageRemovedEvent;
-import org.drools.knowledge.definitions.KnowledgePackage;
public class AfterKnowledgePackageRemovedEventImpl extends KnowledgeBaseEventImpl implements AfterKnowledgePackageRemovedEvent {
private KnowledgePackage knowledgePackage;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleAddedEventImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleAddedEventImpl.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleAddedEventImpl.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.rule.Rule;
import org.drools.event.knowledgebase.AfterRuleAddedEvent;
-import org.drools.knowledge.definitions.rule.Rule;
public class AfterRuleAddedEventImpl extends KnowledgeBaseEventImpl implements AfterRuleAddedEvent {
private Rule rule;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleRemovedEventImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleRemovedEventImpl.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleRemovedEventImpl.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.rule.Rule;
import org.drools.event.knowledgebase.AfterRuleRemovedEvent;
-import org.drools.knowledge.definitions.rule.Rule;
public class AfterRuleRemovedEventImpl extends KnowledgeBaseEventImpl implements AfterRuleRemovedEvent {
private Rule rule;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageAddedEventImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageAddedEventImpl.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageAddedEventImpl.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.KnowledgePackage;
import org.drools.event.knowledgebase.BeforeKnowledgePackageAddedEvent;
-import org.drools.knowledge.definitions.KnowledgePackage;
public class BeforeKnowledgePackageAddedEventImpl extends KnowledgeBaseEventImpl implements BeforeKnowledgePackageAddedEvent {
private KnowledgePackage knowledgePackage;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageRemovedEventImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageRemovedEventImpl.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageRemovedEventImpl.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.KnowledgePackage;
import org.drools.event.knowledgebase.BeforeKnowledgePackageRemovedEvent;
-import org.drools.knowledge.definitions.KnowledgePackage;
public class BeforeKnowledgePackageRemovedEventImpl extends KnowledgeBaseEventImpl implements BeforeKnowledgePackageRemovedEvent {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleAddedEventImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleAddedEventImpl.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleAddedEventImpl.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.rule.Rule;
import org.drools.event.knowledgebase.BeforeRuleAddedEvent;
-import org.drools.knowledge.definitions.rule.Rule;
public class BeforeRuleAddedEventImpl extends KnowledgeBaseEventImpl implements BeforeRuleAddedEvent {
private Rule rule;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleRemovedEventImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleRemovedEventImpl.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleRemovedEventImpl.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.rule.Rule;
import org.drools.event.knowledgebase.BeforeRuleRemovedEvent;
-import org.drools.knowledge.definitions.rule.Rule;
public class BeforeRuleRemovedEventImpl extends KnowledgeBaseEventImpl implements BeforeRuleRemovedEvent {
private Rule rule;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/ObjectInsertedEventImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/ObjectInsertedEventImpl.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/ObjectInsertedEventImpl.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -7,7 +7,7 @@
import org.drools.event.rule.ObjectInsertedEvent;
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.reteoo.ReteooStatefulSession;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.runtime.rule.WorkingMemory;
public class ObjectInsertedEventImpl extends WorkingMemoryEventImpl
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/ObjectRetractedEventImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/ObjectRetractedEventImpl.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/ObjectRetractedEventImpl.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -7,7 +7,7 @@
import org.drools.event.rule.ObjectRetractedEvent;
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.reteoo.ReteooStatefulSession;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.runtime.rule.WorkingMemory;
public class ObjectRetractedEventImpl extends WorkingMemoryEventImpl implements ObjectRetractedEvent {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/ObjectUpdatedEventImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/ObjectUpdatedEventImpl.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/ObjectUpdatedEventImpl.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -7,7 +7,7 @@
import org.drools.event.rule.ObjectUpdatedEvent;
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.reteoo.ReteooStatefulSession;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.runtime.rule.WorkingMemory;
public class ObjectUpdatedEventImpl extends WorkingMemoryEventImpl implements ObjectUpdatedEvent {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/SerializableActivation.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/SerializableActivation.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/SerializableActivation.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -6,7 +6,7 @@
import java.io.ObjectOutput;
import java.util.Collection;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.rule.Rule;
import org.drools.runtime.rule.Activation;
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.PropagationContext;
@@ -16,7 +16,7 @@
Activation,
Externalizable {
private Rule rule;
- private Collection<FactHandle> factHandles;
+ private Collection<? extends FactHandle> factHandles;
private PropagationContext propgationContext;
public SerializableActivation(Activation activation) {
@@ -36,7 +36,7 @@
return this.rule;
}
- public Collection<FactHandle> getFactHandles() {
+ public Collection<? extends FactHandle> getFactHandles() {
return this.factHandles;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/SerializablePropagationContext.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/SerializablePropagationContext.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/rule/impl/SerializablePropagationContext.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -5,8 +5,8 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.drools.definition.rule.Rule;
import org.drools.impl.SerializedRule;
-import org.drools.knowledge.definitions.rule.Rule;
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.PropagationContext;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -15,6 +15,7 @@
import org.drools.RuleBase;
import org.drools.SessionConfiguration;
import org.drools.StatefulSession;
+import org.drools.definition.KnowledgePackage;
import org.drools.event.AfterFunctionRemovedEvent;
import org.drools.event.AfterPackageAddedEvent;
import org.drools.event.AfterPackageRemovedEvent;
@@ -44,7 +45,6 @@
import org.drools.event.knowlegebase.impl.BeforeKnowledgePackageRemovedEventImpl;
import org.drools.event.knowlegebase.impl.BeforeRuleAddedEventImpl;
import org.drools.event.knowlegebase.impl.BeforeRuleRemovedEventImpl;
-import org.drools.knowledge.definitions.KnowledgePackage;
import org.drools.knowledge.definitions.impl.KnowledgePackageImp;
import org.drools.knowledge.definitions.rule.impl.RuleImpl;
import org.drools.reteoo.ReteooRuleBase;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/SerializedRule.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/SerializedRule.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/SerializedRule.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -5,7 +5,7 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.rule.Rule;
public class SerializedRule
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/knowledge/definitions/impl/KnowledgePackageImp.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/knowledge/definitions/impl/KnowledgePackageImp.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/knowledge/definitions/impl/KnowledgePackageImp.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -4,9 +4,9 @@
import java.util.Collection;
import java.util.List;
-import org.drools.knowledge.definitions.KnowledgePackage;
-import org.drools.knowledge.definitions.process.Process;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.KnowledgePackage;
+import org.drools.definition.process.Process;
+import org.drools.definition.rule.Rule;
import org.drools.knowledge.definitions.rule.impl.RuleImpl;
import org.drools.rule.Package;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/knowledge/definitions/rule/impl/RuleImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/knowledge/definitions/rule/impl/RuleImpl.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/knowledge/definitions/rule/impl/RuleImpl.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -2,7 +2,7 @@
import org.drools.rule.Rule;
-public class RuleImpl implements org.drools.knowledge.definitions.rule.Rule {
+public class RuleImpl implements org.drools.definition.rule.Rule {
private Rule rule;
public RuleImpl(Rule rule) {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java 2008-11-05 00:59:09 UTC (rev 23699)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java 2008-11-05 01:00:16 UTC (rev 23700)
@@ -16,10 +16,9 @@
* limitations under the License.
*/
-import java.io.Serializable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.List;
@@ -28,13 +27,10 @@
import org.drools.Cheese;
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactory;
-import org.drools.RuleBase;
-import org.drools.RuleBaseFactory;
-import org.drools.base.ClassFieldReader;
import org.drools.base.ClassFieldAccessorCache;
+import org.drools.base.ClassFieldReader;
import org.drools.base.ClassObjectType;
import org.drools.base.FieldFactory;
-import org.drools.base.ShadowProxy;
import org.drools.base.ValueType;
import org.drools.base.evaluators.ComparableEvaluatorsDefinition;
import org.drools.base.evaluators.EqualityEvaluatorsDefinition;
More information about the jboss-svn-commits
mailing list