[jboss-svn-commits] JBL Code SVN: r34039 - in labs/jbossrules/trunk: drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 19 13:18:33 EDT 2010
Author: baunax
Date: 2010-07-19 13:18:32 -0400 (Mon, 19 Jul 2010)
New Revision: 34039
Modified:
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/AbstractKnowledgeSessionBeanFactory.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/DroolsSpringTransactionManager.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/JPAKnowledgeServiceBean.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ExecutionNodeDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeAgentDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeSessionDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeStoreDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceChangeScannerDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceDefinitionParser.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/XsdParser.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java
Log:
Merge branch 'springTX'
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/AbstractKnowledgeSessionBeanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/AbstractKnowledgeSessionBeanFactory.java 2010-07-19 17:11:05 UTC (rev 34038)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/AbstractKnowledgeSessionBeanFactory.java 2010-07-19 17:18:32 UTC (rev 34039)
@@ -4,7 +4,6 @@
import java.util.Map;
import org.drools.KnowledgeBase;
-import org.drools.SessionConfiguration;
import org.drools.builder.DirectoryLookupFactoryService;
import org.drools.command.Command;
import org.drools.grid.ExecutionNode;
@@ -30,7 +29,7 @@
private String beanName;
private String name;
- private List<Command> script;
+ private List<Command<?>> script;
public AbstractKnowledgeSessionBeanFactory() {
super();
@@ -76,11 +75,11 @@
return true;
}
- public List<Command> getScript() {
+ public List<Command<?>> getScript() {
return script;
}
- public void setScript(List<Command> commands) {
+ public void setScript(List<Command<?>> commands) {
this.script = commands;
}
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-07-19 17:11:05 UTC (rev 34038)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java 2010-07-19 17:18:32 UTC (rev 34039)
@@ -116,7 +116,7 @@
kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
KnowledgeBaseImpl kbaseImpl = ( KnowledgeBaseImpl ) kbase;
- kbaseImpl.jaxbClasses = new ArrayList();
+ kbaseImpl.jaxbClasses = new ArrayList<List<String>>();
for ( JaxbConfigurationImpl conf : xsds ) {
kbaseImpl.jaxbClasses.add( conf.getClasses() );
}
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-07-19 17:11:05 UTC (rev 34038)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/StatefulKnowledgeSessionBeanFactory.java 2010-07-19 17:18:32 UTC (rev 34039)
@@ -79,7 +79,7 @@
}
if ( getScript() != null && !getScript().isEmpty()) {
- for ( Command cmd : getScript() ) {
+ for ( Command<?> cmd : getScript() ) {
ksession.execute( cmd );
}
}
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-07-19 17:11:05 UTC (rev 34038)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringTransactionManager.java 2010-07-19 17:18:32 UTC (rev 34039)
@@ -1,12 +1,7 @@
package org.drools.container.spring.beans.persistence;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-
import org.drools.persistence.session.TransactionManager;
import org.drools.persistence.session.TransactionSynchronization;
-import org.springframework.orm.jpa.EntityManagerFactoryUtils;
-import org.springframework.orm.jpa.EntityManagerHolder;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.AbstractPlatformTransactionManager;
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/JPAKnowledgeServiceBean.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/JPAKnowledgeServiceBean.java 2010-07-19 17:11:05 UTC (rev 34038)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/JPAKnowledgeServiceBean.java 2010-07-19 17:18:32 UTC (rev 34039)
@@ -8,12 +8,10 @@
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactoryService;
-import org.drools.RuntimeDroolsException;
import org.drools.base.MapGlobalResolver;
import org.drools.builder.JPAKnowledgeFactoryService;
import org.drools.grid.ExecutionNode;
import org.drools.grid.local.LocalConnection;
-import org.drools.persistence.jpa.grid.JPAKnowledgeProviderLocalClient;
import org.drools.persistence.processinstance.VariablePersistenceStrategyFactory;
import org.drools.persistence.processinstance.persisters.VariablePersister;
import org.drools.runtime.Environment;
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ExecutionNodeDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ExecutionNodeDefinitionParser.java 2010-07-19 17:11:05 UTC (rev 34038)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ExecutionNodeDefinitionParser.java 2010-07-19 17:18:32 UTC (rev 34039)
@@ -1,7 +1,5 @@
package org.drools.container.spring.namespace;
-import static org.drools.container.spring.namespace.DefinitionParserHelper.emptyAttributeCheck;
-
import org.drools.container.spring.beans.ExecutionNodeBeanFactory;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeAgentDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeAgentDefinitionParser.java 2010-07-19 17:11:05 UTC (rev 34038)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeAgentDefinitionParser.java 2010-07-19 17:18:32 UTC (rev 34039)
@@ -2,7 +2,6 @@
import static org.drools.container.spring.namespace.DefinitionParserHelper.emptyAttributeCheck;
-import org.drools.container.spring.beans.ExecutionNodeBeanFactory;
import org.drools.container.spring.beans.KnowledgeAgentBeanFactory;
import org.drools.container.spring.beans.StatelessKnowledgeSessionBeanFactory;
import org.springframework.beans.PropertyValue;
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java 2010-07-19 17:11:05 UTC (rev 34038)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java 2010-07-19 17:18:32 UTC (rev 34039)
@@ -125,7 +125,8 @@
return factory.getBeanDefinition();
}
- public static ManagedList getResources(Element element,
+ @SuppressWarnings("unchecked")
+ public static ManagedList getResources(Element element,
ParserContext parserContext,
BeanDefinitionBuilder factory) {
Element resourcesElm = DomUtils.getChildElementByTagName( element,
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeSessionDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeSessionDefinitionParser.java 2010-07-19 17:11:05 UTC (rev 34038)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeSessionDefinitionParser.java 2010-07-19 17:18:32 UTC (rev 34039)
@@ -5,22 +5,17 @@
import java.util.List;
import org.drools.ClockType;
-import org.drools.RuleBaseConfiguration;
import org.drools.SessionConfiguration;
-import org.drools.command.CommandFactory;
import org.drools.command.runtime.SetGlobalCommand;
import org.drools.command.runtime.process.SignalEventCommand;
import org.drools.command.runtime.process.StartProcessCommand;
import org.drools.command.runtime.rule.FireAllRulesCommand;
import org.drools.command.runtime.rule.FireUntilHaltCommand;
import org.drools.command.runtime.rule.InsertObjectCommand;
-import org.drools.conf.EventProcessingOption;
import org.drools.container.spring.beans.KnowledgeAgentBeanFactory;
-import org.drools.container.spring.beans.KnowledgeBaseBeanFactory;
import org.drools.container.spring.beans.StatefulKnowledgeSessionBeanFactory;
-import org.drools.container.spring.beans.StatelessKnowledgeSessionBeanFactory;
import org.drools.container.spring.beans.StatefulKnowledgeSessionBeanFactory.JpaConfiguration;
-import org.drools.runtime.conf.ClockTypeOption;
+import org.drools.container.spring.beans.StatelessKnowledgeSessionBeanFactory;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -55,7 +50,8 @@
private static final String WORK_ITEM = "work-item-handler";
- protected AbstractBeanDefinition parseInternal(Element element,
+ @SuppressWarnings("unchecked")
+ protected AbstractBeanDefinition parseInternal(Element element,
ParserContext parserContext) {
String id = element.getAttribute( "id" );
@@ -183,7 +179,7 @@
if ( StringUtils.hasText( ref ) ) {
beanBuilder.addConstructorArgReference( ref );
} else if ( nestedElm != null ) {
- beanBuilder.addConstructorArg( parserContext.getDelegate().parseBeanDefinitionElement( nestedElm ) );
+ beanBuilder.addConstructorArgValue( parserContext.getDelegate().parseBeanDefinitionElement( nestedElm ) );
} else {
throw new IllegalArgumentException( "insert-object must either specify a 'ref' attribute or have a nested bean" );
}
@@ -191,11 +187,11 @@
String ref = e.getAttribute( "ref" );
Element nestedElm = getFirstElement( e.getChildNodes() );
beanBuilder = BeanDefinitionBuilder.genericBeanDefinition( SetGlobalCommand.class );
- beanBuilder.addConstructorArg( e.getAttribute( "identifier" ) );
+ beanBuilder.addConstructorArgValue( e.getAttribute( "identifier" ) );
if ( StringUtils.hasText( ref ) ) {
beanBuilder.addConstructorArgReference( ref );
} else if ( nestedElm != null ) {
- beanBuilder.addConstructorArg( parserContext.getDelegate().parseBeanDefinitionElement( nestedElm ) );
+ beanBuilder.addConstructorArgValue( parserContext.getDelegate().parseBeanDefinitionElement( nestedElm ) );
} else {
throw new IllegalArgumentException( "set-global must either specify a 'ref' attribute or have a nested bean" );
}
@@ -214,7 +210,7 @@
if ( !StringUtils.hasText( processId ) ) {
throw new IllegalArgumentException( "start-process must specify a process-id" );
}
- beanBuilder.addConstructorArg( processId );
+ beanBuilder.addConstructorArgValue( processId );
List<Element> params = DomUtils.getChildElementsByTagName( e, "parameter" );
if ( !params.isEmpty() ) {
@@ -241,21 +237,24 @@
beanBuilder = BeanDefinitionBuilder.genericBeanDefinition( SignalEventCommand.class );
String processInstanceId = e.getAttribute( "process-instance-id" );
if ( StringUtils.hasText( processInstanceId ) ) {
- beanBuilder.addConstructorArg( processInstanceId );
+ beanBuilder.addConstructorArgValue( processInstanceId );
}
- beanBuilder.addConstructorArg( e.getAttribute( "event-type" ) );
+ beanBuilder.addConstructorArgValue( e.getAttribute( "event-type" ) );
String ref = e.getAttribute( "ref" );
Element nestedElm = getFirstElement( e.getChildNodes() );
if ( StringUtils.hasText( ref ) ) {
beanBuilder.addConstructorArgReference( ref );
} else if ( nestedElm != null ) {
- beanBuilder.addConstructorArg( parserContext.getDelegate().parseBeanDefinitionElement( nestedElm ) );
+ beanBuilder.addConstructorArgValue( parserContext.getDelegate().parseBeanDefinitionElement( nestedElm ) );
} else {
throw new IllegalArgumentException( "signal-event must either specify a 'ref' attribute or have a nested bean" );
}
}
+ if (beanBuilder == null) {
+ throw new IllegalStateException("Unknow element: " + e.getLocalName());
+ }
children.add( beanBuilder.getBeanDefinition() );
}
}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeStoreDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeStoreDefinitionParser.java 2010-07-19 17:11:05 UTC (rev 34038)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeStoreDefinitionParser.java 2010-07-19 17:18:32 UTC (rev 34039)
@@ -1,21 +1,14 @@
package org.drools.container.spring.namespace;
-import java.util.List;
-
-import org.drools.container.spring.beans.KnowledgeBaseBeanFactory;
import org.drools.container.spring.beans.KnowledgeStoreBeanFactory;
-import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.util.xml.DomUtils;
import org.w3c.dom.Element;
public class KnowledgeStoreDefinitionParser extends AbstractBeanDefinitionParser {
- @SuppressWarnings("unchecked")
@Override
protected AbstractBeanDefinition parseInternal(Element element,
ParserContext parserContext) {
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceChangeScannerDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceChangeScannerDefinitionParser.java 2010-07-19 17:11:05 UTC (rev 34038)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceChangeScannerDefinitionParser.java 2010-07-19 17:18:32 UTC (rev 34039)
@@ -1,6 +1,5 @@
package org.drools.container.spring.namespace;
-import org.drools.container.spring.beans.ConnectionBeanFactory;
import org.drools.container.spring.beans.ResourceChangeScannerBeanFactory;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceDefinitionParser.java 2010-07-19 17:11:05 UTC (rev 34038)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceDefinitionParser.java 2010-07-19 17:18:32 UTC (rev 34039)
@@ -1,12 +1,8 @@
package org.drools.container.spring.namespace;
-import static org.drools.container.spring.namespace.DefinitionParserHelper.emptyAttributeCheck;
-
import java.util.List;
import org.drools.builder.DecisionTableInputType;
-import org.drools.builder.JaxbConfiguration;
-import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.builder.ResourceType;
import org.drools.builder.conf.impl.DecisionTableConfigurationImpl;
import org.drools.container.spring.beans.DroolsResourceAdapter;
@@ -17,7 +13,6 @@
import org.springframework.util.StringUtils;
import org.springframework.util.xml.DomUtils;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
public class ResourceDefinitionParser extends AbstractBeanDefinitionParser {
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/XsdParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/XsdParser.java 2010-07-19 17:11:05 UTC (rev 34038)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/XsdParser.java 2010-07-19 17:18:32 UTC (rev 34039)
@@ -16,7 +16,8 @@
private static final String SYSTEM_ID = "system-id";
private static final String SCHEMA_LANGUAGE = "schema-language";
- public static void parse(Element element,
+ @SuppressWarnings("unchecked")
+ public static void parse(Element element,
ParserContext parserContext,
BeanDefinitionBuilder factory) {
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 2010-07-19 17:11:05 UTC (rev 34038)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java 2010-07-19 17:18:32 UTC (rev 34039)
@@ -68,7 +68,7 @@
public RuleBase ruleBase;
// This is just a hack, so spring can find the list of generated classes
- public List jaxbClasses;
+ public List<List<String>> jaxbClasses;
public Map<KnowledgeBaseEventListener, KnowledgeBaseEventListenerWrapper> mappedKnowledgeBaseListeners;
More information about the jboss-svn-commits
mailing list