Permalink
Browse files

move the Kie*Model classes in a model package

  • Loading branch information...
1 parent 8505359 commit 668cdfd753202d4565dc416d8f4c80c3f63e8069 @mariofusco mariofusco committed Jan 3, 2013
Showing with 67 additions and 64 deletions.
  1. +3 −3 drools-compiler/src/main/java/org/drools/cdi/KieCDIExtension.java
  2. +3 −3 drools-compiler/src/main/java/org/drools/kproject/models/KieBaseModelImpl.java
  3. +2 −2 drools-compiler/src/main/java/org/drools/kproject/models/KieModuleModelImpl.java
  4. +4 −4 drools-compiler/src/main/java/org/drools/kproject/models/KieSessionModelImpl.java
  5. +2 −2 drools-compiler/src/main/java/org/drools/kproject/models/ListenerModelImpl.java
  6. +1 −1 drools-compiler/src/main/java/org/drools/kproject/models/QualifierModelImpl.java
  7. +2 −2 drools-compiler/src/main/java/org/drools/kproject/models/WorkItemHandlerModelImpl.java
  8. +2 −2 drools-compiler/src/main/java/org/kie/builder/impl/AbstractKieModule.java
  9. +3 −3 drools-compiler/src/main/java/org/kie/builder/impl/AbstractKieProject.java
  10. +1 −1 drools-compiler/src/main/java/org/kie/builder/impl/ClasspathKieProject.java
  11. +1 −1 drools-compiler/src/main/java/org/kie/builder/impl/FileKieModule.java
  12. +1 −1 drools-compiler/src/main/java/org/kie/builder/impl/InternalKieModule.java
  13. +3 −3 drools-compiler/src/main/java/org/kie/builder/impl/KieBuilderImpl.java
  14. +1 −1 drools-compiler/src/main/java/org/kie/builder/impl/KieBuilderSetImpl.java
  15. +2 −2 drools-compiler/src/main/java/org/kie/builder/impl/KieContainerImpl.java
  16. +2 −2 drools-compiler/src/main/java/org/kie/builder/impl/KieProject.java
  17. +1 −1 drools-compiler/src/main/java/org/kie/builder/impl/KieServicesImpl.java
  18. +1 −1 drools-compiler/src/main/java/org/kie/builder/impl/MemoryKieModule.java
  19. +1 −1 drools-compiler/src/main/java/org/kie/builder/impl/ZipKieModule.java
  20. +4 −4 drools-compiler/src/main/java/org/kie/util/CDIHelper.java
  21. +2 −2 drools-compiler/src/test/java/org/drools/builder/KieBuilderTest.java
  22. +4 −4 drools-compiler/src/test/java/org/drools/integrationtests/KieHelloWorldTest.java
  23. +4 −4 drools-compiler/src/test/java/org/drools/kproject/AbstractKnowledgeTest.java
  24. +6 −6 drools-compiler/src/test/java/org/drools/kproject/KieModuleModelTest.java
  25. +1 −1 drools-compiler/src/test/java/org/drools/kproject/KieProjectRuntimeModulesTest.java
  26. +3 −0 drools-compiler/src/test/java/org/kie/builder/WireListenerTest.java
  27. +4 −4 drools-compiler/src/test/java/org/kie/util/ChangeSetBuilderTest.java
  28. +3 −3 kie-ci/src/test/java/org/kie/scanner/AbstractKieCiTest.java
View
6 drools-compiler/src/main/java/org/drools/cdi/KieCDIExtension.java
@@ -28,9 +28,9 @@
import org.drools.kproject.models.KieSessionModelImpl;
import org.kie.KieBase;
import org.kie.KieServices;
-import org.kie.builder.KieBaseModel;
-import org.kie.builder.KieSessionModel;
-import org.kie.builder.KieSessionModel.KieSessionType;
+import org.kie.builder.model.KieBaseModel;
+import org.kie.builder.model.KieSessionModel;
+import org.kie.builder.model.KieSessionModel.KieSessionType;
import org.kie.builder.ReleaseId;
import org.kie.builder.impl.InternalKieModule;
import org.kie.builder.impl.KieContainerImpl;
View
6 drools-compiler/src/main/java/org/drools/kproject/models/KieBaseModelImpl.java
@@ -6,9 +6,9 @@
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import org.drools.core.util.AbstractXStreamConverter;
import org.drools.core.util.Predicate;
-import org.kie.builder.KieBaseModel;
-import org.kie.builder.KieModuleModel;
-import org.kie.builder.KieSessionModel;
+import org.kie.builder.model.KieBaseModel;
+import org.kie.builder.model.KieModuleModel;
+import org.kie.builder.model.KieSessionModel;
import org.kie.conf.EqualityBehaviorOption;
import org.kie.conf.EventProcessingOption;
import org.kie.io.ResourceType;
View
4 drools-compiler/src/main/java/org/drools/kproject/models/KieModuleModelImpl.java
@@ -7,8 +7,8 @@
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.io.xml.DomDriver;
import org.drools.core.util.AbstractXStreamConverter;
-import org.kie.builder.KieBaseModel;
-import org.kie.builder.KieModuleModel;
+import org.kie.builder.model.KieBaseModel;
+import org.kie.builder.model.KieModuleModel;
import org.xml.sax.SAXException;
import javax.xml.transform.Source;
View
8 drools-compiler/src/main/java/org/drools/kproject/models/KieSessionModelImpl.java
@@ -5,10 +5,10 @@
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import org.drools.core.util.AbstractXStreamConverter;
-import org.kie.builder.KieBaseModel;
-import org.kie.builder.KieSessionModel;
-import org.kie.builder.ListenerModel;
-import org.kie.builder.WorkItemHandlerModel;
+import org.kie.builder.model.KieBaseModel;
+import org.kie.builder.model.KieSessionModel;
+import org.kie.builder.model.ListenerModel;
+import org.kie.builder.model.WorkItemHandlerModel;
import org.kie.runtime.conf.ClockTypeOption;
import java.util.ArrayList;
View
4 drools-compiler/src/main/java/org/drools/kproject/models/ListenerModelImpl.java
@@ -1,8 +1,8 @@
package org.drools.kproject.models;
import org.drools.core.util.AbstractXStreamConverter;
-import org.kie.builder.ListenerModel;
-import org.kie.builder.QualifierModel;
+import org.kie.builder.model.ListenerModel;
+import org.kie.builder.model.QualifierModel;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
View
2 drools-compiler/src/main/java/org/drools/kproject/models/QualifierModelImpl.java
@@ -4,7 +4,7 @@
import java.util.Map;
import org.drools.core.util.AbstractXStreamConverter;
-import org.kie.builder.QualifierModel;
+import org.kie.builder.model.QualifierModel;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
View
4 drools-compiler/src/main/java/org/drools/kproject/models/WorkItemHandlerModelImpl.java
@@ -1,8 +1,8 @@
package org.drools.kproject.models;
import org.drools.core.util.AbstractXStreamConverter;
-import org.kie.builder.QualifierModel;
-import org.kie.builder.WorkItemHandlerModel;
+import org.kie.builder.model.QualifierModel;
+import org.kie.builder.model.WorkItemHandlerModel;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
View
4 drools-compiler/src/main/java/org/kie/builder/impl/AbstractKieModule.java
@@ -4,8 +4,8 @@
import org.drools.core.util.StringUtils;
import org.drools.kproject.models.KieBaseModelImpl;
import org.kie.builder.CompositeKnowledgeBuilder;
-import org.kie.builder.KieBaseModel;
-import org.kie.builder.KieModuleModel;
+import org.kie.builder.model.KieBaseModel;
+import org.kie.builder.model.KieModuleModel;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderError;
import org.kie.builder.KnowledgeBuilderFactory;
View
6 drools-compiler/src/main/java/org/kie/builder/impl/AbstractKieProject.java
@@ -3,9 +3,9 @@
import org.drools.kproject.models.KieBaseModelImpl;
import org.drools.kproject.models.KieSessionModelImpl;
import org.kie.builder.ReleaseId;
-import org.kie.builder.KieBaseModel;
-import org.kie.builder.KieModuleModel;
-import org.kie.builder.KieSessionModel;
+import org.kie.builder.model.KieBaseModel;
+import org.kie.builder.model.KieModuleModel;
+import org.kie.builder.model.KieSessionModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
View
2 drools-compiler/src/main/java/org/kie/builder/impl/ClasspathKieProject.java
@@ -7,7 +7,7 @@
import org.drools.xml.PomModel;
import org.kie.KieServices;
import org.kie.builder.ReleaseId;
-import org.kie.builder.KieModuleModel;
+import org.kie.builder.model.KieModuleModel;
import org.kie.builder.KieRepository;
import org.kie.internal.utils.ClassLoaderUtil;
import org.kie.internal.utils.CompositeClassLoader;
View
2 drools-compiler/src/main/java/org/kie/builder/impl/FileKieModule.java
@@ -9,7 +9,7 @@
import org.drools.core.util.IoUtils;
import org.kie.builder.ReleaseId;
-import org.kie.builder.KieModuleModel;
+import org.kie.builder.model.KieModuleModel;
public class FileKieModule extends AbstractKieModule implements InternalKieModule {
private final File file;
View
2 drools-compiler/src/main/java/org/kie/builder/impl/InternalKieModule.java
@@ -3,7 +3,7 @@
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.ReleaseId;
import org.kie.builder.KieModule;
-import org.kie.builder.KieModuleModel;
+import org.kie.builder.model.KieModuleModel;
import org.kie.builder.Results;
import org.kie.definition.KnowledgePackage;
View
6 drools-compiler/src/main/java/org/kie/builder/impl/KieBuilderImpl.java
@@ -19,13 +19,13 @@
import org.kie.KieServices;
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.InternalKieBuilder;
-import org.kie.builder.KieBaseModel;
+import org.kie.builder.model.KieBaseModel;
import org.kie.builder.KieBuilder;
import org.kie.builder.KieBuilderSet;
import org.kie.builder.KieFileSystem;
import org.kie.builder.KieModule;
-import org.kie.builder.KieModuleModel;
-import org.kie.builder.KieSessionModel;
+import org.kie.builder.model.KieModuleModel;
+import org.kie.builder.model.KieSessionModel;
import org.kie.builder.Message.Level;
import org.kie.builder.ReleaseId;
import org.kie.builder.Results;
View
2 drools-compiler/src/main/java/org/kie/builder/impl/KieBuilderSetImpl.java
@@ -6,7 +6,7 @@
import org.kie.KieServices;
import org.kie.builder.CompositeKnowledgeBuilder;
import org.kie.builder.IncrementalResults;
-import org.kie.builder.KieBaseModel;
+import org.kie.builder.model.KieBaseModel;
import org.kie.builder.KieBuilderSet;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderError;
View
4 drools-compiler/src/main/java/org/kie/builder/impl/KieContainerImpl.java
@@ -8,10 +8,10 @@
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.ReleaseId;
-import org.kie.builder.KieBaseModel;
+import org.kie.builder.model.KieBaseModel;
import org.kie.builder.KieModule;
import org.kie.builder.KieRepository;
-import org.kie.builder.KieSessionModel;
+import org.kie.builder.model.KieSessionModel;
import org.kie.builder.Results;
import org.kie.builder.Message.Level;
import org.kie.definition.KnowledgePackage;
View
4 drools-compiler/src/main/java/org/kie/builder/impl/KieProject.java
@@ -1,8 +1,8 @@
package org.kie.builder.impl;
import org.kie.builder.ReleaseId;
-import org.kie.builder.KieBaseModel;
-import org.kie.builder.KieSessionModel;
+import org.kie.builder.model.KieBaseModel;
+import org.kie.builder.model.KieSessionModel;
import org.kie.internal.utils.CompositeClassLoader;
public interface KieProject {
View
2 drools-compiler/src/main/java/org/kie/builder/impl/KieServicesImpl.java
@@ -11,7 +11,7 @@
import org.kie.builder.ReleaseId;
import org.kie.builder.KieBuilder;
import org.kie.builder.KieFileSystem;
-import org.kie.builder.KieModuleModel;
+import org.kie.builder.model.KieModuleModel;
import org.kie.builder.KieRepository;
import org.kie.builder.KieScanner;
import org.kie.command.KieCommands;
View
2 drools-compiler/src/main/java/org/kie/builder/impl/MemoryKieModule.java
@@ -4,7 +4,7 @@
import org.drools.compiler.io.memory.MemoryFileSystem;
import org.drools.kproject.models.KieModuleModelImpl;
import org.kie.builder.ReleaseId;
-import org.kie.builder.KieModuleModel;
+import org.kie.builder.model.KieModuleModel;
import java.io.File;
import java.util.Collection;
View
2 drools-compiler/src/main/java/org/kie/builder/impl/ZipKieModule.java
@@ -3,7 +3,7 @@
import org.drools.core.util.IoUtils;
import org.drools.kproject.models.KieModuleModelImpl;
import org.kie.builder.ReleaseId;
-import org.kie.builder.KieModuleModel;
+import org.kie.builder.model.KieModuleModel;
import java.io.File;
import java.io.IOException;
View
8 drools-compiler/src/main/java/org/kie/util/CDIHelper.java
@@ -8,10 +8,10 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.kie.builder.KieSessionModel;
-import org.kie.builder.ListenerModel;
-import org.kie.builder.QualifierModel;
-import org.kie.builder.WorkItemHandlerModel;
+import org.kie.builder.model.KieSessionModel;
+import org.kie.builder.model.ListenerModel;
+import org.kie.builder.model.QualifierModel;
+import org.kie.builder.model.WorkItemHandlerModel;
import org.kie.event.process.ProcessEventListener;
import org.kie.event.rule.AgendaEventListener;
import org.kie.event.rule.WorkingMemoryEventListener;
View
4 drools-compiler/src/test/java/org/drools/builder/KieBuilderTest.java
@@ -10,11 +10,11 @@
import org.junit.Test;
import org.kie.KieBase;
import org.kie.KieServices;
-import org.kie.builder.KieBaseModel;
+import org.kie.builder.model.KieBaseModel;
import org.kie.builder.KieBuilder;
import org.kie.builder.KieFileSystem;
import org.kie.builder.KieModule;
-import org.kie.builder.KieModuleModel;
+import org.kie.builder.model.KieModuleModel;
import org.kie.builder.KieRepository;
import org.kie.builder.Message.Level;
import org.kie.builder.ReleaseId;
View
8 drools-compiler/src/test/java/org/drools/integrationtests/KieHelloWorldTest.java
@@ -5,12 +5,12 @@
import org.junit.Test;
import org.kie.KieServices;
import org.kie.builder.ReleaseId;
-import org.kie.builder.KieBaseModel;
+import org.kie.builder.model.KieBaseModel;
import org.kie.builder.KieBuilder;
import org.kie.builder.KieFileSystem;
-import org.kie.builder.KieModuleModel;
-import org.kie.builder.KieSessionModel;
-import org.kie.builder.KieSessionModel.KieSessionType;
+import org.kie.builder.model.KieModuleModel;
+import org.kie.builder.model.KieSessionModel;
+import org.kie.builder.model.KieSessionModel.KieSessionType;
import org.kie.conf.EqualityBehaviorOption;
import org.kie.conf.EventProcessingOption;
import org.kie.runtime.KieSession;
View
8 drools-compiler/src/test/java/org/drools/kproject/AbstractKnowledgeTest.java
@@ -13,11 +13,11 @@
import org.junit.After;
import org.junit.Before;
import org.kie.builder.ReleaseId;
-import org.kie.builder.KieBaseModel;
+import org.kie.builder.model.KieBaseModel;
import org.kie.builder.KieBuilder;
-import org.kie.builder.KieModuleModel;
-import org.kie.builder.KieSessionModel;
-import org.kie.builder.KieSessionModel.KieSessionType;
+import org.kie.builder.model.KieModuleModel;
+import org.kie.builder.model.KieSessionModel;
+import org.kie.builder.model.KieSessionModel.KieSessionType;
import org.kie.builder.Message.Level;
import org.kie.builder.impl.KieFileSystemImpl;
import org.kie.builder.impl.MemoryKieModule;
View
12 drools-compiler/src/test/java/org/drools/kproject/KieModuleModelTest.java
@@ -4,12 +4,12 @@
import org.drools.kproject.models.KieSessionModelImpl;
import org.junit.Test;
import org.kie.KieServices;
-import org.kie.builder.KieBaseModel;
-import org.kie.builder.KieModuleModel;
-import org.kie.builder.KieSessionModel;
-import org.kie.builder.KieSessionModel.KieSessionType;
-import org.kie.builder.ListenerModel;
-import org.kie.builder.WorkItemHandlerModel;
+import org.kie.builder.model.KieBaseModel;
+import org.kie.builder.model.KieModuleModel;
+import org.kie.builder.model.KieSessionModel;
+import org.kie.builder.model.KieSessionModel.KieSessionType;
+import org.kie.builder.model.ListenerModel;
+import org.kie.builder.model.WorkItemHandlerModel;
import org.kie.conf.EqualityBehaviorOption;
import org.kie.conf.EventProcessingOption;
import org.kie.runtime.conf.ClockTypeOption;
View
2 drools-compiler/src/test/java/org/drools/kproject/KieProjectRuntimeModulesTest.java
@@ -6,7 +6,7 @@
import org.kie.KieBase;
import org.kie.KieServices;
import org.kie.builder.ReleaseId;
-import org.kie.builder.KieModuleModel;
+import org.kie.builder.model.KieModuleModel;
import org.kie.builder.impl.FileKieModule;
import org.kie.builder.impl.KieContainerImpl;
import org.kie.builder.impl.KieModuleKieProject;
View
3 drools-compiler/src/test/java/org/kie/builder/WireListenerTest.java
@@ -2,6 +2,9 @@
import org.junit.Test;
import org.kie.KieServices;
+import org.kie.builder.model.KieModuleModel;
+import org.kie.builder.model.KieSessionModel;
+import org.kie.builder.model.ListenerModel;
import org.kie.event.rule.ObjectDeletedEvent;
import org.kie.event.rule.ObjectInsertedEvent;
import org.kie.event.rule.ObjectUpdatedEvent;
View
8 drools-compiler/src/test/java/org/kie/util/ChangeSetBuilderTest.java
@@ -4,10 +4,10 @@
import org.junit.Test;
import org.kie.KieServices;
import org.kie.builder.ReleaseId;
-import org.kie.builder.KieBaseModel;
-import org.kie.builder.KieModuleModel;
-import org.kie.builder.KieSessionModel;
-import org.kie.builder.KieSessionModel.KieSessionType;
+import org.kie.builder.model.KieBaseModel;
+import org.kie.builder.model.KieModuleModel;
+import org.kie.builder.model.KieSessionModel;
+import org.kie.builder.model.KieSessionModel.KieSessionType;
import org.kie.builder.impl.InternalKieModule;
import org.kie.conf.EqualityBehaviorOption;
import org.kie.conf.EventProcessingOption;
View
6 kie-ci/src/test/java/org/kie/scanner/AbstractKieCiTest.java
@@ -1,11 +1,11 @@
package org.kie.scanner;
import org.kie.KieServices;
-import org.kie.builder.KieBaseModel;
+import org.kie.builder.model.KieBaseModel;
import org.kie.builder.KieBuilder;
import org.kie.builder.KieFileSystem;
-import org.kie.builder.KieModuleModel;
-import org.kie.builder.KieSessionModel;
+import org.kie.builder.model.KieModuleModel;
+import org.kie.builder.model.KieSessionModel;
import org.kie.builder.ReleaseId;
import org.kie.builder.impl.InternalKieModule;
import org.kie.conf.EqualityBehaviorOption;

0 comments on commit 668cdfd

Please sign in to comment.