[jboss-svn-commits] JBL Code SVN: r35988 - in labs/jbossrules/trunk/drools-container/drools-spring/src: main/java/org/drools/container/spring/beans/persistence and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 16 05:42:15 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-11-16 05:42:15 -0500 (Tue, 16 Nov 2010)
New Revision: 35988
Modified:
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/GridBeanFactory.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/GridNodeBeanFactory.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/StatefulKnowledgeSessionBeanFactory.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringJpaManager.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringTransactionManager.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/GridDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockAccumulateFunction.java
labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsGridTest.java
labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java
labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/VariablePersistenceStrategyTest.java
labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/timer/MyDroolsBean.java
labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/timer/TimerFlowTest.java
Log:
JBRULES-2746 Drools Grid Impl2
-cleanup imports
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/GridBeanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/GridBeanFactory.java 2010-11-16 10:31:41 UTC (rev 35987)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/GridBeanFactory.java 2010-11-16 10:42:15 UTC (rev 35988)
@@ -24,8 +24,6 @@
import org.drools.SystemEventListenerFactory;
import org.drools.container.spring.beans.StatefulKnowledgeSessionBeanFactory.JpaConfiguration;
import org.drools.grid.Grid;
-import org.drools.grid.GridConnection;
-import org.drools.grid.SocketService;
import org.drools.grid.conf.GridPeerServiceConfiguration;
import org.drools.grid.conf.impl.GridPeerConfiguration;
import org.drools.grid.impl.GridImpl;
@@ -35,12 +33,9 @@
import org.drools.grid.remote.mina.MinaAcceptorFactoryService;
import org.drools.grid.service.directory.WhitePages;
import org.drools.grid.service.directory.impl.CoreServicesLookupConfiguration;
-import org.drools.grid.service.directory.impl.WhitePagesImpl;
import org.drools.grid.service.directory.impl.WhitePagesLocalConfiguration;
-import org.mvel2.optimizers.impl.refl.nodes.ArrayLength;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
-import org.springframework.util.StringUtils;
/**
*
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/GridNodeBeanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/GridNodeBeanFactory.java 2010-11-16 10:31:41 UTC (rev 35987)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/GridNodeBeanFactory.java 2010-11-16 10:42:15 UTC (rev 35988)
@@ -19,7 +19,6 @@
import java.util.HashMap;
import org.drools.grid.Grid;
-import org.drools.grid.GridConnection;
import org.drools.grid.GridNode;
import org.drools.grid.SocketService;
import org.drools.grid.impl.GridImpl;
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java 2010-11-16 10:31:41 UTC (rev 35987)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java 2010-11-16 10:42:15 UTC (rev 35988)
@@ -36,9 +36,7 @@
import org.drools.builder.conf.EvaluatorOption;
import org.drools.builder.conf.impl.JaxbConfigurationImpl;
import org.drools.compiler.PackageBuilderConfiguration;
-import org.drools.grid.GridConnection;
import org.drools.grid.GridNode;
-import org.drools.grid.impl.GridImpl;
import org.drools.grid.impl.GridNodeImpl;
import org.drools.impl.KnowledgeBaseImpl;
import org.springframework.beans.factory.FactoryBean;
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/StatefulKnowledgeSessionBeanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/StatefulKnowledgeSessionBeanFactory.java 2010-11-16 10:31:41 UTC (rev 35987)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/StatefulKnowledgeSessionBeanFactory.java 2010-11-16 10:42:15 UTC (rev 35988)
@@ -23,8 +23,6 @@
import org.drools.KnowledgeBaseFactory;
import org.drools.SessionConfiguration;
import org.drools.command.Command;
-import org.drools.command.runtime.GetIdCommand;
-import org.drools.core.util.StringUtils;
import org.drools.marshalling.ObjectMarshallingStrategy;
import org.drools.marshalling.impl.ClassObjectMarshallingStrategyAcceptor;
import org.drools.marshalling.impl.SerializablePlaceholderResolverStrategy;
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringJpaManager.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringJpaManager.java 2010-11-16 10:31:41 UTC (rev 35987)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringJpaManager.java 2010-11-16 10:42:15 UTC (rev 35988)
@@ -22,10 +22,10 @@
import org.drools.persistence.session.JpaManager;
import org.drools.runtime.Environment;
import org.drools.runtime.EnvironmentName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.orm.jpa.EntityManagerHolder;
import org.springframework.transaction.support.TransactionSynchronizationManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
*
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringTransactionManager.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringTransactionManager.java 2010-11-16 10:31:41 UTC (rev 35987)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringTransactionManager.java 2010-11-16 10:42:15 UTC (rev 35988)
@@ -18,13 +18,13 @@
import org.drools.persistence.session.TransactionManager;
import org.drools.persistence.session.TransactionSynchronization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.AbstractPlatformTransactionManager;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.transaction.support.TransactionSynchronizationManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
*
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/GridDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/GridDefinitionParser.java 2010-11-16 10:31:41 UTC (rev 35987)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/GridDefinitionParser.java 2010-11-16 10:42:15 UTC (rev 35988)
@@ -17,20 +17,13 @@
package org.drools.container.spring.namespace;
import java.net.InetAddress;
-import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
-import org.drools.SystemEventListenerFactory;
-import org.drools.command.runtime.SetGlobalCommand;
-import org.drools.command.runtime.rule.InsertObjectCommand;
import org.drools.container.spring.beans.GridBeanFactory;
import org.drools.container.spring.beans.GridBeanFactory.SocketServiceConfiguration;
-import org.drools.container.spring.beans.StatefulKnowledgeSessionBeanFactory.JpaConfiguration;
-import org.drools.grid.impl.MultiplexSocketServerImpl;
import org.drools.grid.io.AcceptorFactoryService;
-import org.drools.grid.io.impl.MultiplexSocketServiceCongifuration;
import org.drools.grid.remote.mina.MinaAcceptorFactoryService;
import org.drools.grid.service.directory.impl.JpaWhitePages;
import org.drools.grid.service.directory.impl.WhitePagesImpl;
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockAccumulateFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockAccumulateFunction.java 2010-11-16 10:31:41 UTC (rev 35987)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockAccumulateFunction.java 2010-11-16 10:42:15 UTC (rev 35988)
@@ -20,6 +20,7 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.Serializable;
+
import org.drools.base.accumulators.AccumulateFunction;
public class MockAccumulateFunction implements AccumulateFunction {
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsGridTest.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsGridTest.java 2010-11-16 10:31:41 UTC (rev 35987)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsGridTest.java 2010-11-16 10:42:15 UTC (rev 35988)
@@ -16,10 +16,7 @@
package org.drools.container.spring;
-import static org.junit.Assert.fail;
-
import java.io.Serializable;
-import java.util.HashMap;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
@@ -33,15 +30,12 @@
import org.drools.builder.KnowledgeBuilderErrors;
import org.drools.builder.KnowledgeBuilderFactoryService;
import org.drools.builder.ResourceType;
-import org.drools.container.spring.beans.persistence.JPASingleSessionCommandServiceFactoryTest;
import org.drools.grid.ConnectionFactoryService;
import org.drools.grid.Grid;
import org.drools.grid.GridConnection;
import org.drools.grid.GridNode;
import org.drools.grid.GridServiceDescription;
import org.drools.grid.SocketService;
-import org.drools.grid.NodeTests.MyObject;
-import org.drools.grid.impl.GridImpl;
import org.drools.grid.service.directory.WhitePages;
import org.drools.grid.service.directory.impl.JpaWhitePages;
import org.drools.grid.service.directory.impl.WhitePagesClient;
@@ -49,13 +43,7 @@
import org.drools.io.impl.ByteArrayResource;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.rule.FactHandle;
-import org.h2.tools.DeleteDbFiles;
-import org.h2.tools.Server;
-import org.junit.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringDroolsGridTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java 2010-11-16 10:31:41 UTC (rev 35987)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java 2010-11-16 10:42:15 UTC (rev 35988)
@@ -31,7 +31,6 @@
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactory;
import org.drools.compiler.PackageBuilder;
-import org.drools.compiler.ProcessBuilder;
import org.drools.compiler.ProcessBuilderImpl;
import org.drools.core.util.DroolsStreamUtils;
import org.drools.persistence.jpa.KnowledgeStoreService;
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/VariablePersistenceStrategyTest.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/VariablePersistenceStrategyTest.java 2010-11-16 10:31:41 UTC (rev 35987)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/VariablePersistenceStrategyTest.java 2010-11-16 10:42:15 UTC (rev 35988)
@@ -16,12 +16,6 @@
package org.drools.container.spring.beans.persistence;
-import javax.naming.NamingException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.SystemException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -31,11 +25,15 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import javax.naming.InitialContext;
-import javax.persistence.EntityManager;
+import javax.naming.NamingException;
+import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
-import javax.transaction.UserTransaction;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactory;
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/timer/MyDroolsBean.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/timer/MyDroolsBean.java 2010-11-16 10:31:41 UTC (rev 35987)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/timer/MyDroolsBean.java 2010-11-16 10:42:15 UTC (rev 35988)
@@ -7,14 +7,12 @@
import org.drools.KnowledgeBaseFactory;
import org.drools.base.MapGlobalResolver;
import org.drools.persistence.jpa.KnowledgeStoreService;
-
import org.drools.runtime.Environment;
import org.drools.runtime.EnvironmentName;
import org.drools.runtime.StatefulKnowledgeSession;
+import org.slf4j.LoggerFactory;
import org.springframework.orm.jpa.JpaTransactionManager;
-import org.slf4j.LoggerFactory;
-
public class MyDroolsBean {
public static int TIMER_TRIGGER_COUNT;
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/timer/TimerFlowTest.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/timer/TimerFlowTest.java 2010-11-16 10:31:41 UTC (rev 35987)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/timer/TimerFlowTest.java 2010-11-16 10:42:15 UTC (rev 35988)
@@ -1,17 +1,18 @@
package org.drools.container.spring.timer;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.util.Properties;
-import static org.junit.Assert.*;
+
import org.junit.Before;
-
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class TimerFlowTest {
private static final Logger log = LoggerFactory.getLogger( TimerFlowTest.class );
More information about the jboss-svn-commits
mailing list