[jboss-svn-commits] JBL Code SVN: r35990 - in labs/jbossrules/trunk: drools-camel/src/main/java/org/drools/jax/rs and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 16 05:47:49 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-11-16 05:47:46 -0500 (Tue, 16 Nov 2010)
New Revision: 35990
Modified:
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsComponent.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsEndpoint.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsPolicy.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsProducer.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/ExecutionNodePipelineContextImpl.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/FastCloner.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/PostCxfrs.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/PreCxfrs.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/XStreamHelper.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/XStreamJson.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/XStreamXml.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/rs/CommandExecutorImpl.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/rs/CommandMessageBodyReader.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PostCxfSoapProcessor.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PostCxfTransportSoapProcessor.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PreCxfSoapProcessor.java
labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PreCxfTransportSoapProcessor.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/ChangeCollector.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/Cheese.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/ObjectFactory.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/Person.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/TestVariable.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/BatchTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxWrapperCollectionTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbXSDModelTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelProxyEndpointTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/JSonBatchExecutionTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/JaxbTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/cxf/CxfRestTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/cxf/CxfSoapTest.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/pipeline/camel/ObjectFactory.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/pipeline/camel/Person.java
labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/pipeline/camel/WrappedList.java
labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/DroolsResourceAdapter.java
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/KnowledgeAgentBeanFactory.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/ResourceChangeScannerBeanFactory.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/StatelessKnowledgeSessionBeanFactory.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/beans/persistence/SpringTransactionSynchronizationAdapter.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/main/java/org/drools/container/spring/namespace/GridNodeDefinitionParser.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/SpringDroolsHandler.java
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/test/java/org/drools/container/spring/MockAccumulateFunction.java
labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockConsequenceExceptionHandler.java
labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockEvaluatorDefinition.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/SpringDroolsTest.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/TestWorkItemHandler.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 and format code
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsComponent.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsComponent.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsComponent.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -31,37 +31,40 @@
package org.drools.camel.component;
-import java.net.URI;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultComponent;
-
public class DroolsComponent extends DefaultComponent {
// Property name *must* follow the Camel conventions (see org.apache.camel.Exchange)
- public static final String DROOLS_LOOKUP = "DroolsLookup";
+ public static final String DROOLS_LOOKUP = "DroolsLookup";
public DroolsComponent() {
}
public DroolsComponent(CamelContext context) {
- super(context);
+ super( context );
}
@Override
- protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+ protected Endpoint createEndpoint(String uri,
+ String remaining,
+ Map<String, Object> parameters) throws Exception {
Endpoint endpoint;
- endpoint = new DroolsEndpoint(uri, remaining, this);
- setProperties(endpoint, parameters);
+ endpoint = new DroolsEndpoint( uri,
+ remaining,
+ this );
+ setProperties( endpoint,
+ parameters );
return endpoint;
- }
+ }
@Override
- protected void validateParameters(String uri, Map<String, Object> parameters, String optionPrefix) {
+ protected void validateParameters(String uri,
+ Map<String, Object> parameters,
+ String optionPrefix) {
}
}
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsEndpoint.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsEndpoint.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsEndpoint.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -39,8 +39,6 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.dataformat.xstream.JsonDataFormat;
-import org.apache.camel.dataformat.xstream.XStreamDataFormat;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.DataFormat;
import org.drools.command.impl.CommandBasedStatefulKnowledgeSession;
@@ -51,13 +49,12 @@
import org.drools.impl.StatelessKnowledgeSessionImpl;
import org.drools.reteoo.ReteooRuleBase;
import org.drools.runtime.CommandExecutor;
-import org.drools.runtime.help.BatchExecutionHelper;
public class DroolsEndpoint extends DefaultEndpoint {
public String ksessionId;
public CommandExecutor executor;
- public GridNode node;
+ public GridNode node;
public String dataFormatName;
@@ -119,7 +116,8 @@
// if id is empty this endpoint is not attached to a CommandExecutor and will have to look it up at runtime.
if ( !StringUtils.isEmpty( ksessionId ) ) {
// lookup command executor
- executor = node.get( ksessionId, CommandExecutor.class );
+ executor = node.get( ksessionId,
+ CommandExecutor.class );
if ( executor == null ) {
throw new RuntimeCamelException( "Failed to instantiate DroolsEndpoint. " + "Lookup of CommandExecutor with uri=\"" + uri + "\" failed. Check configuration." );
}
@@ -134,25 +132,25 @@
// TODO: test this scenario...
}
-// if ( !StringUtils.isEmpty( getDataFormat() ) ) {
-// String dataFormatName = getDataFormat();
-// if ( "drools-xstream".equals( dataFormatName ) ) {
-// XStreamDataFormat xstreaDataFormat = new XStreamDataFormat();
-// xstreaDataFormat.setXStream( BatchExecutionHelper.newXStreamMarshaller() );
-// this.dataFormat = xstreaDataFormat;
-// } else if ( "drools-json".equals( dataFormatName ) ) {
-// JsonDataFormat xstreaDataFormat = new JsonDataFormat();
-// xstreaDataFormat.setXStream( BatchExecutionHelper.newJSonMarshaller() );
-// this.dataFormat = xstreaDataFormat;
-// } else if ( "jaxb".equals( dataFormatName ) ) {
-// // to specify jaxb must be
-// //JaxbDataFormat jaxbDataFormat = new JaxbDataFormat();
-// //jaxbDataFormat.setContextPath( contextPath )
-// } else {
-// this.dataFormat = getCamelContext().getRegistry().lookup( getDataFormat(),
-// DataFormat.class );
-// }
-// }
+ // if ( !StringUtils.isEmpty( getDataFormat() ) ) {
+ // String dataFormatName = getDataFormat();
+ // if ( "drools-xstream".equals( dataFormatName ) ) {
+ // XStreamDataFormat xstreaDataFormat = new XStreamDataFormat();
+ // xstreaDataFormat.setXStream( BatchExecutionHelper.newXStreamMarshaller() );
+ // this.dataFormat = xstreaDataFormat;
+ // } else if ( "drools-json".equals( dataFormatName ) ) {
+ // JsonDataFormat xstreaDataFormat = new JsonDataFormat();
+ // xstreaDataFormat.setXStream( BatchExecutionHelper.newJSonMarshaller() );
+ // this.dataFormat = xstreaDataFormat;
+ // } else if ( "jaxb".equals( dataFormatName ) ) {
+ // // to specify jaxb must be
+ // //JaxbDataFormat jaxbDataFormat = new JaxbDataFormat();
+ // //jaxbDataFormat.setContextPath( contextPath )
+ // } else {
+ // this.dataFormat = getCamelContext().getRegistry().lookup( getDataFormat(),
+ // DataFormat.class );
+ // }
+ // }
}
@@ -195,7 +193,8 @@
throw new RuntimeException( "ExecutionNode for CommandExecutor lookup cannot be null" );
}
- return node.get( name, CommandExecutor.class );
+ return node.get( name,
+ CommandExecutor.class );
}
public ClassLoader getClassLoader(CommandExecutor exec) {
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsPolicy.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsPolicy.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsPolicy.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -68,19 +68,19 @@
implements
Policy {
private static boolean augmented;
- private DroolsEndpoint dep;
-
+ private DroolsEndpoint dep;
+
public void beforeWrap(RouteContext routeContext,
ProcessorDefinition processorDefinition) {
augmentNodes( routeContext,
processorDefinition,
new HashSet() );
- }
+ }
public Processor wrap(RouteContext routeContext,
Processor processor) {
RouteDefinition routeDef = routeContext.getRoute();
-
+
ToDefinition toDrools = getDroolsNode( routeDef );
Processor returnedProcessor;
@@ -88,7 +88,7 @@
returnedProcessor = new DroolsProcess( toDrools.getUri(),
processor );
} else {
- returnedProcessor = processor;//new DroolsClientProcessor( processor );
+ returnedProcessor = processor;//new DroolsClientProcessor( processor );
}
return returnedProcessor;
}
@@ -102,88 +102,99 @@
}
}
return toDrools;
- }
+ }
- public static void augmentNodes(RouteContext routeContext, ProcessorDefinition nav, Set visited) {
+ public static void augmentNodes(RouteContext routeContext,
+ ProcessorDefinition nav,
+ Set visited) {
if ( !nav.getOutputs().isEmpty() ) {
List<ProcessorDefinition> outputs = nav.getOutputs();
- for ( int i = 0; i < outputs.size(); i++ ) {
+ for ( int i = 0; i < outputs.size(); i++ ) {
ProcessorDefinition child = outputs.get( i );//it.next();
- if ( child instanceof ToDefinition) {
- ToDefinition to = ( ToDefinition ) child;
- if (to.getUri().startsWith( "cxfrs" ) && !visited.contains( to ) ) {
+ if ( child instanceof ToDefinition ) {
+ ToDefinition to = (ToDefinition) child;
+ if ( to.getUri().startsWith( "cxfrs" ) && !visited.contains( to ) ) {
BeanDefinition beanDef = new BeanDefinition();
beanDef.setBeanType( PreCxfrs.class );
- outputs.add( i, beanDef ); // insert before cxfrs
+ outputs.add( i,
+ beanDef ); // insert before cxfrs
beanDef = new BeanDefinition();
beanDef.setBeanType( PostCxfrs.class );
- outputs.add( i+2, beanDef ); // insert after cxfrs
+ outputs.add( i + 2,
+ beanDef ); // insert after cxfrs
i = i + 2;// adjust for the two inserts
- }
- else if (to.getUri().startsWith( "cxf" ) && !visited.contains( to ) ) {
+ } else if ( to.getUri().startsWith( "cxf" ) && !visited.contains( to ) ) {
BeanDefinition beanDef = new BeanDefinition();
beanDef.setBeanType( PreCxfSoapProcessor.class );
- outputs.add( i, beanDef ); // insert before cxf
+ outputs.add( i,
+ beanDef ); // insert before cxf
beanDef = new BeanDefinition();
beanDef.setBeanType( PostCxfSoapProcessor.class );
- outputs.add( i+2, beanDef ); // insert after cxf
+ outputs.add( i + 2,
+ beanDef ); // insert after cxf
i = i + 2;// adjust for the two inserts
augmented = true;
}
} else if ( child instanceof MarshalDefinition ) {
MarshalDefinition m = (MarshalDefinition) child;
- DataFormatDefinition dformatDefinition = m.getDataFormatType();
- dformatDefinition = processDataFormatType( routeContext, m.getRef(), dformatDefinition );
+ DataFormatDefinition dformatDefinition = m.getDataFormatType();
+ dformatDefinition = processDataFormatType( routeContext,
+ m.getRef(),
+ dformatDefinition );
m.setDataFormatType( dformatDefinition ); // repoint the marshaller, if it was cloned
} else if ( child instanceof UnmarshalDefinition ) {
UnmarshalDefinition m = (UnmarshalDefinition) child;
DataFormatDefinition dformatDefinition = m.getDataFormatType();
- dformatDefinition = processDataFormatType( routeContext, m.getRef(), dformatDefinition );
+ dformatDefinition = processDataFormatType( routeContext,
+ m.getRef(),
+ dformatDefinition );
m.setDataFormatType( dformatDefinition ); // repoint the marshaller, if it was cloned
}
}
-
+
for ( Iterator<ProcessorDefinition> it = nav.getOutputs().iterator(); it.hasNext(); ) {
ProcessorDefinition child = it.next();
augmentNodes( routeContext,
child,
visited );
}
- }
+ }
}
- private static DataFormatDefinition processDataFormatType( RouteContext routeContext, String ref, DataFormatDefinition dformatDefinition) {
- if ( dformatDefinition == null ) {
- if ( "json".equals( ref ) ) {
- dformatDefinition = new XStreamDataFormat();
- ((XStreamDataFormat)dformatDefinition).setDriver( "json" );
- } else if ( "xstream".equals( ref ) ) {
- dformatDefinition = new XStreamDataFormat();
- } else if ( "jaxb".equals( ref ) ) {
- dformatDefinition = new JaxbDataFormat();
- } else {
- dformatDefinition = routeContext.getCamelContext().resolveDataFormatDefinition(ref);
- }
- }
-
- // always clone before changing
- dformatDefinition = new FastCloner().deepClone( dformatDefinition );
-
- if ( dformatDefinition instanceof JaxbDataFormat ) {
- dformatDefinition = augmentJaxbDataFormatDefinition( (JaxbDataFormat) dformatDefinition );
- } else if ( dformatDefinition instanceof XStreamDataFormat ) {
- XStreamDataFormat xstreamDataFormat = ( XStreamDataFormat )dformatDefinition;
- if ( "json".equals( xstreamDataFormat.getDriver() )) {
- dformatDefinition = XStreamJson.newJSonMarshaller( xstreamDataFormat );;
- } else {
- dformatDefinition = XStreamXml.newXStreamMarshaller( (XStreamDataFormat) dformatDefinition );
- }
-
- }
- return dformatDefinition;
- }
+ private static DataFormatDefinition processDataFormatType(RouteContext routeContext,
+ String ref,
+ DataFormatDefinition dformatDefinition) {
+ if ( dformatDefinition == null ) {
+ if ( "json".equals( ref ) ) {
+ dformatDefinition = new XStreamDataFormat();
+ ((XStreamDataFormat) dformatDefinition).setDriver( "json" );
+ } else if ( "xstream".equals( ref ) ) {
+ dformatDefinition = new XStreamDataFormat();
+ } else if ( "jaxb".equals( ref ) ) {
+ dformatDefinition = new JaxbDataFormat();
+ } else {
+ dformatDefinition = routeContext.getCamelContext().resolveDataFormatDefinition( ref );
+ }
+ }
+ // always clone before changing
+ dformatDefinition = new FastCloner().deepClone( dformatDefinition );
+
+ if ( dformatDefinition instanceof JaxbDataFormat ) {
+ dformatDefinition = augmentJaxbDataFormatDefinition( (JaxbDataFormat) dformatDefinition );
+ } else if ( dformatDefinition instanceof XStreamDataFormat ) {
+ XStreamDataFormat xstreamDataFormat = (XStreamDataFormat) dformatDefinition;
+ if ( "json".equals( xstreamDataFormat.getDriver() ) ) {
+ dformatDefinition = XStreamJson.newJSonMarshaller( xstreamDataFormat );;
+ } else {
+ dformatDefinition = XStreamXml.newXStreamMarshaller( (XStreamDataFormat) dformatDefinition );
+ }
+
+ }
+ return dformatDefinition;
+ }
+
private ToDefinition getDroolsNode(ProcessorDefinition nav) {
if ( !nav.getOutputs().isEmpty() ) {
List<ProcessorDefinition> children = nav.getOutputs();
@@ -199,7 +210,7 @@
}
return null;
}
-
+
/**
* Clones the passed JaxbDataFormat and then augments it with with Drools related namespaces
*
@@ -214,7 +225,7 @@
clsName.lastIndexOf( '.' ) ) );
}
- StringBuilder sb = new StringBuilder();
+ StringBuilder sb = new StringBuilder();
sb.append( jaxbDataFormat.getContextPath() );
sb.append( ":" );
for ( String pkgName : set ) {
@@ -225,35 +236,36 @@
jaxbDataFormat.setContextPath( sb.toString() );
return jaxbDataFormat;
}
-
+
public static class DroolsClientProcessor
- implements
- Processor {
-
+ implements
+ Processor {
+
private Processor processor;
-
-
public DroolsClientProcessor(Processor processor) {
this.processor = processor;
}
-
-
public void process(Exchange exchange) throws Exception {
- exchange.setPattern(ExchangePattern.InOut);
+ exchange.setPattern( ExchangePattern.InOut );
Message inMessage = exchange.getIn();
- inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_USING_HTTP_API, Boolean.TRUE);
- inMessage.setHeader(Exchange.HTTP_METHOD, "POST");
- inMessage.setHeader(Exchange.HTTP_PATH, "/execute");
- inMessage.setHeader(Exchange.ACCEPT_CONTENT_TYPE, "text/plain");
- inMessage.setHeader(Exchange.CONTENT_TYPE, "text/plain");
-
+ inMessage.setHeader( CxfConstants.CAMEL_CXF_RS_USING_HTTP_API,
+ Boolean.TRUE );
+ inMessage.setHeader( Exchange.HTTP_METHOD,
+ "POST" );
+ inMessage.setHeader( Exchange.HTTP_PATH,
+ "/execute" );
+ inMessage.setHeader( Exchange.ACCEPT_CONTENT_TYPE,
+ "text/plain" );
+ inMessage.setHeader( Exchange.CONTENT_TYPE,
+ "text/plain" );
+
this.processor.process( exchange );
}
-
+
}
-
+
public static class DroolsProcess
implements
Processor {
@@ -281,22 +293,22 @@
ClassLoader originalClassLoader = null;
try {
originalClassLoader = Thread.currentThread().getContextClassLoader();
-
+
CommandExecutor exec = dep.executor;
if ( exec == null ) {
- String lookup = exchange.getIn().getHeader( DroolsComponent.DROOLS_LOOKUP, String.class );
- if ( StringUtils.isEmpty( lookup ) ) {
+ String lookup = exchange.getIn().getHeader( DroolsComponent.DROOLS_LOOKUP,
+ String.class );
+ if ( StringUtils.isEmpty( lookup ) ) {
lookup = dep.getLookup( exchange.getIn().getBody( String.class ) );
}
-
- if ( StringUtils.isEmpty( lookup ) ) {
- throw new RuntimeException( "No Executor defined and no lookup information available for uri " + this.dep.getEndpointUri() );
+
+ if ( StringUtils.isEmpty( lookup ) ) {
+ throw new RuntimeException( "No Executor defined and no lookup information available for uri " + this.dep.getEndpointUri() );
}
exec = dep.getCommandExecutor( lookup );
}
-
if ( exec == null ) {
throw new RuntimeException( "CommandExecutor cannot be found for uri " + this.dep.getEndpointUri() );
}
@@ -316,13 +328,13 @@
context );
boolean soap = false;
- if (!augmented && exchange.getFromEndpoint() instanceof CxfSpringEndpoint) {
- new PreCxfTransportSoapProcessor().process( exchange );
- soap = true;
+ if ( !augmented && exchange.getFromEndpoint() instanceof CxfSpringEndpoint ) {
+ new PreCxfTransportSoapProcessor().process( exchange );
+ soap = true;
}
processor.process( exchange );
- if (soap) {
- new PostCxfTransportSoapProcessor().process( exchange );
+ if ( soap ) {
+ new PostCxfTransportSoapProcessor().process( exchange );
}
} finally {
Thread.currentThread().setContextClassLoader( originalClassLoader );
@@ -331,8 +343,9 @@
}
public static final String[] JAXB_ANNOTATED_CMD = {BatchExecutionCommandImpl.class.getName(), SetGlobalCommand.class.getName(), GetGlobalCommand.class.getName(), FireAllRulesCommand.class.getName(), InsertElementsCommand.class.getName(),
- InsertObjectCommand.class.getName(), ModifyCommand.class.getName(), SetterImpl.class.getName(), QueryCommand.class.getName(), RetractCommand.class.getName(), AbortWorkItemCommand.class.getName(), SignalEventCommand.class.getName(),
- StartProcessCommand.class.getName(), BatchExecutionCommandImpl.class.getName(), ExecutionResultImpl.class.getName(), DefaultFactHandle.class.getName(), JaxbListWrapper.class.getName(),
- FlatQueryResults.class.getName(), CompleteWorkItemCommand.class.getName(), GetObjectsCommand.class.getName()};
+ InsertObjectCommand.class.getName(), ModifyCommand.class.getName(), SetterImpl.class.getName(), QueryCommand.class.getName(), RetractCommand.class.getName(), AbortWorkItemCommand.class.getName(),
+ SignalEventCommand.class.getName(),
+ StartProcessCommand.class.getName(), BatchExecutionCommandImpl.class.getName(), ExecutionResultImpl.class.getName(), DefaultFactHandle.class.getName(), JaxbListWrapper.class.getName(),
+ FlatQueryResults.class.getName(), CompleteWorkItemCommand.class.getName(), GetObjectsCommand.class.getName()};
}
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsProducer.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsProducer.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/DroolsProducer.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -31,35 +31,19 @@
package org.drools.camel.component;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.util.Arrays;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.management.RuntimeErrorException;
-
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.dataformat.xstream.JsonDataFormat;
-import org.apache.camel.dataformat.xstream.XStreamDataFormat;
import org.apache.camel.impl.DefaultProducer;
-import org.apache.camel.model.dataformat.JaxbDataFormat;
-import org.apache.camel.spi.DataFormat;
import org.drools.command.Command;
-import org.drools.command.impl.CommandBasedStatefulKnowledgeSession;
import org.drools.command.impl.GenericCommand;
import org.drools.command.runtime.BatchExecutionCommandImpl;
import org.drools.core.util.StringUtils;
import org.drools.grid.GridNode;
-import org.drools.impl.KnowledgeBaseImpl;
-import org.drools.impl.StatefulKnowledgeSessionImpl;
-import org.drools.impl.StatelessKnowledgeSessionImpl;
-import org.drools.reteoo.ReteooRuleBase;
import org.drools.runtime.CommandExecutor;
import org.drools.runtime.ExecutionResults;
-import org.drools.runtime.help.BatchExecutionHelper;
public class DroolsProducer extends DefaultProducer {
@@ -75,20 +59,20 @@
try {
Command cmd = null;
-// if ( de.dataFormat != null ) {
-// String str = exchange.getIn().getBody( String.class );
-// ByteArrayInputStream bais = new ByteArrayInputStream( str.getBytes() );
-// cmd = (Command) de.dataFormat.unmarshal( exchange,
-// bais );
-// } else {
-// // no data format set, so we assume it's already concrete
-// cmd = exchange.getIn().getBody( Command.class );
-// }
+ // if ( de.dataFormat != null ) {
+ // String str = exchange.getIn().getBody( String.class );
+ // ByteArrayInputStream bais = new ByteArrayInputStream( str.getBytes() );
+ // cmd = (Command) de.dataFormat.unmarshal( exchange,
+ // bais );
+ // } else {
+ // // no data format set, so we assume it's already concrete
+ // cmd = exchange.getIn().getBody( Command.class );
+ // }
cmd = exchange.getIn().getBody( Command.class );
-
+
if ( cmd == null ) {
- throw new RuntimeCamelException( "Body of in message not of the expected type 'org.drools.command.Command' for uri" + de.getEndpointUri() );
+ throw new RuntimeCamelException( "Body of in message not of the expected type 'org.drools.command.Command' for uri" + de.getEndpointUri() );
}
if ( !(cmd instanceof BatchExecutionCommandImpl) ) {
@@ -110,31 +94,32 @@
}
if ( de.getGridNode() != null && !StringUtils.isEmpty( lookup ) ) {
- exec = de.getGridNode().get(lookup, CommandExecutor.class);
+ exec = de.getGridNode().get( lookup,
+ CommandExecutor.class );
if ( exec == null ) {
- throw new RuntimeException( "ExecutionNode is unable to find ksession=" + lookup +" for uri" + de.getEndpointUri() );
+ throw new RuntimeException( "ExecutionNode is unable to find ksession=" + lookup + " for uri" + de.getEndpointUri() );
}
} else {
- throw new RuntimeException( "No ExecutionNode, unable to find ksession=" + lookup +" for uri" + de.getEndpointUri());
+ throw new RuntimeException( "No ExecutionNode, unable to find ksession=" + lookup + " for uri" + de.getEndpointUri() );
}
}
}
-
+
if ( exec == null ) {
throw new RuntimeException( "No defined ksession for uri" + de.getEndpointUri() );
- }
+ }
ExecutionResults results = exec.execute( (BatchExecutionCommandImpl) cmd );;
-// if ( de.dataFormat != null ) {
-// ByteArrayOutputStream baos = new ByteArrayOutputStream();
-// de.dataFormat.marshal( exchange,
-// results,
-// baos );
-// exchange.getOut().setBody( baos.toByteArray() );
-// } else {
-// exchange.getOut().setBody( results );
-// }
+ // if ( de.dataFormat != null ) {
+ // ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ // de.dataFormat.marshal( exchange,
+ // results,
+ // baos );
+ // exchange.getOut().setBody( baos.toByteArray() );
+ // } else {
+ // exchange.getOut().setBody( results );
+ // }
exchange.getOut().setBody( results );
} finally {
// we must restore the ClassLoader
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/ExecutionNodePipelineContextImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/ExecutionNodePipelineContextImpl.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/ExecutionNodePipelineContextImpl.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -20,9 +20,9 @@
import org.drools.runtime.CommandExecutor;
public class ExecutionNodePipelineContextImpl {
- private GridNode node;
- CommandExecutor exec;
- private ClassLoader localClassLoadel;
+ private GridNode node;
+ CommandExecutor exec;
+ private ClassLoader localClassLoadel;
public ExecutionNodePipelineContextImpl(GridNode node,
ClassLoader localClassLoader) {
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/FastCloner.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/FastCloner.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/FastCloner.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -58,17 +58,19 @@
public class FastCloner {
public interface IFastCloner {
- Object clone(Object t, FastCloner cloner, Map<Object, Object> clones) throws IllegalAccessException;
+ Object clone(Object t,
+ FastCloner cloner,
+ Map<Object, Object> clones) throws IllegalAccessException;
}
- private final Set<Class<?>> ignored = new HashSet<Class<?>>();
- private final Set<Class<?>> nullInstead = new HashSet<Class<?>>();
- private final Map<Class<?>, IFastCloner> fastCloners = new HashMap<Class<?>, IFastCloner>();
- private final Map<Object, Boolean> ignoredInstances = new IdentityHashMap<Object, Boolean>();
- private final ConcurrentHashMap<Class<?>, List<Field>> fieldsCache = new ConcurrentHashMap<Class<?>, List<Field>>();
- private boolean dumpClonedClasses;
- private boolean cloningEnabled = true;
- private boolean nullTransient;
+ private final Set<Class< ? >> ignored = new HashSet<Class< ? >>();
+ private final Set<Class< ? >> nullInstead = new HashSet<Class< ? >>();
+ private final Map<Class< ? >, IFastCloner> fastCloners = new HashMap<Class< ? >, IFastCloner>();
+ private final Map<Object, Boolean> ignoredInstances = new IdentityHashMap<Object, Boolean>();
+ private final ConcurrentHashMap<Class< ? >, List<Field>> fieldsCache = new ConcurrentHashMap<Class< ? >, List<Field>>();
+ private boolean dumpClonedClasses;
+ private boolean cloningEnabled = true;
+ private boolean nullTransient;
public FastCloner() {
init();
@@ -79,10 +81,10 @@
registerKnownConstants();
registerFastCloners();
}
-
+
public boolean isNullTransient() {
return this.nullTransient;
- }
+ }
/**
* this makes the cloner to set a transient field to null upon cloning.
@@ -95,48 +97,60 @@
public void setNullTransient(final boolean nullTransient) {
this.nullTransient = nullTransient;
}
-
/**
* registers a std set of fast cloners.
*/
protected void registerFastCloners() {
- this.fastCloners.put(GregorianCalendar.class, new FastClonerCalendar());
- this.fastCloners.put(ArrayList.class, new FastClonerArrayList());
- this.fastCloners.put(Arrays.asList( new Object[] {""} ).getClass(), new FastClonerArrayList());
- this.fastCloners.put(LinkedList.class, new FastClonerLinkedList());
- this.fastCloners.put(HashSet.class, new FastClonerHashSet());
- this.fastCloners.put(HashMap.class, new FastClonerHashMap());
- this.fastCloners.put(TreeMap.class, new FastClonerTreeMap());
+ this.fastCloners.put( GregorianCalendar.class,
+ new FastClonerCalendar() );
+ this.fastCloners.put( ArrayList.class,
+ new FastClonerArrayList() );
+ this.fastCloners.put( Arrays.asList( new Object[]{""} ).getClass(),
+ new FastClonerArrayList() );
+ this.fastCloners.put( LinkedList.class,
+ new FastClonerLinkedList() );
+ this.fastCloners.put( HashSet.class,
+ new FastClonerHashSet() );
+ this.fastCloners.put( HashMap.class,
+ new FastClonerHashMap() );
+ this.fastCloners.put( TreeMap.class,
+ new FastClonerTreeMap() );
}
- protected Object fastClone(final Object o, final Map<Object, Object> clones) throws IllegalAccessException {
- final Class<? extends Object> c = o.getClass();
- final IFastCloner fastCloner = this.fastCloners.get(c);
- if (fastCloner != null) {
- return fastCloner.clone(o, this, clones);
+ protected Object fastClone(final Object o,
+ final Map<Object, Object> clones) throws IllegalAccessException {
+ final Class< ? extends Object> c = o.getClass();
+ final IFastCloner fastCloner = this.fastCloners.get( c );
+ if ( fastCloner != null ) {
+ return fastCloner.clone( o,
+ this,
+ clones );
}
return null;
}
public void registerConstant(final Object o) {
- this.ignoredInstances.put(o, true);
+ this.ignoredInstances.put( o,
+ true );
}
- public void registerConstant(final Class<?> c, final String privateFieldName) {
+ public void registerConstant(final Class< ? > c,
+ final String privateFieldName) {
try {
- final Field field = c.getDeclaredField(privateFieldName);
- field.setAccessible(true);
- final Object v = field.get(null);
- this.ignoredInstances.put(v, true);
- } catch (final SecurityException e) {
- throw new RuntimeException(e);
- } catch (final NoSuchFieldException e) {
- throw new RuntimeException(e);
- } catch (final IllegalArgumentException e) {
- throw new RuntimeException(e);
- } catch (final IllegalAccessException e) {
- throw new RuntimeException(e);
+ final Field field = c.getDeclaredField( privateFieldName );
+ field.setAccessible( true );
+ final Object v = field.get( null );
+ this.ignoredInstances.put( v,
+ true );
+ } catch ( final SecurityException e ) {
+ throw new RuntimeException( e );
+ } catch ( final NoSuchFieldException e ) {
+ throw new RuntimeException( e );
+ } catch ( final IllegalArgumentException e ) {
+ throw new RuntimeException( e );
+ } catch ( final IllegalAccessException e ) {
+ throw new RuntimeException( e );
}
}
@@ -144,29 +158,32 @@
* registers some known JDK immutable classes. Override this to register your own list of jdk's immutable classes
*/
protected void registerKnownJdkImmutableClasses() {
- registerImmutable(String.class);
- registerImmutable(Integer.class);
- registerImmutable(Long.class);
- registerImmutable(Boolean.class);
- registerImmutable(Class.class);
- registerImmutable(Float.class);
- registerImmutable(Double.class);
- registerImmutable(Character.class);
- registerImmutable(Byte.class);
- registerImmutable(Short.class);
- registerImmutable(Void.class);
+ registerImmutable( String.class );
+ registerImmutable( Integer.class );
+ registerImmutable( Long.class );
+ registerImmutable( Boolean.class );
+ registerImmutable( Class.class );
+ registerImmutable( Float.class );
+ registerImmutable( Double.class );
+ registerImmutable( Character.class );
+ registerImmutable( Byte.class );
+ registerImmutable( Short.class );
+ registerImmutable( Void.class );
- registerImmutable(BigDecimal.class);
- registerImmutable(BigInteger.class);
- registerImmutable(URI.class);
- registerImmutable(URL.class);
- registerImmutable(UUID.class);
- registerImmutable(Pattern.class);
+ registerImmutable( BigDecimal.class );
+ registerImmutable( BigInteger.class );
+ registerImmutable( URI.class );
+ registerImmutable( URL.class );
+ registerImmutable( UUID.class );
+ registerImmutable( Pattern.class );
}
protected void registerKnownConstants() {
// registering known constants of the jdk.
- registerStaticFields(TreeSet.class, HashSet.class, HashMap.class, TreeMap.class);
+ registerStaticFields( TreeSet.class,
+ HashSet.class,
+ HashMap.class,
+ TreeMap.class );
}
/**
@@ -178,14 +195,15 @@
* @param classes
* array of classes
*/
- public void registerStaticFields(final Class<?>... classes) {
- for (final Class<?> c : classes) {
- final List<Field> fields = allFields(c);
- for (final Field field : fields) {
+ public void registerStaticFields(final Class< ? >... classes) {
+ for ( final Class< ? > c : classes ) {
+ final List<Field> fields = allFields( c );
+ for ( final Field field : fields ) {
final int mods = field.getModifiers();
- if (Modifier.isStatic(mods) && !field.getType().isPrimitive()) {
+ if ( Modifier.isStatic( mods ) && !field.getType().isPrimitive() ) {
// System.out.println(c + " . " + field.getName());
- registerConstant(c, field.getName());
+ registerConstant( c,
+ field.getName() );
}
}
}
@@ -197,8 +215,8 @@
* @param set
* a set of classes which will be scanned for static fields
*/
- public void setExtraStaticFields(final Set<Class<?>> set) {
- registerStaticFields((Class<?>[]) set.toArray());
+ public void setExtraStaticFields(final Set<Class< ? >> set) {
+ registerStaticFields( (Class< ? >[]) set.toArray() );
}
/**
@@ -208,9 +226,9 @@
* The class that shouldn't be cloned. That is, whenever a deep clone for an object is created and c is encountered, the object
* instance of c will be added to the clone.
*/
- public void dontClone(final Class<?>... c) {
- for (final Class<?> cl : c) {
- this.ignored.add(cl);
+ public void dontClone(final Class< ? >... c) {
+ for ( final Class< ? > cl : c ) {
+ this.ignored.add( cl );
}
}
@@ -220,17 +238,17 @@
* @param c
* the classes to nullify during cloning
*/
- public void nullInsteadOfClone(final Class<?>... c) {
- for (final Class<?> cl : c) {
- this.nullInstead.add(cl);
+ public void nullInsteadOfClone(final Class< ? >... c) {
+ for ( final Class< ? > cl : c ) {
+ this.nullInstead.add( cl );
}
}
/**
* spring framework friendly version of nullInsteadOfClone
*/
- public void setExtraNullInsteadOfClone(final Set<Class<?>> set) {
- this.nullInstead.addAll(set);
+ public void setExtraNullInsteadOfClone(final Set<Class< ? >> set) {
+ this.nullInstead.addAll( set );
}
/**
@@ -239,37 +257,41 @@
* @param c
* the immutable class
*/
- public void registerImmutable(final Class<?>... c) {
- for (final Class<?> cl : c) {
- this.ignored.add(cl);
+ public void registerImmutable(final Class< ? >... c) {
+ for ( final Class< ? > cl : c ) {
+ this.ignored.add( cl );
}
}
/**
* spring framework friendly version of registerImmutable
*/
- public void setExtraImmutables(final Set<Class<?>> set) {
- this.ignored.addAll(set);
+ public void setExtraImmutables(final Set<Class< ? >> set) {
+ this.ignored.addAll( set );
}
- public void registerFastCloner(final Class<?> c, final IFastCloner fastCloner) {
- this.fastCloners.put(c, fastCloner);
+ public void registerFastCloner(final Class< ? > c,
+ final IFastCloner fastCloner) {
+ this.fastCloners.put( c,
+ fastCloner );
}
@SuppressWarnings("unchecked")
public <T> T fastCloneOrNewInstance(final Class<T> c) {
try {
- final T fastClone = (T) fastClone(c, null);
- if (fastClone != null) {
+ final T fastClone = (T) fastClone( c,
+ null );
+ if ( fastClone != null ) {
return fastClone;
}
- } catch (final IllegalAccessException e) {
- throw new RuntimeException(e);
+ } catch ( final IllegalAccessException e ) {
+ throw new RuntimeException( e );
}
try {
return c.newInstance();
} catch ( Exception e ) {
- throw new RuntimeException("Unable To instantiate object from class " + c.getName(), e);
+ throw new RuntimeException( "Unable To instantiate object from class " + c.getName(),
+ e );
}
}
@@ -284,20 +306,22 @@
* @return a deep-clone of "o".
*/
public <T> T deepClone(final T o) {
- if (o == null) {
+ if ( o == null ) {
return null;
}
- if (!this.cloningEnabled) {
+ if ( !this.cloningEnabled ) {
return o;
}
- if (this.dumpClonedClasses) {
- System.out.println("start>" + o.getClass());
+ if ( this.dumpClonedClasses ) {
+ System.out.println( "start>" + o.getClass() );
}
- final Map<Object, Object> clones = new IdentityHashMap<Object, Object>(16);
+ final Map<Object, Object> clones = new IdentityHashMap<Object, Object>( 16 );
try {
- return cloneInternal(o, clones);
- } catch (final IllegalAccessException e) {
- throw new RuntimeException("error during cloning of " + o, e);
+ return cloneInternal( o,
+ clones );
+ } catch ( final IllegalAccessException e ) {
+ throw new RuntimeException( "error during cloning of " + o,
+ e );
}
}
@@ -311,16 +335,18 @@
* @return a shallow clone of "o"
*/
public <T> T shallowClone(final T o) {
- if (o == null) {
+ if ( o == null ) {
return null;
}
- if (!this.cloningEnabled) {
+ if ( !this.cloningEnabled ) {
return o;
}
try {
- return cloneInternal(o, null);
- } catch (final IllegalAccessException e) {
- throw new RuntimeException("error during cloning of " + o, e);
+ return cloneInternal( o,
+ null );
+ } catch ( final IllegalAccessException e ) {
+ throw new RuntimeException( "error during cloning of " + o,
+ e );
}
}
@@ -328,51 +354,60 @@
* PLEASE DONT CALL THIS METHOD The only reason for been public is because IFastCloner must invoke it
*/
@SuppressWarnings("unchecked")
- protected <T> T cloneInternal(final T o, final Map<Object, Object> clones) throws IllegalAccessException {
- if (o == null) {
+ protected <T> T cloneInternal(final T o,
+ final Map<Object, Object> clones) throws IllegalAccessException {
+ if ( o == null ) {
return null;
}
- if (o == this) {
+ if ( o == this ) {
return null;
}
- if (this.ignoredInstances.containsKey(o)) {
+ if ( this.ignoredInstances.containsKey( o ) ) {
return o;
}
final Class<T> clz = (Class<T>) o.getClass();
- if (clz.isEnum()) {
+ if ( clz.isEnum() ) {
return o;
}
// skip cloning ignored classes
- if (this.nullInstead.contains(clz)) {
+ if ( this.nullInstead.contains( clz ) ) {
return null;
}
- if (this.ignored.contains(clz)) {
+ if ( this.ignored.contains( clz ) ) {
return o;
}
- final Object clonedPreviously = clones != null ? clones.get(o) : null;
- if (clonedPreviously != null) {
+ final Object clonedPreviously = clones != null ? clones.get( o ) : null;
+ if ( clonedPreviously != null ) {
return (T) clonedPreviously;
}
- final Object fastClone = fastClone(o, clones);
- if (fastClone != null) {
- if (clones != null) {
- clones.put(o, fastClone);
+ final Object fastClone = fastClone( o,
+ clones );
+ if ( fastClone != null ) {
+ if ( clones != null ) {
+ clones.put( o,
+ fastClone );
}
return (T) fastClone;
}
- if (this.dumpClonedClasses) {
- System.out.println("clone>" + clz);
+ if ( this.dumpClonedClasses ) {
+ System.out.println( "clone>" + clz );
}
- if (clz.isArray()) {
- final int length = Array.getLength(o);
- final T newInstance = (T) Array.newInstance(clz.getComponentType(), length);
- clones.put(o, newInstance);
- for (int i = 0; i < length; i++) {
- final Object v = Array.get(o, i);
- final Object clone = clones != null ? cloneInternal(v, clones) : v;
- Array.set(newInstance, i, clone);
+ if ( clz.isArray() ) {
+ final int length = Array.getLength( o );
+ final T newInstance = (T) Array.newInstance( clz.getComponentType(),
+ length );
+ clones.put( o,
+ newInstance );
+ for ( int i = 0; i < length; i++ ) {
+ final Object v = Array.get( o,
+ i );
+ final Object clone = clones != null ? cloneInternal( v,
+ clones ) : v;
+ Array.set( newInstance,
+ i,
+ clone );
}
return newInstance;
}
@@ -381,27 +416,32 @@
try {
newInstance = clz.newInstance();
} catch ( Exception e ) {
- throw new RuntimeException("Unable To instantiate object from class " + clz.getName(), e);
+ throw new RuntimeException( "Unable To instantiate object from class " + clz.getName(),
+ e );
}
-
- if (clones != null) {
- clones.put(o, newInstance);
+
+ if ( clones != null ) {
+ clones.put( o,
+ newInstance );
}
- final List<Field> fields = allFields(clz);
- for (final Field field : fields) {
- if (!Modifier.isStatic(field.getModifiers())) {
- if (this.nullTransient && Modifier.isTransient(field.getModifiers())) {
+ final List<Field> fields = allFields( clz );
+ for ( final Field field : fields ) {
+ if ( !Modifier.isStatic( field.getModifiers() ) ) {
+ if ( this.nullTransient && Modifier.isTransient( field.getModifiers() ) ) {
// request by Jonathan : transient fields can be null-ed
- final Class<?> type = field.getType();
- if (!type.isPrimitive()) {
- field.set(newInstance, null);
+ final Class< ? > type = field.getType();
+ if ( !type.isPrimitive() ) {
+ field.set( newInstance,
+ null );
}
} else {
- final Object fieldObject = field.get(o);
- final Object fieldObjectClone = clones != null ? cloneInternal(fieldObject, clones) : fieldObject;
- field.set(newInstance, fieldObjectClone);
- if (this.dumpClonedClasses && (fieldObjectClone != fieldObject)) {
- System.out.println("cloned field>" + field + " -- of class " + o.getClass());
+ final Object fieldObject = field.get( o );
+ final Object fieldObjectClone = clones != null ? cloneInternal( fieldObject,
+ clones ) : fieldObject;
+ field.set( newInstance,
+ fieldObjectClone );
+ if ( this.dumpClonedClasses && (fieldObjectClone != fieldObject) ) {
+ System.out.println( "cloned field>" + field + " -- of class " + o.getClass() );
}
}
}
@@ -417,36 +457,41 @@
* @param dest
* the destination object which must contain as minimul all the fields of src
*/
- public <T, E extends T> void copyPropertiesOfInheritedClass(final T src, final E dest) {
- if (src == null) {
- throw new IllegalArgumentException("src can't be null");
+ public <T, E extends T> void copyPropertiesOfInheritedClass(final T src,
+ final E dest) {
+ if ( src == null ) {
+ throw new IllegalArgumentException( "src can't be null" );
}
- if (dest == null) {
- throw new IllegalArgumentException("dest can't be null");
+ if ( dest == null ) {
+ throw new IllegalArgumentException( "dest can't be null" );
}
- final Class<? extends Object> srcClz = src.getClass();
- final Class<? extends Object> destClz = dest.getClass();
- if (srcClz.isArray()) {
- if (!destClz.isArray()) {
- throw new IllegalArgumentException("can't copy from array to non-array class " + destClz);
+ final Class< ? extends Object> srcClz = src.getClass();
+ final Class< ? extends Object> destClz = dest.getClass();
+ if ( srcClz.isArray() ) {
+ if ( !destClz.isArray() ) {
+ throw new IllegalArgumentException( "can't copy from array to non-array class " + destClz );
}
- final int length = Array.getLength(src);
- for (int i = 0; i < length; i++) {
- final Object v = Array.get(src, i);
- Array.set(dest, i, v);
+ final int length = Array.getLength( src );
+ for ( int i = 0; i < length; i++ ) {
+ final Object v = Array.get( src,
+ i );
+ Array.set( dest,
+ i,
+ v );
}
return;
}
- final List<Field> fields = allFields(srcClz);
- for (final Field field : fields) {
- if (!Modifier.isStatic(field.getModifiers())) {
+ final List<Field> fields = allFields( srcClz );
+ for ( final Field field : fields ) {
+ if ( !Modifier.isStatic( field.getModifiers() ) ) {
try {
- final Object fieldObject = field.get(src);
- field.set(dest, fieldObject);
- } catch (final IllegalArgumentException e) {
- throw new RuntimeException(e);
- } catch (final IllegalAccessException e) {
- throw new RuntimeException(e);
+ final Object fieldObject = field.get( src );
+ field.set( dest,
+ fieldObject );
+ } catch ( final IllegalArgumentException e ) {
+ throw new RuntimeException( e );
+ } catch ( final IllegalAccessException e ) {
+ throw new RuntimeException( e );
}
}
}
@@ -455,27 +500,31 @@
/**
* reflection utils
*/
- private void addAll(final List<Field> l, final Field[] fields) {
- for (final Field field : fields) {
- field.setAccessible(true);
- l.add(field);
+ private void addAll(final List<Field> l,
+ final Field[] fields) {
+ for ( final Field field : fields ) {
+ field.setAccessible( true );
+ l.add( field );
}
}
/**
* reflection utils
*/
- private List<Field> allFields(final Class<?> c) {
- List<Field> l = this.fieldsCache.get(c);
- if (l == null) {
+ private List<Field> allFields(final Class< ? > c) {
+ List<Field> l = this.fieldsCache.get( c );
+ if ( l == null ) {
l = new LinkedList<Field>();
final Field[] fields = c.getDeclaredFields();
- addAll(l, fields);
- Class<?> sc = c;
- while (((sc = sc.getSuperclass()) != Object.class) && (sc != null)) {
- addAll(l, sc.getDeclaredFields());
+ addAll( l,
+ fields );
+ Class< ? > sc = c;
+ while ( ((sc = sc.getSuperclass()) != Object.class) && (sc != null) ) {
+ addAll( l,
+ sc.getDeclaredFields() );
}
- this.fieldsCache.putIfAbsent(c, l);
+ this.fieldsCache.putIfAbsent( c,
+ l );
}
return l;
}
@@ -502,54 +551,75 @@
this.cloningEnabled = cloningEnabled;
}
- public static class FastClonerTreeMap implements IFastCloner {
+ public static class FastClonerTreeMap
+ implements
+ IFastCloner {
@SuppressWarnings("unchecked")
- public Object clone(final Object t, final FastCloner cloner, final Map<Object, Object> clones) throws IllegalAccessException {
+ public Object clone(final Object t,
+ final FastCloner cloner,
+ final Map<Object, Object> clones) throws IllegalAccessException {
final TreeMap<Object, Object> m = (TreeMap) t;
final TreeMap result = new TreeMap();
- for (final Map.Entry e : m.entrySet()) {
- final Object key = cloner.cloneInternal(e.getKey(), clones);
- final Object value = cloner.cloneInternal(e.getValue(), clones);
- result.put(key, value);
+ for ( final Map.Entry e : m.entrySet() ) {
+ final Object key = cloner.cloneInternal( e.getKey(),
+ clones );
+ final Object value = cloner.cloneInternal( e.getValue(),
+ clones );
+ result.put( key,
+ value );
}
return result;
}
}
- public static class FastClonerArrayList implements IFastCloner {
+ public static class FastClonerArrayList
+ implements
+ IFastCloner {
@SuppressWarnings("unchecked")
- public Object clone(final Object t, final FastCloner cloner, final Map<Object, Object> clones) throws IllegalAccessException {
+ public Object clone(final Object t,
+ final FastCloner cloner,
+ final Map<Object, Object> clones) throws IllegalAccessException {
final Collection al = (Collection) t;
final ArrayList l = new ArrayList();
- for (final Object o : al) {
- final Object cloneInternal = cloner.cloneInternal(o, clones);
- l.add(cloneInternal);
+ for ( final Object o : al ) {
+ final Object cloneInternal = cloner.cloneInternal( o,
+ clones );
+ l.add( cloneInternal );
}
return l;
}
}
- public static class FastClonerCalendar implements IFastCloner {
- public Object clone(final Object t, final FastCloner cloner, final Map<Object, Object> clones) {
+ public static class FastClonerCalendar
+ implements
+ IFastCloner {
+ public Object clone(final Object t,
+ final FastCloner cloner,
+ final Map<Object, Object> clones) {
final GregorianCalendar gc = new GregorianCalendar();
- gc.setTimeInMillis(((GregorianCalendar) t).getTimeInMillis());
+ gc.setTimeInMillis( ((GregorianCalendar) t).getTimeInMillis() );
return gc;
}
}
- public static class FastClonerLinkedList implements IFastCloner {
+ public static class FastClonerLinkedList
+ implements
+ IFastCloner {
@SuppressWarnings("unchecked")
- public Object clone(final Object t, final FastCloner cloner, final Map<Object, Object> clones) throws IllegalAccessException {
+ public Object clone(final Object t,
+ final FastCloner cloner,
+ final Map<Object, Object> clones) throws IllegalAccessException {
final LinkedList al = (LinkedList) t;
final LinkedList l = new LinkedList();
- for (final Object o : al) {
- final Object cloneInternal = cloner.cloneInternal(o, clones);
- l.add(cloneInternal);
+ for ( final Object o : al ) {
+ final Object cloneInternal = cloner.cloneInternal( o,
+ clones );
+ l.add( cloneInternal );
}
return l;
}
@@ -557,45 +627,62 @@
}
@SuppressWarnings("unchecked")
- public abstract static class FastClonerCustomCollection<T extends Collection> implements IFastCloner {
+ public abstract static class FastClonerCustomCollection<T extends Collection>
+ implements
+ IFastCloner {
public abstract T getInstance();
- public Object clone(final Object t, final FastCloner cloner, final Map<Object, Object> clones) throws IllegalAccessException {
+ public Object clone(final Object t,
+ final FastCloner cloner,
+ final Map<Object, Object> clones) throws IllegalAccessException {
final T c = getInstance();
final T l = (T) t;
- for (final Object o : l) {
- final Object cloneInternal = cloner.cloneInternal(o, clones);
- c.add(cloneInternal);
+ for ( final Object o : l ) {
+ final Object cloneInternal = cloner.cloneInternal( o,
+ clones );
+ c.add( cloneInternal );
}
return c;
}
}
- public static class FastClonerHashSet implements IFastCloner {
+ public static class FastClonerHashSet
+ implements
+ IFastCloner {
@SuppressWarnings("unchecked")
- public Object clone(final Object t, final FastCloner cloner, final Map<Object, Object> clones) throws IllegalAccessException {
+ public Object clone(final Object t,
+ final FastCloner cloner,
+ final Map<Object, Object> clones) throws IllegalAccessException {
final HashSet al = (HashSet) t;
final HashSet l = new HashSet();
- for (final Object o : al) {
- final Object cloneInternal = cloner.cloneInternal(o, clones);
- l.add(cloneInternal);
+ for ( final Object o : al ) {
+ final Object cloneInternal = cloner.cloneInternal( o,
+ clones );
+ l.add( cloneInternal );
}
return l;
}
}
- public static class FastClonerHashMap implements IFastCloner {
+ public static class FastClonerHashMap
+ implements
+ IFastCloner {
@SuppressWarnings("unchecked")
- public Object clone(final Object t, final FastCloner cloner, final Map<Object, Object> clones) throws IllegalAccessException {
+ public Object clone(final Object t,
+ final FastCloner cloner,
+ final Map<Object, Object> clones) throws IllegalAccessException {
final HashMap<Object, Object> m = (HashMap) t;
final HashMap result = new HashMap();
- for (final Map.Entry e : m.entrySet()) {
- final Object key = cloner.cloneInternal(e.getKey(), clones);
- final Object value = cloner.cloneInternal(e.getValue(), clones);
+ for ( final Map.Entry e : m.entrySet() ) {
+ final Object key = cloner.cloneInternal( e.getKey(),
+ clones );
+ final Object value = cloner.cloneInternal( e.getValue(),
+ clones );
- result.put(key, value);
+ result.put( key,
+ value );
}
return result;
}
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/PostCxfrs.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/PostCxfrs.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/PostCxfrs.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -25,20 +25,19 @@
import javax.ws.rs.core.Response.Status;
import org.apache.camel.Exchange;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.component.cxf.CxfConstants;
import org.drools.core.util.StringUtils;
-public class PostCxfrs implements Processor {
+public class PostCxfrs
+ implements
+ Processor {
public void process(Exchange exchange) throws Exception {
Object object = exchange.getIn().getBody();
if ( object instanceof Response ) {
- Response res = ( Response ) object;
- if ( res.getStatus() == Status.OK.getStatusCode()) {
- exchange.getOut().setBody( StringUtils.toString( (InputStream) ((Response)object).getEntity() ) );
+ Response res = (Response) object;
+ if ( res.getStatus() == Status.OK.getStatusCode() ) {
+ exchange.getOut().setBody( StringUtils.toString( (InputStream) ((Response) object).getEntity() ) );
}
}
- }
+ }
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/PreCxfrs.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/PreCxfrs.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/PreCxfrs.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -25,14 +25,21 @@
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.CxfConstants;
-public class PreCxfrs implements Processor {
+public class PreCxfrs
+ implements
+ Processor {
public void process(Exchange exchange) throws Exception {
- exchange.setPattern(ExchangePattern.InOut);
+ exchange.setPattern( ExchangePattern.InOut );
Message inMessage = exchange.getIn();
- inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_USING_HTTP_API, Boolean.TRUE);
- inMessage.setHeader(Exchange.HTTP_METHOD, "POST");
- inMessage.setHeader(Exchange.HTTP_PATH, "/execute");
- inMessage.setHeader(Exchange.ACCEPT_CONTENT_TYPE, "text/plain");
- inMessage.setHeader(Exchange.CONTENT_TYPE, "text/plain");
- }
+ inMessage.setHeader( CxfConstants.CAMEL_CXF_RS_USING_HTTP_API,
+ Boolean.TRUE );
+ inMessage.setHeader( Exchange.HTTP_METHOD,
+ "POST" );
+ inMessage.setHeader( Exchange.HTTP_PATH,
+ "/execute" );
+ inMessage.setHeader( Exchange.ACCEPT_CONTENT_TYPE,
+ "text/plain" );
+ inMessage.setHeader( Exchange.CONTENT_TYPE,
+ "text/plain" );
+ }
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/XStreamHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/XStreamHelper.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/XStreamHelper.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -16,12 +16,9 @@
package org.drools.camel.component;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.model.dataformat.XStreamDataFormat;
import org.drools.command.runtime.BatchExecutionCommandImpl;
import org.drools.command.runtime.GetGlobalCommand;
@@ -36,13 +33,12 @@
import org.drools.command.runtime.rule.InsertElementsCommand;
import org.drools.command.runtime.rule.InsertObjectCommand;
import org.drools.command.runtime.rule.ModifyCommand;
+import org.drools.command.runtime.rule.ModifyCommand.SetterImpl;
import org.drools.command.runtime.rule.QueryCommand;
import org.drools.command.runtime.rule.RetractCommand;
-import org.drools.command.runtime.rule.ModifyCommand.SetterImpl;
import org.drools.common.DefaultFactHandle;
import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.rule.impl.FlatQueryResults;
-import org.drools.runtime.rule.impl.NativeQueryResults;
public class XStreamHelper {
public static void setAliases(XStreamDataFormat dataFormat) {
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/XStreamJson.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/XStreamJson.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/XStreamJson.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -46,23 +46,22 @@
import org.drools.runtime.help.impl.XStreamJSon.JSonStartProcessConvert;
import org.drools.runtime.help.impl.XStreamJSon.RowItemConverter;
-
public class XStreamJson {
- public static XStreamDataFormat newJSonMarshaller(XStreamDataFormat xstreamDataFormat) {
+ public static XStreamDataFormat newJSonMarshaller(XStreamDataFormat xstreamDataFormat) {
xstreamDataFormat.setDriver( "json" );
XStreamHelper.setAliases( xstreamDataFormat );
xstreamDataFormat.getAliases().put( "commands",
- CommandsObjectContainer.class.getName() );
+ CommandsObjectContainer.class.getName() );
xstreamDataFormat.getAliases().put( "objects",
- ObjectsObjectContainer.class.getName() );
+ ObjectsObjectContainer.class.getName() );
xstreamDataFormat.getAliases().put( "item",
- RowItemContainer.class.getName() );
+ RowItemContainer.class.getName() );
xstreamDataFormat.getAliases().put( "parameters",
- ParameterContainer.class.getName() );
+ ParameterContainer.class.getName() );
xstreamDataFormat.getAliases().put( "results",
- WorkItemResultsContainer.class.getName() );
+ WorkItemResultsContainer.class.getName() );
//xstream.setMode( XStream.NO_REFERENCES );
@@ -70,10 +69,10 @@
if ( converters == null ) {
converters = new ArrayList<String>();
}
-
+
converters.add( JSonFactHandleConverter.class.getName() );
converters.add( JSonBatchExecutionResultConverter.class.getName() );
- converters.add( JSonInsertConverter.class.getName());
+ converters.add( JSonInsertConverter.class.getName() );
converters.add( JSonFireAllRulesConverter.class.getName() );
converters.add( JSonBatchExecutionCommandConverter.class.getName() );
converters.add( CommandsContainerConverter.class.getName() );
@@ -93,7 +92,7 @@
converters.add( JSonAbortWorkItemConverter.class.getName() );
xstreamDataFormat.setConverters( converters );
-
+
return xstreamDataFormat;
}
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/XStreamXml.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/XStreamXml.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/camel/component/XStreamXml.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -42,26 +42,25 @@
import org.drools.runtime.help.impl.XStreamXML.StartProcessConvert;
public class XStreamXml {
-
+
public static XStreamDataFormat newXStreamMarshaller(XStreamDataFormat xstreamDataFormat) {
XStreamHelper.setAliases( xstreamDataFormat );
-
+
//xstream.processAnnotations( BatchExecutionCommand.class );
-
+
Map<String, String[]> map = xstreamDataFormat.getImplicitCollections();
if ( map == null ) {
map = new HashMap<String, String[]>();
}
- map.put( BatchExecutionCommandImpl.class.getName(),
- new String[] { "commands" } );
+ map.put( BatchExecutionCommandImpl.class.getName(),
+ new String[]{"commands"} );
xstreamDataFormat.setImplicitCollections( map );
-
-
+
List<String> converters = xstreamDataFormat.getConverters();
if ( converters == null ) {
converters = new ArrayList<String>();
}
-
+
converters.add( InsertConverter.class.getName() );
converters.add( RetractConverter.class.getName() );
converters.add( ModifyConverter.class.getName() );
@@ -69,7 +68,7 @@
converters.add( InsertElementsConverter.class.getName() );
converters.add( FireAllRulesConverter.class.getName() );
converters.add( StartProcessConvert.class.getName() );
- converters.add( SignalEventConverter.class.getName() );
+ converters.add( SignalEventConverter.class.getName() );
converters.add( CompleteWorkItemConverter.class.getName() );
converters.add( AbortWorkItemConverter.class.getName() );
converters.add( QueryConverter.class.getName() );
@@ -80,9 +79,8 @@
converters.add( QueryResultsConverter.class.getName() );
converters.add( FactHandleConverter.class.getName() );
xstreamDataFormat.setConverters( converters );
-
+
return xstreamDataFormat;
}
-
-}
+}
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/rs/CommandExecutorImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/rs/CommandExecutorImpl.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/rs/CommandExecutorImpl.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -24,22 +24,22 @@
import org.drools.command.Command;
import org.drools.runtime.CommandExecutor;
+public class CommandExecutorImpl
+ implements
+ CommandExecutor {
+ public CommandExecutorImpl() {
-public class CommandExecutorImpl implements CommandExecutor {
-
- public CommandExecutorImpl() {
-
}
-
+
public CommandExecutorImpl(boolean restFlag) {
-
- }
+ }
+
@POST()
@Path("/execute")
@Consumes("text/plain")
- @Produces("text/plain")
+ @Produces("text/plain")
public <T> T execute(Command<T> command) {
throw new UnsupportedOperationException( "This should never be called, as it's handled by camel" );
}
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/rs/CommandMessageBodyReader.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/rs/CommandMessageBodyReader.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/rs/CommandMessageBodyReader.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -33,13 +33,15 @@
@Consumes("text/plain")
@Provider
-public class CommandMessageBodyReader implements MessageBodyReader<Object> {
+public class CommandMessageBodyReader
+ implements
+ MessageBodyReader<Object> {
public boolean isReadable(Class type,
Type genericType,
Annotation[] annotations,
MediaType mediaType) {
- return Command.class.isAssignableFrom(type);
+ return Command.class.isAssignableFrom( type );
}
public Object readFrom(Class type,
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PostCxfSoapProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PostCxfSoapProcessor.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PostCxfSoapProcessor.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -32,18 +32,24 @@
import org.apache.camel.Processor;
import org.drools.core.util.StringUtils;
-public class PostCxfSoapProcessor implements Processor {
+public class PostCxfSoapProcessor
+ implements
+ Processor {
public void process(Exchange exchange) throws Exception {
InputStream is = (InputStream) exchange.getIn().getBody();
- if (is != null) {
+ if ( is != null ) {
SOAPMessage soapMessage = MessageFactory.newInstance().createMessage();
SOAPBody body = soapMessage.getSOAPPart().getEnvelope().getBody();
- QName payloadName = new QName("http://soap.jax.drools.org/", "executeResponse", "ns1");
- QName responseName = new QName("http://soap.jax.drools.org/", "return", "ns1");
- SOAPBodyElement payload = body.addBodyElement(payloadName);
- SOAPElement response = payload.addChildElement(responseName);
- response.addTextNode(StringUtils.toString( is ));
+ QName payloadName = new QName( "http://soap.jax.drools.org/",
+ "executeResponse",
+ "ns1" );
+ QName responseName = new QName( "http://soap.jax.drools.org/",
+ "return",
+ "ns1" );
+ SOAPBodyElement payload = body.addBodyElement( payloadName );
+ SOAPElement response = payload.addChildElement( responseName );
+ response.addTextNode( StringUtils.toString( is ) );
exchange.getOut().setBody( soapMessage );
}
}
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PostCxfTransportSoapProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PostCxfTransportSoapProcessor.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PostCxfTransportSoapProcessor.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -29,26 +29,32 @@
import org.apache.camel.Processor;
import org.drools.core.util.StringUtils;
-public class PostCxfTransportSoapProcessor implements Processor {
+public class PostCxfTransportSoapProcessor
+ implements
+ Processor {
- public void process(Exchange exchange) throws Exception {
+ public void process(Exchange exchange) throws Exception {
- byte[] body2 = (byte[]) exchange.getOut().getBody();
+ byte[] body2 = (byte[]) exchange.getOut().getBody();
- ByteArrayInputStream bais = new ByteArrayInputStream(body2);
+ ByteArrayInputStream bais = new ByteArrayInputStream( body2 );
- SOAPMessage soapMessage = MessageFactory.newInstance().createMessage();
- SOAPBody soapBody = soapMessage.getSOAPPart().getEnvelope().getBody();
- QName payloadName = new QName("http://soap.jax.drools.org/", "executeResponse", "ns1");
- QName responseName = new QName("http://soap.jax.drools.org/", "return", "ns1");
- SOAPBodyElement payload = soapBody.addBodyElement(payloadName);
- SOAPElement response = payload.addChildElement(responseName);
- response.addTextNode(StringUtils.toString(bais));
+ SOAPMessage soapMessage = MessageFactory.newInstance().createMessage();
+ SOAPBody soapBody = soapMessage.getSOAPPart().getEnvelope().getBody();
+ QName payloadName = new QName( "http://soap.jax.drools.org/",
+ "executeResponse",
+ "ns1" );
+ QName responseName = new QName( "http://soap.jax.drools.org/",
+ "return",
+ "ns1" );
+ SOAPBodyElement payload = soapBody.addBodyElement( payloadName );
+ SOAPElement response = payload.addChildElement( responseName );
+ response.addTextNode( StringUtils.toString( bais ) );
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- soapMessage.writeTo(baos);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ soapMessage.writeTo( baos );
- exchange.getOut().setBody(new String(baos.toByteArray()));
- }
+ exchange.getOut().setBody( new String( baos.toByteArray() ) );
+ }
}
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PreCxfSoapProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PreCxfSoapProcessor.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PreCxfSoapProcessor.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -20,6 +20,7 @@
package org.drools.jax.soap;
import javax.xml.soap.SOAPMessage;
+
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
@@ -27,17 +28,19 @@
import org.apache.commons.logging.LogFactory;
import org.apache.cxf.service.model.BindingOperationInfo;
-public class PreCxfSoapProcessor implements Processor {
+public class PreCxfSoapProcessor
+ implements
+ Processor {
- private static final transient Log LOG = LogFactory.getLog(PreCxfSoapProcessor.class);
+ private static final transient Log LOG = LogFactory.getLog( PreCxfSoapProcessor.class );
- public void process(Exchange exchange) throws Exception {
- exchange.setPattern(ExchangePattern.InOut);
- BindingOperationInfo boi = (BindingOperationInfo)exchange.getProperty(BindingOperationInfo.class.toString());
- if (boi != null) {
- LOG.info("boi.isUnwrapped" + boi.isUnwrapped());
- }
- SOAPMessage soapMessage = (SOAPMessage)exchange.getIn().getBody();
- exchange.getOut().setBody(soapMessage.getSOAPBody().getTextContent());
- }
+ public void process(Exchange exchange) throws Exception {
+ exchange.setPattern( ExchangePattern.InOut );
+ BindingOperationInfo boi = (BindingOperationInfo) exchange.getProperty( BindingOperationInfo.class.toString() );
+ if ( boi != null ) {
+ LOG.info( "boi.isUnwrapped" + boi.isUnwrapped() );
+ }
+ SOAPMessage soapMessage = (SOAPMessage) exchange.getIn().getBody();
+ exchange.getOut().setBody( soapMessage.getSOAPBody().getTextContent() );
+ }
}
Modified: labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PreCxfTransportSoapProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PreCxfTransportSoapProcessor.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/main/java/org/drools/jax/soap/PreCxfTransportSoapProcessor.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -25,18 +25,22 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-public class PreCxfTransportSoapProcessor implements Processor {
+public class PreCxfTransportSoapProcessor
+ implements
+ Processor {
- public void process(Exchange exchange) throws Exception {
- InputStream is = (InputStream)exchange.getIn().getBody();
- Map<String, Object> headers = exchange.getIn().getHeaders();
- MimeHeaders mimeHeaders = new MimeHeaders();
- for (String header : headers.keySet()) {
- mimeHeaders.addHeader(header, (String) headers.get(header));
- }
- SOAPMessage soapMessage = MessageFactory.newInstance().createMessage(mimeHeaders, is);
- exchange.getOut().setBody(soapMessage.getSOAPBody().getTextContent().trim());
- exchange.getIn().setBody(soapMessage.getSOAPBody().getTextContent().trim());
- }
+ public void process(Exchange exchange) throws Exception {
+ InputStream is = (InputStream) exchange.getIn().getBody();
+ Map<String, Object> headers = exchange.getIn().getHeaders();
+ MimeHeaders mimeHeaders = new MimeHeaders();
+ for ( String header : headers.keySet() ) {
+ mimeHeaders.addHeader( header,
+ (String) headers.get( header ) );
+ }
+ SOAPMessage soapMessage = MessageFactory.newInstance().createMessage( mimeHeaders,
+ is );
+ exchange.getOut().setBody( soapMessage.getSOAPBody().getTextContent().trim() );
+ exchange.getIn().setBody( soapMessage.getSOAPBody().getTextContent().trim() );
+ }
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/ChangeCollector.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/ChangeCollector.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/ChangeCollector.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -16,14 +16,6 @@
package org.drools;
-
-import org.drools.event.rule.WorkingMemoryEventListener;
-import org.drools.event.rule.ObjectInsertedEvent;
-import org.drools.event.rule.ObjectUpdatedEvent;
-import org.drools.event.rule.ObjectRetractedEvent;
-import org.drools.xml.jaxb.util.JaxbListAdapter;
-import org.drools.xml.jaxb.util.JaxbUnknownAdapter;
-
import java.util.ArrayList;
import java.util.List;
@@ -33,47 +25,51 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.drools.event.rule.ObjectInsertedEvent;
+import org.drools.event.rule.ObjectRetractedEvent;
+import org.drools.event.rule.ObjectUpdatedEvent;
+import org.drools.event.rule.WorkingMemoryEventListener;
+import org.drools.xml.jaxb.util.JaxbListAdapter;
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class ChangeCollector implements WorkingMemoryEventListener {
+public class ChangeCollector
+ implements
+ WorkingMemoryEventListener {
@XmlElement
@XmlJavaTypeAdapter(JaxbListAdapter.class)
private List<String> retracted;
-
+
@XmlElement
@XmlJavaTypeAdapter(JaxbListAdapter.class)
- private List changes;
+ private List changes;
-
public List<String> getRetracted() {
return retracted;
}
-
public List getChanges() {
return changes;
}
-
public void objectInserted(ObjectInsertedEvent event) {
-
+
}
public void objectUpdated(ObjectUpdatedEvent event) {
- if (changes == null) changes = new ArrayList();
- if (event.getObject() instanceof Cheese) {
+ if ( changes == null ) changes = new ArrayList();
+ if ( event.getObject() instanceof Cheese ) {
Cheese c = (Cheese) event.getObject();
- changes.add(c);
+ changes.add( c );
}
}
public void objectRetracted(ObjectRetractedEvent event) {
- if (retracted == null) retracted = new ArrayList<String>();
- if (event.getOldObject() instanceof Cheese) {
+ if ( retracted == null ) retracted = new ArrayList<String>();
+ if ( event.getOldObject() instanceof Cheese ) {
Cheese c = (Cheese) event.getOldObject();
- retracted.add(c.getType());
+ retracted.add( c.getType() );
}
}
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/Cheese.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/Cheese.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/Cheese.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -16,8 +16,6 @@
package org.drools;
-
-
import java.io.Serializable;
import java.util.Date;
@@ -28,16 +26,16 @@
implements
Serializable {
- public static final String STILTON = "stilton";
+ public static final String STILTON = "stilton";
/**
*
*/
- private static final long serialVersionUID = 510l;
- private String type;
- private int price;
- private int oldPrice;
- private Date usedBy;
+ private static final long serialVersionUID = 510l;
+ private String type;
+ private int price;
+ private int oldPrice;
+ private Date usedBy;
public Cheese() {
@@ -58,7 +56,7 @@
public Cheese(final String type,
final int price,
- final int oldPrice ) {
+ final int oldPrice) {
super();
this.type = type;
this.price = price;
@@ -121,8 +119,7 @@
this.usedBy = usedBy;
}
-
public int throwException() {
- throw new RuntimeException("eeeeee");
+ throw new RuntimeException( "eeeeee" );
}
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/ObjectFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/ObjectFactory.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/ObjectFactory.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -23,16 +23,16 @@
public ChangeCollector createChangeCollector() {
return new ChangeCollector();
}
-
+
public Cheese createCheese() {
return new Cheese();
}
-
+
public Person createPerson() {
return new Person();
- }
-
+ }
+
public TestVariable createTestVariable() {
return new TestVariable();
- }
-}
+ }
+}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/Person.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/Person.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/Person.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -16,7 +16,6 @@
package org.drools;
-
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -48,34 +47,34 @@
private Cheese cheese;
- private List addresses = new ArrayList();
+ private List addresses = new ArrayList();
-// public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-// name = (String)in.readObject();
-// likes = (String)in.readObject();
-// age = in.readInt();
-// bigDecimal = (BigDecimal)in.readObject();
-// bigInteger = (BigInteger)in.readObject();
-// hair = (String)in.readObject();
-// sex = in.readChar();
-// alive = in.readBoolean();
-// status = (String)in.readObject();
-// cheese = (Cheese)in.readObject();
-// addresses = (List)in.readObject();
-// }
-//
-// public void writeExternal(ObjectOutput out) throws IOException {
-// out.writeObject(name);
-// out.writeObject(likes);
-// out.writeObject(bigDecimal);
-// out.writeObject(bigInteger);
-// out.writeObject(hair);
-// out.writeChar(sex);
-// out.writeBoolean(alive);
-// out.writeObject(status);
-// out.writeObject(cheese);
-// out.writeObject(addresses);
-// }
+ // public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ // name = (String)in.readObject();
+ // likes = (String)in.readObject();
+ // age = in.readInt();
+ // bigDecimal = (BigDecimal)in.readObject();
+ // bigInteger = (BigInteger)in.readObject();
+ // hair = (String)in.readObject();
+ // sex = in.readChar();
+ // alive = in.readBoolean();
+ // status = (String)in.readObject();
+ // cheese = (Cheese)in.readObject();
+ // addresses = (List)in.readObject();
+ // }
+ //
+ // public void writeExternal(ObjectOutput out) throws IOException {
+ // out.writeObject(name);
+ // out.writeObject(likes);
+ // out.writeObject(bigDecimal);
+ // out.writeObject(bigInteger);
+ // out.writeObject(hair);
+ // out.writeChar(sex);
+ // out.writeBoolean(alive);
+ // out.writeObject(status);
+ // out.writeObject(cheese);
+ // out.writeObject(addresses);
+ // }
public List getAddresses() {
return addresses;
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/TestVariable.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/TestVariable.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/TestVariable.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -24,21 +24,21 @@
@XmlRootElement
public class TestVariable {
-
+
private String name;
-
+
public TestVariable() {
-
+
}
-
+
public TestVariable(String name) {
this.name = name;
}
-
+
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/BatchTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/BatchTest.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/BatchTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -41,7 +41,6 @@
import org.drools.common.InternalRuleBase;
import org.drools.core.util.StringUtils;
import org.drools.definition.KnowledgePackage;
-import org.drools.grid.GridConnection;
import org.drools.grid.GridNode;
import org.drools.grid.impl.GridImpl;
import org.drools.grid.service.directory.WhitePages;
@@ -75,7 +74,7 @@
@RunWith(JUnit4.class)
public abstract class BatchTest extends ContextTestSupport {
- protected GridNode node;
+ protected GridNode node;
protected CommandExecutor exec;
protected String dataformat;
protected String copyToDataFormat;
@@ -88,7 +87,7 @@
public void configure() throws Exception {
JaxbDataFormat jaxbDf = new JaxbDataFormat();
jaxbDf.setContextPath( "org.drools" );
-
+
from( "direct:exec" ).policy( new DroolsPolicy() ).unmarshal( dataformat ).to( "drools://node/ksession1" ).marshal( dataformat );
from( "direct:execWithLookup" ).policy( new DroolsPolicy() ).unmarshal( dataformat ).to( "drools://node" ).marshal( dataformat );
from( "direct:unmarshal" ).policy( new DroolsPolicy() ).unmarshal( dataformat );
@@ -127,12 +126,13 @@
Context context = super.createJndiContext();
GridImpl grid = new GridImpl( new HashMap() );
- grid.addService( WhitePages.class, new WhitePagesImpl() );
+ grid.addService( WhitePages.class,
+ new WhitePagesImpl() );
node = grid.createGridNode( "node" );
node.set( "ksession1",
this.exec );
context.bind( "node",
- node );
+ node );
return context;
}
@@ -147,7 +147,7 @@
protected final TemplateRegistry tempReg = new SimpleTemplateRegistry();
- protected PrintWriter writer;
+ protected PrintWriter writer;
@Before
public void before() throws Exception {
@@ -164,14 +164,15 @@
XMLUnit.setNormalizeWhitespace( true );
XMLUnit.setNormalize( true );
- if ( !StringUtils.isEmpty( copyToDataFormat )) {
- writer = new PrintWriter(new BufferedWriter( new FileWriter( copyToDataFormat + ".mvt", true )));
+ if ( !StringUtils.isEmpty( copyToDataFormat ) ) {
+ writer = new PrintWriter( new BufferedWriter( new FileWriter( copyToDataFormat + ".mvt",
+ true ) ) );
}
}
@After
public void after() throws Exception {
- if ( !StringUtils.isEmpty( copyToDataFormat )) {
+ if ( !StringUtils.isEmpty( copyToDataFormat ) ) {
writer.close();
}
}
@@ -185,15 +186,17 @@
var );
}
- if ( !StringUtils.isEmpty( copyToDataFormat )) {
- writer.println();
- writer.println("@declare{\"" + name + "\"}");
+ if ( !StringUtils.isEmpty( copyToDataFormat ) ) {
+ writer.println();
+ writer.println( "@declare{\"" + name + "\"}" );
}
String s = (String) TemplateRuntime.execute( tempReg.getNamedTemplate( name ),
map );
- if ( !StringUtils.isEmpty( copyToDataFormat )) {
- writer.print(prettyPrintXml( template.requestBody("direct:to-" + copyToDataFormat, s, String.class) ) );
- writer.println("@end{}");
+ if ( !StringUtils.isEmpty( copyToDataFormat ) ) {
+ writer.print( prettyPrintXml( template.requestBody( "direct:to-" + copyToDataFormat,
+ s,
+ String.class ) ) );
+ writer.println( "@end{}" );
}
return roundTripFromXml( s.trim() );
@@ -882,12 +885,11 @@
String outXml = execContent( "testQuery.in.1" );
-
// Order is not determinstic, so can't test.
-// assertXMLEqual( getContent( "testQuery.expected.1" ),
-// outXml );
+ // assertXMLEqual( getContent( "testQuery.expected.1" ),
+ // outXml );
getContent( "testQuery.expected.1" ); // just to force a tostring for comparison
-
+
ExecutionResults batchResult = unmarshalOutXml( outXml,
ExecutionResults.class );
@@ -1472,7 +1474,6 @@
}
-
public void FIXMEtestInsertObjectWithDeclaredFactAndQuery() throws Exception {
String str = "";
str += "package org.foo \n";
@@ -1523,13 +1524,14 @@
str += " then \n";
str += " $c.setPrice( $c.getPrice() + 5 ); \n";
str += "end\n";
-
+
StatefulKnowledgeSession ksession = getStatefulKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
String outXml = execContent( "testExecutionNodeLookup.in.1" );
- ExecutionResults results = unmarshalOutXml( outXml, ExecutionResults.class );
-
+ ExecutionResults results = unmarshalOutXml( outXml,
+ ExecutionResults.class );
+
Cheese stilton = (Cheese) results.getValue( "outStilton" );
assertEquals( 30,
stilton.getPrice() );
@@ -1539,10 +1541,11 @@
assertEquals( 30,
stilton.getPrice() );
- assertXMLEqual( getContent( "testExecutionNodeLookup.expected.1", factHandle.toExternalForm() ),
+ assertXMLEqual( getContent( "testExecutionNodeLookup.expected.1",
+ factHandle.toExternalForm() ),
outXml );
- }
-
+ }
+
public static class TestWorkItemHandler
implements
WorkItemHandler {
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointTest.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -52,45 +52,59 @@
public void testSessionInsert() throws Exception {
Person person = new Person();
- person.setName("Mauricio");
+ person.setName( "Mauricio" );
- InsertObjectCommand cmd = (InsertObjectCommand) CommandFactory.newInsert(person,"salaboy");
+ InsertObjectCommand cmd = (InsertObjectCommand) CommandFactory.newInsert( person,
+ "salaboy" );
- ExecutionResults response = (ExecutionResults) template.requestBody("direct:test-with-session", cmd);
- assertTrue("Expected valid ExecutionResults object", response != null);
- assertTrue("ExecutionResults missing expected fact", response.getFactHandle("salaboy") != null);
+ ExecutionResults response = (ExecutionResults) template.requestBody( "direct:test-with-session",
+ cmd );
+ assertTrue( "Expected valid ExecutionResults object",
+ response != null );
+ assertTrue( "ExecutionResults missing expected fact",
+ response.getFactHandle( "salaboy" ) != null );
}
public void testNoSessionInsert() throws Exception {
Person person = new Person();
- person.setName("Mauricio");
+ person.setName( "Mauricio" );
- InsertObjectCommand cmd = (InsertObjectCommand) CommandFactory.newInsert(person,"salaboy");
+ InsertObjectCommand cmd = (InsertObjectCommand) CommandFactory.newInsert( person,
+ "salaboy" );
- ExecutionResults response = (ExecutionResults) template.requestBodyAndHeader("direct:test-no-session", cmd,
- DroolsComponent.DROOLS_LOOKUP, "ksession1");
- assertTrue("Expected valid ExecutionResults object", response != null);
- assertTrue("ExecutionResults missing expected fact", response.getFactHandle("salaboy") != null);
+ ExecutionResults response = (ExecutionResults) template.requestBodyAndHeader( "direct:test-no-session",
+ cmd,
+ DroolsComponent.DROOLS_LOOKUP,
+ "ksession1" );
+ assertTrue( "Expected valid ExecutionResults object",
+ response != null );
+ assertTrue( "ExecutionResults missing expected fact",
+ response.getFactHandle( "salaboy" ) != null );
}
public void testSessionGetObject() throws Exception {
- FactHandle factHandle = new DefaultFactHandle(handle);
- GetObjectCommand cmd = (GetObjectCommand) CommandFactory.newGetObject(factHandle);
- cmd.setOutIdentifier("rider");
+ FactHandle factHandle = new DefaultFactHandle( handle );
+ GetObjectCommand cmd = (GetObjectCommand) CommandFactory.newGetObject( factHandle );
+ cmd.setOutIdentifier( "rider" );
- ExecutionResults response = (ExecutionResults) template.requestBody("direct:test-with-session", cmd);
- assertTrue("Expected valid ExecutionResults object", response != null);
- assertTrue("ExecutionResults missing expected object", response.getValue("rider") != null);
- assertTrue("FactHandle object not of expected type", response.getValue("rider") instanceof Person);
- assertEquals("Hadrian", ((Person)response.getValue("rider")).getName());
+ ExecutionResults response = (ExecutionResults) template.requestBody( "direct:test-with-session",
+ cmd );
+ assertTrue( "Expected valid ExecutionResults object",
+ response != null );
+ assertTrue( "ExecutionResults missing expected object",
+ response.getValue( "rider" ) != null );
+ assertTrue( "FactHandle object not of expected type",
+ response.getValue( "rider" ) instanceof Person );
+ assertEquals( "Hadrian",
+ ((Person) response.getValue( "rider" )).getName() );
}
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:test-with-session").to("drools://node/ksession1");
- from("direct:test-no-session").to("drools://node");
+ from( "direct:test-with-session" ).to( "drools://node/ksession1" );
+ from( "direct:test-no-session" ).to( "drools://node" );
}
};
}
@@ -98,15 +112,16 @@
@Override
protected void configureDroolsContext(Context jndiContext) {
Person me = new Person();
- me.setName("Hadrian");
+ me.setName( "Hadrian" );
- StatefulKnowledgeSession ksession = registerKnowledgeRuntime("ksession1", null);
- InsertObjectCommand cmd = new InsertObjectCommand(me);
- cmd.setOutIdentifier("camel-rider");
- cmd.setReturnObject(false);
- BatchExecutionCommandImpl script = new BatchExecutionCommandImpl( Arrays.asList( new GenericCommand<?>[]{cmd} ));
-
+ StatefulKnowledgeSession ksession = registerKnowledgeRuntime( "ksession1",
+ null );
+ InsertObjectCommand cmd = new InsertObjectCommand( me );
+ cmd.setOutIdentifier( "camel-rider" );
+ cmd.setReturnObject( false );
+ BatchExecutionCommandImpl script = new BatchExecutionCommandImpl( Arrays.asList( new GenericCommand< ? >[]{cmd} ) );
+
ExecutionResults results = ksession.execute( script );
- handle = ((FactHandle)results.getFactHandle("camel-rider")).toExternalForm();
+ handle = ((FactHandle) results.getFactHandle( "camel-rider" )).toExternalForm();
}
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxWrapperCollectionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxWrapperCollectionTest.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxWrapperCollectionTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -61,136 +61,149 @@
*/
public class CamelEndpointWithJaxWrapperCollectionTest extends DroolsCamelTestSupport {
- private String handle;
- private JAXBContext jaxbContext;
+ private String handle;
+ private JAXBContext jaxbContext;
- public void testWorkingSetGlobalTestSessionSetAndGetGlobal() throws Exception {
+ public void testWorkingSetGlobalTestSessionSetAndGetGlobal() throws Exception {
- BatchExecutionCommandImpl cmd = new BatchExecutionCommandImpl();
- cmd.setLookup("ksession1");
-
- SetGlobalCommand setGlobal = new SetGlobalCommand("list", new WrappedList());
- setGlobal.setOut(true);
-
- cmd.getCommands().add(setGlobal);
- cmd.getCommands().add(new InsertObjectCommand(new Person("baunax")));
- cmd.getCommands().add(new FireAllRulesCommand());
- cmd.getCommands().add(new GetGlobalCommand("list"));
-
- Marshaller marshaller = getJaxbContext().createMarshaller();
- marshaller.setProperty("jaxb.formatted.output", true);
- StringWriter xml = new StringWriter();
- marshaller.marshal(cmd, xml);
+ BatchExecutionCommandImpl cmd = new BatchExecutionCommandImpl();
+ cmd.setLookup( "ksession1" );
- System.out.println(xml.toString());
-
- byte[] response = (byte[]) template.requestBody("direct:test-with-session", xml.toString());
- assertNotNull(response);
- System.out.println("response:\n" + new String(response));
- Unmarshaller unmarshaller = getJaxbContext().createUnmarshaller();
- ExecutionResults res = (ExecutionResults) unmarshaller.unmarshal(new ByteArrayInputStream(response));
- WrappedList resp = (WrappedList) res.getValue("list");
- assertNotNull(resp);
-
- assertEquals(resp.size(), 2);
- assertEquals("baunax", resp.get(0).getName());
- assertEquals("Hadrian", resp.get(1).getName());
+ SetGlobalCommand setGlobal = new SetGlobalCommand( "list",
+ new WrappedList() );
+ setGlobal.setOut( true );
- }
-
- @Override
- protected void configureDroolsContext(Context jndiContext) {
- Person me = new Person();
- me.setName("Hadrian");
+ cmd.getCommands().add( setGlobal );
+ cmd.getCommands().add( new InsertObjectCommand( new Person( "baunax" ) ) );
+ cmd.getCommands().add( new FireAllRulesCommand() );
+ cmd.getCommands().add( new GetGlobalCommand( "list" ) );
- String rule = "";
- rule += "package org.drools.pipeline.camel \n";
- rule += "import org.drools.pipeline.camel.Person\n";
- rule += "import org.drools.pipeline.camel.WrappedList\n";
- rule += "global WrappedList list\n";
- rule += "rule rule1 \n";
- rule += " when \n";
- rule += " $p : Person() \n";
- rule += " \n";
- rule += " then \n";
- rule += " System.out.println(\"executed\"); \n";
- rule += " list.add($p); \n";
- rule += "end\n";
+ Marshaller marshaller = getJaxbContext().createMarshaller();
+ marshaller.setProperty( "jaxb.formatted.output",
+ true );
+ StringWriter xml = new StringWriter();
+ marshaller.marshal( cmd,
+ xml );
- StatefulKnowledgeSession ksession = registerKnowledgeRuntime("ksession1", rule);
- InsertObjectCommand cmd = new InsertObjectCommand(me);
- cmd.setOutIdentifier("camel-rider");
- cmd.setReturnObject(false);
- BatchExecutionCommandImpl script = new BatchExecutionCommandImpl( Arrays.asList( new GenericCommand<?>[]{cmd} ));
-
+ System.out.println( xml.toString() );
+
+ byte[] response = (byte[]) template.requestBody( "direct:test-with-session",
+ xml.toString() );
+ assertNotNull( response );
+ System.out.println( "response:\n" + new String( response ) );
+ Unmarshaller unmarshaller = getJaxbContext().createUnmarshaller();
+ ExecutionResults res = (ExecutionResults) unmarshaller.unmarshal( new ByteArrayInputStream( response ) );
+ WrappedList resp = (WrappedList) res.getValue( "list" );
+ assertNotNull( resp );
+
+ assertEquals( resp.size(),
+ 2 );
+ assertEquals( "baunax",
+ resp.get( 0 ).getName() );
+ assertEquals( "Hadrian",
+ resp.get( 1 ).getName() );
+
+ }
+
+ @Override
+ protected void configureDroolsContext(Context jndiContext) {
+ Person me = new Person();
+ me.setName( "Hadrian" );
+
+ String rule = "";
+ rule += "package org.drools.pipeline.camel \n";
+ rule += "import org.drools.pipeline.camel.Person\n";
+ rule += "import org.drools.pipeline.camel.WrappedList\n";
+ rule += "global WrappedList list\n";
+ rule += "rule rule1 \n";
+ rule += " when \n";
+ rule += " $p : Person() \n";
+ rule += " \n";
+ rule += " then \n";
+ rule += " System.out.println(\"executed\"); \n";
+ rule += " list.add($p); \n";
+ rule += "end\n";
+
+ StatefulKnowledgeSession ksession = registerKnowledgeRuntime( "ksession1",
+ rule );
+ InsertObjectCommand cmd = new InsertObjectCommand( me );
+ cmd.setOutIdentifier( "camel-rider" );
+ cmd.setReturnObject( false );
+ BatchExecutionCommandImpl script = new BatchExecutionCommandImpl( Arrays.asList( new GenericCommand< ? >[]{cmd} ) );
+
ExecutionResults results = ksession.execute( script );
- handle = ((FactHandle)results.getFactHandle("camel-rider")).toExternalForm();
- }
+ handle = ((FactHandle) results.getFactHandle( "camel-rider" )).toExternalForm();
+ }
- @Override
- protected StatefulKnowledgeSession registerKnowledgeRuntime(String identifier, String rule) {
- KnowledgeBuilder kbuilder = node.get(KnowledgeBuilderFactoryService.class).newKnowledgeBuilder();
+ @Override
+ protected StatefulKnowledgeSession registerKnowledgeRuntime(String identifier,
+ String rule) {
+ KnowledgeBuilder kbuilder = node.get( KnowledgeBuilderFactoryService.class ).newKnowledgeBuilder();
- Options xjcOpts = new Options();
- xjcOpts.setSchemaLanguage( Language.XMLSCHEMA );
+ Options xjcOpts = new Options();
+ xjcOpts.setSchemaLanguage( Language.XMLSCHEMA );
- try {
- KnowledgeBuilderHelper.addXsdModel( ResourceFactory.newClassPathResource("person.xsd", getClass()),
- kbuilder,
- xjcOpts,
- "xsd" );
- } catch (IOException e) {
- LOG.error("Errors while adding xsd model. ", kbuilder.getErrors());
- }
+ try {
+ KnowledgeBuilderHelper.addXsdModel( ResourceFactory.newClassPathResource( "person.xsd",
+ getClass() ),
+ kbuilder,
+ xjcOpts,
+ "xsd" );
+ } catch ( IOException e ) {
+ LOG.error( "Errors while adding xsd model. ",
+ kbuilder.getErrors() );
+ }
- assertFalse( kbuilder.hasErrors() );
+ assertFalse( kbuilder.hasErrors() );
- if (rule != null && rule.length() > 0) {
- kbuilder.add(ResourceFactory.newByteArrayResource(rule.getBytes()), ResourceType.DRL);
+ if ( rule != null && rule.length() > 0 ) {
+ kbuilder.add( ResourceFactory.newByteArrayResource( rule.getBytes() ),
+ ResourceType.DRL );
- if (kbuilder.hasErrors()) {
- LOG.info("Errors while adding rule. ", kbuilder.getErrors());
- }
- }
+ if ( kbuilder.hasErrors() ) {
+ LOG.info( "Errors while adding rule. ",
+ kbuilder.getErrors() );
+ }
+ }
- assertFalse(kbuilder.hasErrors());
+ assertFalse( kbuilder.hasErrors() );
- KnowledgeBase kbase = node.get(KnowledgeBaseFactoryService.class).newKnowledgeBase();
- kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
+ KnowledgeBase kbase = node.get( KnowledgeBaseFactoryService.class ).newKnowledgeBase();
+ kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
- StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
- node.set(identifier, session);
- return session;
- }
-
+ StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
+ node.set( identifier,
+ session );
+ return session;
+ }
+
public JAXBContext getJaxbContext() {
if ( this.jaxbContext == null ) {
JaxbDataFormat def = new JaxbDataFormat();
def.setPrettyPrint( true );
def.setContextPath( "org.drools.model:org.drools.pipeline.camel" );
-
+
// create a jaxbContext for the test to use outside of Camel.
- StatefulKnowledgeSession ksession1 = (StatefulKnowledgeSession) node.get( "ksession1", CommandExecutor.class );
+ StatefulKnowledgeSession ksession1 = (StatefulKnowledgeSession) node.get( "ksession1",
+ CommandExecutor.class );
KnowledgeBase kbase = ksession1.getKnowledgeBase();
ClassLoader originalCl = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader( ((ReteooRuleBase) ((KnowledgeBaseImpl) kbase).getRuleBase()).getRootClassLoader() );
def = DroolsPolicy.augmentJaxbDataFormatDefinition( def );
-
- org.apache.camel.converter.jaxb.JaxbDataFormat jaxbDataformat = ( org.apache.camel.converter.jaxb.JaxbDataFormat ) def.getDataFormat( this.context.getRoutes().get( 0 ).getRouteContext() );
-
-
+
+ org.apache.camel.converter.jaxb.JaxbDataFormat jaxbDataformat = (org.apache.camel.converter.jaxb.JaxbDataFormat) def.getDataFormat( this.context.getRoutes().get( 0 ).getRouteContext() );
+
jaxbContext = jaxbDataformat.getContext();
} catch ( JAXBException e ) {
throw new RuntimeException( e );
} finally {
Thread.currentThread().setContextClassLoader( originalCl );
- }
+ }
}
-
+
return jaxbContext;
- }
-
+ }
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -199,9 +212,9 @@
JaxbDataFormat def = new JaxbDataFormat();
def.setPrettyPrint( true );
def.setContextPath( "org.drools.model:org.drools.pipeline.camel" );
-
- from("direct:test-with-session").policy( new DroolsPolicy() ).
- unmarshal(def).to("drools:node/ksession1").marshal(def);
+
+ from( "direct:test-with-session" ).policy( new DroolsPolicy() ).
+ unmarshal( def ).to( "drools:node/ksession1" ).marshal( def );
}
};
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -17,24 +17,16 @@
package org.drools.camel.component;
import java.io.ByteArrayInputStream;
-import java.io.StringReader;
import java.io.StringWriter;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
-import javax.naming.NamingException;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.model.OnCompletionDefinition;
-import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.dataformat.JaxbDataFormat;
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactoryService;
@@ -43,25 +35,14 @@
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.builder.KnowledgeBuilderFactoryService;
import org.drools.builder.ResourceType;
-import org.drools.builder.conf.impl.JaxbConfigurationImpl;
-import org.drools.builder.help.KnowledgeBuilderHelper;
import org.drools.command.impl.GenericCommand;
import org.drools.command.runtime.BatchExecutionCommandImpl;
-import org.drools.command.runtime.GetGlobalCommand;
-import org.drools.command.runtime.SetGlobalCommand;
-import org.drools.command.runtime.process.AbortWorkItemCommand;
-import org.drools.command.runtime.process.CompleteWorkItemCommand;
-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.GetObjectCommand;
-import org.drools.command.runtime.rule.GetObjectsCommand;
import org.drools.command.runtime.rule.InsertElementsCommand;
import org.drools.command.runtime.rule.InsertObjectCommand;
-import org.drools.command.runtime.rule.ModifyCommand;
import org.drools.command.runtime.rule.QueryCommand;
-import org.drools.command.runtime.rule.RetractCommand;
-import org.drools.command.runtime.rule.ModifyCommand.SetterImpl;
import org.drools.common.DefaultFactHandle;
import org.drools.impl.KnowledgeBaseImpl;
import org.drools.io.ResourceFactory;
@@ -70,12 +51,9 @@
import org.drools.runtime.CommandExecutor;
import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
-import org.drools.runtime.impl.ExecutionResultImpl;
-import org.drools.runtime.pipeline.impl.DroolsJaxbHelperProviderImpl;
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.QueryResultsRow;
import org.drools.runtime.rule.impl.FlatQueryResults;
-import org.drools.xml.jaxb.util.JaxbListWrapper;
import com.sun.tools.xjc.Language;
import com.sun.tools.xjc.Options;
@@ -90,7 +68,7 @@
private String handle;
private JAXBContext jaxbContext;
- public void testSessionInsert() throws Exception {
+ public void testSessionInsert() throws Exception {
BatchExecutionCommandImpl cmd = new BatchExecutionCommandImpl();
cmd.setLookup( "ksession1" );
@@ -180,7 +158,8 @@
expectedXml += " <facts/>\n";
expectedXml += "</execution-results>\n";
- assertXMLEqual(expectedXml, outXml);
+ assertXMLEqual( expectedXml,
+ outXml );
cmd = "<batch-execution lookup='ksession1'>\n";
cmd += " <get-object out-identifier='rider' fact-handle='" + handle + "'/>\n";
@@ -383,7 +362,7 @@
from( "direct:test-with-session" ).policy( new DroolsPolicy() ).unmarshal( def ).to( "drools:node/ksession1" ).marshal( def );
from( "direct:test-no-session" ).policy( new DroolsPolicy() ).unmarshal( def ).to( "drools:node" ).marshal( def );
- }
+ }
};
}
@@ -392,29 +371,29 @@
JaxbDataFormat def = new JaxbDataFormat();
def.setPrettyPrint( true );
def.setContextPath( "org.drools.model:org.drools.pipeline.camel" );
-
+
// create a jaxbContext for the test to use outside of Camel.
- StatefulKnowledgeSession ksession1 = (StatefulKnowledgeSession) node.get( "ksession1", CommandExecutor.class );
+ StatefulKnowledgeSession ksession1 = (StatefulKnowledgeSession) node.get( "ksession1",
+ CommandExecutor.class );
KnowledgeBase kbase = ksession1.getKnowledgeBase();
ClassLoader originalCl = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader( ((ReteooRuleBase) ((KnowledgeBaseImpl) kbase).getRuleBase()).getRootClassLoader() );
def = DroolsPolicy.augmentJaxbDataFormatDefinition( def );
-
- org.apache.camel.converter.jaxb.JaxbDataFormat jaxbDataformat = ( org.apache.camel.converter.jaxb.JaxbDataFormat ) def.getDataFormat( this.context.getRoutes().get( 0 ).getRouteContext() );
-
-
+
+ org.apache.camel.converter.jaxb.JaxbDataFormat jaxbDataformat = (org.apache.camel.converter.jaxb.JaxbDataFormat) def.getDataFormat( this.context.getRoutes().get( 0 ).getRouteContext() );
+
jaxbContext = jaxbDataformat.getContext();
} catch ( JAXBException e ) {
throw new RuntimeException( e );
} finally {
Thread.currentThread().setContextClassLoader( originalCl );
- }
+ }
}
-
+
return jaxbContext;
}
-
+
@Override
protected void configureDroolsContext(javax.naming.Context jndiContext) {
Person me = new Person();
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbXSDModelTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbXSDModelTest.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbXSDModelTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -21,9 +21,6 @@
import java.io.StringWriter;
import java.lang.reflect.Method;
import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import javax.naming.Context;
import javax.xml.bind.JAXBContext;
@@ -61,185 +58,209 @@
*/
public class CamelEndpointWithJaxbXSDModelTest extends DroolsCamelTestSupport {
- private JAXBContext jaxbContext;
- private DroolsCompositeClassLoader classLoader;
+ private JAXBContext jaxbContext;
+ private DroolsCompositeClassLoader classLoader;
- public void testSessionInsert() throws Exception {
- Class<?> personClass = classLoader.loadClass("org.drools.model.Person");
- assertNotNull(personClass.getPackage());
- Class<?> addressClass = classLoader.loadClass("org.drools.model.AddressType");
- assertNotNull(addressClass.getPackage());
- Object baunax = personClass.newInstance();
- Object lucaz = personClass.newInstance();
-
- Method setName = personClass.getMethod("setName", String.class);
- setName.invoke(baunax, "baunax");
- setName.invoke(lucaz, "lucaz");
+ public void testSessionInsert() throws Exception {
+ Class< ? > personClass = classLoader.loadClass( "org.drools.model.Person" );
+ assertNotNull( personClass.getPackage() );
+ Class< ? > addressClass = classLoader.loadClass( "org.drools.model.AddressType" );
+ assertNotNull( addressClass.getPackage() );
+ Object baunax = personClass.newInstance();
+ Object lucaz = personClass.newInstance();
- Method setAddress = personClass.getMethod("setAddress", addressClass);
- Method setStreet = addressClass.getMethod("setStreet", String.class);
- Method setPostalCode = addressClass.getMethod("setPostalCode", BigInteger.class);
- Object lucazAddress = addressClass.newInstance();
- setStreet.invoke(lucazAddress, "Unknow 342");
- setPostalCode.invoke(lucazAddress, new BigInteger("1234"));
-
- Object baunaxAddress = addressClass.newInstance();
- setStreet.invoke(baunaxAddress, "New Street 123");
- setPostalCode.invoke(baunaxAddress, new BigInteger("5678"));
-
- setAddress.invoke(lucaz, lucazAddress);
- setAddress.invoke(baunax, baunaxAddress);
-
- BatchExecutionCommandImpl cmd = new BatchExecutionCommandImpl();
- cmd.setLookup("ksession1");
- cmd.getCommands().add(new InsertObjectCommand(lucaz, "lucaz"));
- cmd.getCommands().add(new InsertObjectCommand(baunax, "baunax"));
- cmd.getCommands().add(new FireAllRulesCommand());
-
- StringWriter xmlReq = new StringWriter();
- Marshaller marshaller = getJaxbContext().createMarshaller();
- marshaller.setProperty("jaxb.formatted.output", true);
- marshaller.marshal(cmd, xmlReq);
-
- System.out.println(xmlReq.toString());
-
- String xmlCmd = "";
- xmlCmd += "<batch-execution lookup='ksession1'>\n";
- xmlCmd += " <insert out-identifier='lucaz'>\n";
- xmlCmd += " <object>\n";
- xmlCmd += " <Person xmlns='http://drools.org/model' >\n";
- xmlCmd += " <name>lucaz</name>\n";
- xmlCmd += " <age>25</age>\n";
- xmlCmd += " </Person>\n";
- xmlCmd += " </object>\n";
- xmlCmd += " </insert>\n";
- xmlCmd += " <insert out-identifier='baunax'>\n";
- xmlCmd += " <object>\n";
- xmlCmd += " <Person xmlns='http://drools.org/model' >\n";
- xmlCmd += " <name>baunax</name>\n";
- xmlCmd += " <age>21</age>\n";
- xmlCmd += " </Person>\n";
- xmlCmd += " </object>\n";
- xmlCmd += " </insert>\n";
- xmlCmd += " <fire-all-rules />";
- xmlCmd += "</batch-execution>\n";
+ Method setName = personClass.getMethod( "setName",
+ String.class );
+ setName.invoke( baunax,
+ "baunax" );
+ setName.invoke( lucaz,
+ "lucaz" );
- byte[] xmlResp = (byte[]) template.requestBody("direct:test-with-session", xmlReq.toString() );
- assertNotNull(xmlResp);
- System.out.println(new String(xmlResp));
+ Method setAddress = personClass.getMethod( "setAddress",
+ addressClass );
+ Method setStreet = addressClass.getMethod( "setStreet",
+ String.class );
+ Method setPostalCode = addressClass.getMethod( "setPostalCode",
+ BigInteger.class );
+ Object lucazAddress = addressClass.newInstance();
+ setStreet.invoke( lucazAddress,
+ "Unknow 342" );
+ setPostalCode.invoke( lucazAddress,
+ new BigInteger( "1234" ) );
- ExecutionResults resp = (ExecutionResults) getJaxbContext().createUnmarshaller().unmarshal(new ByteArrayInputStream(xmlResp));
- assertNotNull(resp);
-
- assertEquals(2, resp.getIdentifiers().size());
- assertNotNull(resp.getValue("lucaz"));
- assertNotNull(resp.getValue("baunax"));
-
- assertNotNull(resp.getFactHandle("lucaz"));
- assertNotNull(resp.getFactHandle("baunax"));
- }
-
+ Object baunaxAddress = addressClass.newInstance();
+ setStreet.invoke( baunaxAddress,
+ "New Street 123" );
+ setPostalCode.invoke( baunaxAddress,
+ new BigInteger( "5678" ) );
+
+ setAddress.invoke( lucaz,
+ lucazAddress );
+ setAddress.invoke( baunax,
+ baunaxAddress );
+
+ BatchExecutionCommandImpl cmd = new BatchExecutionCommandImpl();
+ cmd.setLookup( "ksession1" );
+ cmd.getCommands().add( new InsertObjectCommand( lucaz,
+ "lucaz" ) );
+ cmd.getCommands().add( new InsertObjectCommand( baunax,
+ "baunax" ) );
+ cmd.getCommands().add( new FireAllRulesCommand() );
+
+ StringWriter xmlReq = new StringWriter();
+ Marshaller marshaller = getJaxbContext().createMarshaller();
+ marshaller.setProperty( "jaxb.formatted.output",
+ true );
+ marshaller.marshal( cmd,
+ xmlReq );
+
+ System.out.println( xmlReq.toString() );
+
+ String xmlCmd = "";
+ xmlCmd += "<batch-execution lookup='ksession1'>\n";
+ xmlCmd += " <insert out-identifier='lucaz'>\n";
+ xmlCmd += " <object>\n";
+ xmlCmd += " <Person xmlns='http://drools.org/model' >\n";
+ xmlCmd += " <name>lucaz</name>\n";
+ xmlCmd += " <age>25</age>\n";
+ xmlCmd += " </Person>\n";
+ xmlCmd += " </object>\n";
+ xmlCmd += " </insert>\n";
+ xmlCmd += " <insert out-identifier='baunax'>\n";
+ xmlCmd += " <object>\n";
+ xmlCmd += " <Person xmlns='http://drools.org/model' >\n";
+ xmlCmd += " <name>baunax</name>\n";
+ xmlCmd += " <age>21</age>\n";
+ xmlCmd += " </Person>\n";
+ xmlCmd += " </object>\n";
+ xmlCmd += " </insert>\n";
+ xmlCmd += " <fire-all-rules />";
+ xmlCmd += "</batch-execution>\n";
+
+ byte[] xmlResp = (byte[]) template.requestBody( "direct:test-with-session",
+ xmlReq.toString() );
+ assertNotNull( xmlResp );
+ System.out.println( new String( xmlResp ) );
+
+ ExecutionResults resp = (ExecutionResults) getJaxbContext().createUnmarshaller().unmarshal( new ByteArrayInputStream( xmlResp ) );
+ assertNotNull( resp );
+
+ assertEquals( 2,
+ resp.getIdentifiers().size() );
+ assertNotNull( resp.getValue( "lucaz" ) );
+ assertNotNull( resp.getValue( "baunax" ) );
+
+ assertNotNull( resp.getFactHandle( "lucaz" ) );
+ assertNotNull( resp.getFactHandle( "baunax" ) );
+ }
+
public JAXBContext getJaxbContext() {
if ( this.jaxbContext == null ) {
JaxbDataFormat def = new JaxbDataFormat();
def.setPrettyPrint( true );
def.setContextPath( "org.drools.model:org.drools.pipeline.camel" );
-
+
// create a jaxbContext for the test to use outside of Camel.
- StatefulKnowledgeSession ksession1 = (StatefulKnowledgeSession) node.get( "ksession1", CommandExecutor.class );
+ StatefulKnowledgeSession ksession1 = (StatefulKnowledgeSession) node.get( "ksession1",
+ CommandExecutor.class );
KnowledgeBase kbase = ksession1.getKnowledgeBase();
ClassLoader originalCl = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader( ((ReteooRuleBase) ((KnowledgeBaseImpl) kbase).getRuleBase()).getRootClassLoader() );
def = DroolsPolicy.augmentJaxbDataFormatDefinition( def );
-
- org.apache.camel.converter.jaxb.JaxbDataFormat jaxbDataformat = ( org.apache.camel.converter.jaxb.JaxbDataFormat ) def.getDataFormat( this.context.getRoutes().get( 0 ).getRouteContext() );
-
-
+
+ org.apache.camel.converter.jaxb.JaxbDataFormat jaxbDataformat = (org.apache.camel.converter.jaxb.JaxbDataFormat) def.getDataFormat( this.context.getRoutes().get( 0 ).getRouteContext() );
+
jaxbContext = jaxbDataformat.getContext();
} catch ( JAXBException e ) {
throw new RuntimeException( e );
} finally {
Thread.currentThread().setContextClassLoader( originalCl );
- }
+ }
}
-
+
return jaxbContext;
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- public void configure() throws Exception {
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
JaxbDataFormat def = new JaxbDataFormat();
def.setPrettyPrint( true );
def.setContextPath( "org.drools.model:org.drools.pipeline.camel" );
-
- from("direct:test-with-session").policy( new DroolsPolicy() ).
- unmarshal(def).to("drools:node/ksession1").marshal(def);
- }
- };
- }
- @Override
- protected void configureDroolsContext(Context jndiContext) {
- String rule = "";
- rule += "package org.drools.pipeline.camel.test \n";
- rule += "import org.drools.model.Person \n";
- rule += "global java.util.List list \n";
- rule += "query persons \n";
- rule += " $p : Person(name != null) \n";
- rule += "end \n";
- rule += "query personWithName(String param)\n";
- rule += " $p : Person(name == param) \n";
- rule += "end \n";
- rule += "rule rule1 \n";
- rule += " when \n";
- rule += " $p : Person() \n";
- rule += " \n";
- rule += " then \n";
- rule += " System.out.println(\"executed\"); \n";
- rule += "end\n";
+ from( "direct:test-with-session" ).policy( new DroolsPolicy() ).
+ unmarshal( def ).to( "drools:node/ksession1" ).marshal( def );
+ }
+ };
+ }
- registerKnowledgeRuntime("ksession1", rule);
- }
+ @Override
+ protected void configureDroolsContext(Context jndiContext) {
+ String rule = "";
+ rule += "package org.drools.pipeline.camel.test \n";
+ rule += "import org.drools.model.Person \n";
+ rule += "global java.util.List list \n";
+ rule += "query persons \n";
+ rule += " $p : Person(name != null) \n";
+ rule += "end \n";
+ rule += "query personWithName(String param)\n";
+ rule += " $p : Person(name == param) \n";
+ rule += "end \n";
+ rule += "rule rule1 \n";
+ rule += " when \n";
+ rule += " $p : Person() \n";
+ rule += " \n";
+ rule += " then \n";
+ rule += " System.out.println(\"executed\"); \n";
+ rule += "end\n";
- @Override
- protected StatefulKnowledgeSession registerKnowledgeRuntime(String identifier, String rule) {
- KnowledgeBuilder kbuilder = node.get(KnowledgeBuilderFactoryService.class).newKnowledgeBuilder();
+ registerKnowledgeRuntime( "ksession1",
+ rule );
+ }
- Options xjcOpts = new Options();
- xjcOpts.setSchemaLanguage( Language.XMLSCHEMA );
+ @Override
+ protected StatefulKnowledgeSession registerKnowledgeRuntime(String identifier,
+ String rule) {
+ KnowledgeBuilder kbuilder = node.get( KnowledgeBuilderFactoryService.class ).newKnowledgeBuilder();
+ Options xjcOpts = new Options();
+ xjcOpts.setSchemaLanguage( Language.XMLSCHEMA );
- try {
- KnowledgeBuilderHelper.addXsdModel( ResourceFactory.newClassPathResource("person.xsd", getClass()),
- kbuilder,
- xjcOpts,
- "xsd" );
- } catch (IOException e) {
- LOG.error("Errors while adding xsd model. ", kbuilder.getErrors());
- }
+ try {
+ KnowledgeBuilderHelper.addXsdModel( ResourceFactory.newClassPathResource( "person.xsd",
+ getClass() ),
+ kbuilder,
+ xjcOpts,
+ "xsd" );
+ } catch ( IOException e ) {
+ LOG.error( "Errors while adding xsd model. ",
+ kbuilder.getErrors() );
+ }
- assertFalse( kbuilder.hasErrors() );
+ assertFalse( kbuilder.hasErrors() );
- if (rule != null && rule.length() > 0) {
- kbuilder.add(ResourceFactory.newByteArrayResource(rule.getBytes()), ResourceType.DRL);
+ if ( rule != null && rule.length() > 0 ) {
+ kbuilder.add( ResourceFactory.newByteArrayResource( rule.getBytes() ),
+ ResourceType.DRL );
- if (kbuilder.hasErrors()) {
- LOG.info("Errors while adding rule. ", kbuilder.getErrors());
- }
- }
-
- assertFalse(kbuilder.hasErrors());
+ if ( kbuilder.hasErrors() ) {
+ LOG.info( "Errors while adding rule. ",
+ kbuilder.getErrors() );
+ }
+ }
- KnowledgeBase kbase = node.get(KnowledgeBaseFactoryService.class).newKnowledgeBase();
- kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
- classLoader = ((InternalRuleBase) ((KnowledgeBaseImpl) kbase).getRuleBase()).getRootClassLoader();
+ assertFalse( kbuilder.hasErrors() );
- StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
- node.set(identifier, session);
- return session;
- }
+ KnowledgeBase kbase = node.get( KnowledgeBaseFactoryService.class ).newKnowledgeBase();
+ kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
+ classLoader = ((InternalRuleBase) ((KnowledgeBaseImpl) kbase).getRuleBase()).getRootClassLoader();
+ StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
+ node.set( identifier,
+ session );
+ return session;
+ }
+
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -35,17 +35,10 @@
import java.util.HashMap;
import java.util.Map;
-import javax.naming.NamingException;
-
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.dataformat.xstream.JsonDataFormat;
-import org.apache.camel.dataformat.xstream.XStreamDataFormat;
import org.apache.camel.model.DataFormatDefinition;
-import org.apache.camel.spi.DataFormat;
-import org.apache.camel.spring.CamelRouteContextFactoryBean;
import org.drools.command.impl.GenericCommand;
import org.drools.command.runtime.BatchExecutionCommandImpl;
-import org.drools.command.runtime.rule.GetObjectsCommand;
import org.drools.command.runtime.rule.InsertObjectCommand;
import org.drools.common.InternalFactHandle;
import org.drools.pipeline.camel.Person;
@@ -58,10 +51,8 @@
import com.thoughtworks.xstream.converters.Converter;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import com.thoughtworks.xstream.mapper.Mapper;
public class CamelEndpointWithMarshallersTest extends DroolsCamelTestSupport {
private String handle;
@@ -223,7 +214,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
- public void configure() throws Exception {
+ public void configure() throws Exception {
org.apache.camel.model.dataformat.XStreamDataFormat xstreamDataFormat = new org.apache.camel.model.dataformat.XStreamDataFormat();
xstreamDataFormat.setConverters( Arrays.asList( new String[]{PersonConverter.class.getName()} ) );
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelProxyEndpointTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelProxyEndpointTest.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/CamelProxyEndpointTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -50,19 +50,23 @@
public void testSessionInsert() throws Exception {
Person person = new Person();
- person.setName("Mauricio");
+ person.setName( "Mauricio" );
- InsertObjectCommand cmd = (InsertObjectCommand) CommandFactory.newInsert(person,"salaboy");
- ExecutionResults response = (ExecutionResults) template.requestBody("direct:test-no-marshal", cmd);
- assertTrue("Expected valid ExecutionResults object", response != null);
- assertTrue("ExecutionResults missing expected fact", response.getFactHandle("salaboy") != null);
+ InsertObjectCommand cmd = (InsertObjectCommand) CommandFactory.newInsert( person,
+ "salaboy" );
+ ExecutionResults response = (ExecutionResults) template.requestBody( "direct:test-no-marshal",
+ cmd );
+ assertTrue( "Expected valid ExecutionResults object",
+ response != null );
+ assertTrue( "ExecutionResults missing expected fact",
+ response.getFactHandle( "salaboy" ) != null );
}
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:test-no-marshal").to("drools://node/ksession1");
+ from( "direct:test-no-marshal" ).to( "drools://node/ksession1" );
}
};
}
@@ -70,15 +74,16 @@
@Override
protected void configureDroolsContext(Context jndiContext) {
Person me = new Person();
- me.setName("Hadrian");
+ me.setName( "Hadrian" );
- StatefulKnowledgeSession ksession = registerKnowledgeRuntime("ksession1", null);
- InsertObjectCommand cmd = new InsertObjectCommand(me);
- cmd.setOutIdentifier("camel-rider");
- cmd.setReturnObject(false);
- BatchExecutionCommandImpl script = new BatchExecutionCommandImpl( Arrays.asList( new GenericCommand<?>[]{cmd} ));
-
+ StatefulKnowledgeSession ksession = registerKnowledgeRuntime( "ksession1",
+ null );
+ InsertObjectCommand cmd = new InsertObjectCommand( me );
+ cmd.setOutIdentifier( "camel-rider" );
+ cmd.setReturnObject( false );
+ BatchExecutionCommandImpl script = new BatchExecutionCommandImpl( Arrays.asList( new GenericCommand< ? >[]{cmd} ) );
+
ExecutionResults results = ksession.execute( script );
- handle = ((FactHandle)results.getFactHandle("camel-rider")).toExternalForm();
+ handle = ((FactHandle) results.getFactHandle( "camel-rider" )).toExternalForm();
}
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -47,7 +47,6 @@
import org.drools.builder.KnowledgeBuilderFactoryService;
import org.drools.builder.ResourceType;
import org.drools.definition.KnowledgePackage;
-import org.drools.grid.GridConnection;
import org.drools.grid.GridNode;
import org.drools.grid.impl.GridImpl;
import org.drools.grid.service.directory.WhitePages;
@@ -58,26 +57,26 @@
import org.slf4j.LoggerFactory;
public abstract class DroolsCamelTestSupport extends ContextTestSupport {
- protected static final Logger LOG = LoggerFactory.getLogger(DroolsCamelTestSupport.class);
- protected GridNode node;
+ protected static final Logger LOG = LoggerFactory.getLogger( DroolsCamelTestSupport.class );
+ protected GridNode node;
public void setNode(GridNode node) {
- this.node = node;
- }
+ this.node = node;
+ }
- public GridNode getNode() {
- return node;
- }
+ public GridNode getNode() {
+ return node;
+ }
- @Override
+ @Override
public void setUp() throws Exception {
super.setUp();
-
- XMLUnit.setIgnoreComments(true);
- XMLUnit.setIgnoreWhitespace(true);
- XMLUnit.setIgnoreAttributeOrder(true);
- XMLUnit.setNormalizeWhitespace(true);
- XMLUnit.setNormalize(true);
+
+ XMLUnit.setIgnoreComments( true );
+ XMLUnit.setIgnoreWhitespace( true );
+ XMLUnit.setIgnoreAttributeOrder( true );
+ XMLUnit.setNormalizeWhitespace( true );
+ XMLUnit.setNormalize( true );
}
@Override
@@ -89,48 +88,54 @@
Context context = super.createJndiContext();
GridImpl grid = new GridImpl( new HashMap() );
- grid.addService( WhitePages.class, new WhitePagesImpl() );
+ grid.addService( WhitePages.class,
+ new WhitePagesImpl() );
node = grid.createGridNode( "node" );
context.bind( "node",
- node );
- configureDroolsContext(context);
+ node );
+ configureDroolsContext( context );
return context;
}
-
+
protected abstract void configureDroolsContext(Context jndiContext);
- protected StatefulKnowledgeSession registerKnowledgeRuntime(String identifier, String rule) {
- KnowledgeBuilder kbuilder = node.get(KnowledgeBuilderFactoryService.class).newKnowledgeBuilder();
-
- if (rule != null && rule.length() > 0) {
- kbuilder.add(ResourceFactory.newByteArrayResource(rule.getBytes()), ResourceType.DRL);
-
- if (kbuilder.hasErrors()) {
- LOG.info("Errors while adding rule. ", kbuilder.getErrors());
+ protected StatefulKnowledgeSession registerKnowledgeRuntime(String identifier,
+ String rule) {
+ KnowledgeBuilder kbuilder = node.get( KnowledgeBuilderFactoryService.class ).newKnowledgeBuilder();
+
+ if ( rule != null && rule.length() > 0 ) {
+ kbuilder.add( ResourceFactory.newByteArrayResource( rule.getBytes() ),
+ ResourceType.DRL );
+
+ if ( kbuilder.hasErrors() ) {
+ LOG.info( "Errors while adding rule. ",
+ kbuilder.getErrors() );
}
}
- assertFalse(kbuilder.hasErrors());
+ assertFalse( kbuilder.hasErrors() );
Collection<KnowledgePackage> pkgs = kbuilder.getKnowledgePackages();
- KnowledgeBase kbase = node.get(KnowledgeBaseFactoryService.class).newKnowledgeBase();
+ KnowledgeBase kbase = node.get( KnowledgeBaseFactoryService.class ).newKnowledgeBase();
- kbase.addKnowledgePackages(pkgs);
+ kbase.addKnowledgePackages( pkgs );
StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
-
- node.set( identifier, session);
-
+
+ node.set( identifier,
+ session );
+
return session;
}
- protected void assertXMLEqual(String expected, String result) throws Exception {
- Diff diff = new Diff(expected, result);
- diff.overrideElementQualifier(new RecursiveElementNameAndTextQualifier());
- XMLAssert.assertXMLEqual(diff, true);
+ protected void assertXMLEqual(String expected,
+ String result) throws Exception {
+ Diff diff = new Diff( expected,
+ result );
+ diff.overrideElementQualifier( new RecursiveElementNameAndTextQualifier() );
+ XMLAssert.assertXMLEqual( diff,
+ true );
}
-
-
protected void configureDroolsContext() {
// TODO Auto-generated method stub
-
+
}
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/JSonBatchExecutionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/JSonBatchExecutionTest.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/JSonBatchExecutionTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -4,22 +4,22 @@
import org.codehaus.jackson.map.ObjectMapper;
import org.junit.BeforeClass;
-public class JSonBatchExecutionTest extends BatchTest {//extends ContextTestSupport {
-
+public class JSonBatchExecutionTest extends BatchTest {//extends ContextTestSupport {
+
public JSonBatchExecutionTest() {
super();
this.dataformat = "json";
//copyToDataFormat = "jaxb";
}
-
-
+
public void assertXMLEqual(String expectedXml,
String resultXml) {
- try {
+ try {
ObjectMapper mapper = new ObjectMapper();
- JsonNode tree1 = mapper.readTree(expectedXml);
- JsonNode tree2 = mapper.readTree(resultXml);
- assertTrue( "Expected:" + expectedXml + "\nwas:" + resultXml, tree1.equals(tree2) );
+ JsonNode tree1 = mapper.readTree( expectedXml );
+ JsonNode tree2 = mapper.readTree( resultXml );
+ assertTrue( "Expected:" + expectedXml + "\nwas:" + resultXml,
+ tree1.equals( tree2 ) );
} catch ( Exception e ) {
throw new RuntimeException( "XML Assertion failure",
e );
@@ -31,90 +31,88 @@
//new PrintWriter(new BufferedWriter( new FileWriter( "jaxb.mvt", false )));
}
+ //
+ // public void testVsmPipeline() throws Exception {
+ // String str = "";
+ // str += "package org.drools \n";
+ // str += "import org.drools.Cheese \n";
+ // str += "rule rule1 \n";
+ // str += " when \n";
+ // str += " $c : Cheese() \n";
+ // str += " \n";
+ // str += " then \n";
+ // str += " $c.setPrice( $c.getPrice() + 5 ); \n";
+ // str += "end\n";
+ //
+ // String inXml = "";
+ // inXml += "{\"batch-execution\":{\"lookup\":\"ksession1\", \"commands\":[";
+ // inXml += "{\"insert\":{\"object\":{\"org.drools.Cheese\":{\"type\":\"stilton\",\"price\":25,\"oldPrice\":0}}, \"out-identifier\":\"outStilton\" } }";
+ // inXml += ", {\"fire-all-rules\":\"\"}";
+ // inXml += "]}}";
+ // inXml = roundTripFromXml( inXml );
+ //
+ // LocalConnection connection = new LocalConnection();
+ // ExecutionNode node = connection.getExecutionNode(null);
+ //
+ // StatefulKnowledgeSession ksession = getExecutionNodeSessionStateful(node, ResourceFactory.newByteArrayResource( str.getBytes() ) );
+ //
+ // node.get(DirectoryLookupFactoryService.class).register("ksession1", ksession);
+ //
+ // XStreamResolverStrategy xstreamStrategy = new XStreamResolverStrategy() {
+ // public XStream lookup(String name) {
+ // return BatchExecutionHelper.newJSonMarshaller();
+ // }
+ // };
+ //
+ // ResultHandlerImpl resultHandler = new ResultHandlerImpl();
+ // getPipelineSessionStateful(node, xstreamStrategy).insert(inXml, resultHandler);
+ // String outXml = (String) resultHandler.getObject();
+ //
+ // ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newJSonMarshaller().fromXML( outXml );
+ // Cheese stilton = (Cheese) result.getValue( "outStilton" );
+ // assertEquals( 30,
+ // stilton.getPrice() );
+ //
+ // FactHandle factHandle = (FactHandle) result.getFactHandle( "outStilton" );
+ // stilton = (Cheese) ksession.getObject( factHandle );
+ // assertEquals( 30,
+ // stilton.getPrice() );
+ //
+ //// String expectedXml = "";
+ //// expectedXml += "<execution-results>\n";
+ //// expectedXml += " <result identifier=\"outStilton\">\n";
+ //// expectedXml += " <org.drools.Cheese>\n";
+ //// expectedXml += " <type>stilton</type>\n";
+ //// expectedXml += " <oldPrice>0</oldPrice>\n";
+ //// expectedXml += " <price>30</price>\n";
+ //// expectedXml += " </org.drools.Cheese>\n";
+ //// expectedXml += " </result>\n";
+ //// expectedXml += " <fact-handle identifier=\"outStilton\" externalForm=\"" + ((InternalFactHandle) result.getFactHandle( "outStilton" )).toExternalForm() + "\" /> \n";
+ //// expectedXml += "</execution-results>\n";
+ ////
+ //// assertXMLEqual( expectedXml,
+ //// outXml );
+ // }
-//
+ // private StatefulKnowledgeSession getExecutionNodeSessionStateful(ExecutionNode node, Resource resource) throws Exception {
+ // KnowledgeBuilder kbuilder = node.get(KnowledgeBuilderFactoryService.class).newKnowledgeBuilder();
+ // kbuilder.add( resource,
+ // ResourceType.DRL );
+ //
+ // if ( kbuilder.hasErrors() ) {
+ // System.out.println( kbuilder.getErrors() );
+ // }
+ //
+ // assertFalse( kbuilder.hasErrors() );
+ // Collection<KnowledgePackage> pkgs = kbuilder.getKnowledgePackages();
+ //
+ // KnowledgeBase kbase = node.get(KnowledgeBaseFactoryService.class).newKnowledgeBase();
+ //
+ // kbase.addKnowledgePackages( pkgs );
+ // StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
+ //
+ // return session;
+ // }
-// public void testVsmPipeline() throws Exception {
-// String str = "";
-// str += "package org.drools \n";
-// str += "import org.drools.Cheese \n";
-// str += "rule rule1 \n";
-// str += " when \n";
-// str += " $c : Cheese() \n";
-// str += " \n";
-// str += " then \n";
-// str += " $c.setPrice( $c.getPrice() + 5 ); \n";
-// str += "end\n";
-//
-// String inXml = "";
-// inXml += "{\"batch-execution\":{\"lookup\":\"ksession1\", \"commands\":[";
-// inXml += "{\"insert\":{\"object\":{\"org.drools.Cheese\":{\"type\":\"stilton\",\"price\":25,\"oldPrice\":0}}, \"out-identifier\":\"outStilton\" } }";
-// inXml += ", {\"fire-all-rules\":\"\"}";
-// inXml += "]}}";
-// inXml = roundTripFromXml( inXml );
-//
-// LocalConnection connection = new LocalConnection();
-// ExecutionNode node = connection.getExecutionNode(null);
-//
-// StatefulKnowledgeSession ksession = getExecutionNodeSessionStateful(node, ResourceFactory.newByteArrayResource( str.getBytes() ) );
-//
-// node.get(DirectoryLookupFactoryService.class).register("ksession1", ksession);
-//
-// XStreamResolverStrategy xstreamStrategy = new XStreamResolverStrategy() {
-// public XStream lookup(String name) {
-// return BatchExecutionHelper.newJSonMarshaller();
-// }
-// };
-//
-// ResultHandlerImpl resultHandler = new ResultHandlerImpl();
-// getPipelineSessionStateful(node, xstreamStrategy).insert(inXml, resultHandler);
-// String outXml = (String) resultHandler.getObject();
-//
-// ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newJSonMarshaller().fromXML( outXml );
-// Cheese stilton = (Cheese) result.getValue( "outStilton" );
-// assertEquals( 30,
-// stilton.getPrice() );
-//
-// FactHandle factHandle = (FactHandle) result.getFactHandle( "outStilton" );
-// stilton = (Cheese) ksession.getObject( factHandle );
-// assertEquals( 30,
-// stilton.getPrice() );
-//
-//// String expectedXml = "";
-//// expectedXml += "<execution-results>\n";
-//// expectedXml += " <result identifier=\"outStilton\">\n";
-//// expectedXml += " <org.drools.Cheese>\n";
-//// expectedXml += " <type>stilton</type>\n";
-//// expectedXml += " <oldPrice>0</oldPrice>\n";
-//// expectedXml += " <price>30</price>\n";
-//// expectedXml += " </org.drools.Cheese>\n";
-//// expectedXml += " </result>\n";
-//// expectedXml += " <fact-handle identifier=\"outStilton\" externalForm=\"" + ((InternalFactHandle) result.getFactHandle( "outStilton" )).toExternalForm() + "\" /> \n";
-//// expectedXml += "</execution-results>\n";
-////
-//// assertXMLEqual( expectedXml,
-//// outXml );
-// }
-
-// private StatefulKnowledgeSession getExecutionNodeSessionStateful(ExecutionNode node, Resource resource) throws Exception {
-// KnowledgeBuilder kbuilder = node.get(KnowledgeBuilderFactoryService.class).newKnowledgeBuilder();
-// kbuilder.add( resource,
-// ResourceType.DRL );
-//
-// if ( kbuilder.hasErrors() ) {
-// System.out.println( kbuilder.getErrors() );
-// }
-//
-// assertFalse( kbuilder.hasErrors() );
-// Collection<KnowledgePackage> pkgs = kbuilder.getKnowledgePackages();
-//
-// KnowledgeBase kbase = node.get(KnowledgeBaseFactoryService.class).newKnowledgeBase();
-//
-// kbase.addKnowledgePackages( pkgs );
-// StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
-//
-// return session;
-// }
-
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/JaxbTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/JaxbTest.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/JaxbTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -39,51 +39,60 @@
public class JaxbTest extends TestCase {
public void test1() throws Exception {
- List<String> classesName = new ArrayList();
-// classesName.add("org.drools.model.AddressType");
-// classesName.add("org.drools.model.ObjectFactory");
-// classesName.add("org.drools.model.Person");
- classesName.add("org.drools.pipeline.camel.Person");
-
+ List<String> classesName = new ArrayList();
+ // classesName.add("org.drools.model.AddressType");
+ // classesName.add("org.drools.model.ObjectFactory");
+ // classesName.add("org.drools.model.Person");
+ classesName.add( "org.drools.pipeline.camel.Person" );
+
//jaxbDataFormat = new JaxbDataFormat();
//jaxbDataFormat.setContextPath( contextPath )
Set<String> set = new HashSet<String>();
for ( String clsName : DroolsJaxbHelperProviderImpl.JAXB_ANNOTATED_CMD ) {
- set.add( clsName.substring( 0, clsName.lastIndexOf( '.' ) ) );
+ set.add( clsName.substring( 0,
+ clsName.lastIndexOf( '.' ) ) );
}
-
- for ( String clsName : classesName) {
- set.add( clsName.substring( 0, clsName.lastIndexOf( '.' ) ) );
- }
-
+
+ for ( String clsName : classesName ) {
+ set.add( clsName.substring( 0,
+ clsName.lastIndexOf( '.' ) ) );
+ }
+
StringBuilder sb = new StringBuilder();
for ( String pkgName : set ) {
sb.append( pkgName );
sb.append( ':' );
}
-
+
System.out.println( "context path: " + sb.toString() );
-// jaxbDataFormat.setContextPath( sb.toString() );
-// jaxbDataFormat.setPrettyPrint( true );
- JAXBContext jaxbContext = JAXBContext.newInstance(sb.toString());
-
- List<GenericCommand<?>> cmds = new ArrayList<GenericCommand<?>>();
- cmds.add( new InsertObjectCommand( new Person("darth", 21), "p" ) );
+ // jaxbDataFormat.setContextPath( sb.toString() );
+ // jaxbDataFormat.setPrettyPrint( true );
+ JAXBContext jaxbContext = JAXBContext.newInstance( sb.toString() );
+
+ List<GenericCommand< ? >> cmds = new ArrayList<GenericCommand< ? >>();
+ cmds.add( new InsertObjectCommand( new Person( "darth",
+ 21 ),
+ "p" ) );
cmds.add( new GetGlobalCommand( "xxx" ) );
- cmds.add( new SetGlobalCommand( "yyy", new Person("yoda", 21) ));
- BatchExecutionCommandImpl batch = new BatchExecutionCommandImpl(cmds);
-
+ cmds.add( new SetGlobalCommand( "yyy",
+ new Person( "yoda",
+ 21 ) ) );
+ BatchExecutionCommandImpl batch = new BatchExecutionCommandImpl( cmds );
+
Marshaller marshaller = jaxbContext.createMarshaller();
- marshaller.setProperty( Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE );
+ marshaller.setProperty( Marshaller.JAXB_FORMATTED_OUTPUT,
+ Boolean.TRUE );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- marshaller.marshal( batch, baos );
-
+ marshaller.marshal( batch,
+ baos );
+
System.out.println( baos );
-
+
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
- BatchExecutionCommandImpl batch2 = ( BatchExecutionCommandImpl ) unmarshaller.unmarshal( new ByteArrayInputStream( baos.toByteArray() ) );
+ BatchExecutionCommandImpl batch2 = (BatchExecutionCommandImpl) unmarshaller.unmarshal( new ByteArrayInputStream( baos.toByteArray() ) );
baos = new ByteArrayOutputStream();
- marshaller.marshal( batch2, baos );
+ marshaller.marshal( batch2,
+ baos );
System.out.println( baos );
}
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchExecutionTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -30,7 +30,6 @@
import javax.naming.Context;
-
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.custommonkey.xmlunit.Diff;
@@ -50,6 +49,9 @@
import org.drools.common.InternalRuleBase;
import org.drools.definition.KnowledgePackage;
import org.drools.grid.GridNode;
+import org.drools.grid.impl.GridImpl;
+import org.drools.grid.service.directory.WhitePages;
+import org.drools.grid.service.directory.impl.WhitePagesImpl;
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.io.Resource;
import org.drools.io.ResourceFactory;
@@ -70,47 +72,44 @@
import org.xml.sax.SAXException;
import com.thoughtworks.xstream.XStream;
-import org.drools.grid.GridConnection;
-import org.drools.grid.impl.GridImpl;
-import org.drools.grid.service.directory.WhitePages;
-import org.drools.grid.service.directory.impl.WhitePagesImpl;
public class XStreamBatchExecutionTest extends ContextTestSupport {
- protected GridNode node;
+ protected GridNode node;
protected CommandExecutor exec;
-
-
+
protected Context createJndiContext() throws Exception {
Context context = super.createJndiContext();
GridImpl grid = new GridImpl( new HashMap() );
- grid.addService( WhitePages.class, new WhitePagesImpl() );
+ grid.addService( WhitePages.class,
+ new WhitePagesImpl() );
node = grid.createGridNode( "local" );
context.bind( "node",
- node );
- node.set("ksession1", this.exec);
+ node );
+ node.set( "ksession1",
+ this.exec );
return context;
- }
-
+ }
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:exec").policy( new DroolsPolicy() ).unmarshal( "xstream" ).to("drools://node/ksession1").marshal( "xstream" );
- from("direct:execWithLookup").policy( new DroolsPolicy() ).unmarshal( "xstream" ).to("drools://node").marshal( "xstream" );
- from("direct:unmarshal").policy( new DroolsPolicy() ).unmarshal( "xstream" );
- from("direct:marshal").policy( new DroolsPolicy() ).marshal( "xstream" );
+ from( "direct:exec" ).policy( new DroolsPolicy() ).unmarshal( "xstream" ).to( "drools://node/ksession1" ).marshal( "xstream" );
+ from( "direct:execWithLookup" ).policy( new DroolsPolicy() ).unmarshal( "xstream" ).to( "drools://node" ).marshal( "xstream" );
+ from( "direct:unmarshal" ).policy( new DroolsPolicy() ).unmarshal( "xstream" );
+ from( "direct:marshal" ).policy( new DroolsPolicy() ).marshal( "xstream" );
}
};
- }
-
+ }
+
public void setExec(CommandExecutor exec) {
this.exec = exec;
try {
super.setUp();
} catch ( Exception e ) {
- throw new RuntimeException(e);
- }
+ throw new RuntimeException( e );
+ }
}
@Override
@@ -202,8 +201,12 @@
StatefulKnowledgeSession ksession = getStatefulKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
- ExecutionResults result = template.requestBody("direct:unmarshal", outXml, ExecutionResults.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
+ ExecutionResults result = template.requestBody( "direct:unmarshal",
+ outXml,
+ ExecutionResults.class );
inXml = "";
inXml += "<batch-execution>";
@@ -218,7 +221,9 @@
inXml += " <fire-all-rules />";
inXml += "</batch-execution>";
- outXml = template.requestBody("direct:exec", inXml, String.class);
+ outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
assertTrue( outXml.indexOf( "<changes>" ) > -1 );
@@ -235,12 +240,13 @@
inXml += " <fire-all-rules />";
inXml += "</batch-execution>";
- outXml = template.requestBody("direct:exec", inXml, String.class);
+ outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
assertTrue( outXml.indexOf( "<retracted>" ) > -1 );
}
-
public void testInsertWithDefaults() throws Exception {
String str = "";
@@ -269,9 +275,13 @@
StatefulKnowledgeSession ksession = getStatefulKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
- ExecutionResults result = template.requestBody("direct:unmarshal", outXml, ExecutionResults.class);
-
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
+ ExecutionResults result = template.requestBody( "direct:unmarshal",
+ outXml,
+ ExecutionResults.class );
+
Cheese stilton = (Cheese) result.getValue( "outStilton" );
assertEquals( 30,
stilton.getPrice() );
@@ -324,8 +334,12 @@
StatefulKnowledgeSession ksession = getStatefulKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
- ExecutionResults result = template.requestBody("direct:unmarshal", outXml, ExecutionResults.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
+ ExecutionResults result = template.requestBody( "direct:unmarshal",
+ outXml,
+ ExecutionResults.class );
assertNull( result.getValue( "outStilton" ) );
@@ -370,9 +384,13 @@
StatefulKnowledgeSession ksession = getStatefulKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
- ExecutionResults result = template.requestBody("direct:unmarshal", outXml, ExecutionResults.class);
-
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
+ ExecutionResults result = template.requestBody( "direct:unmarshal",
+ outXml,
+ ExecutionResults.class );
+
Cheese stilton = (Cheese) result.getValue( "outStilton" );
assertEquals( 30,
stilton.getPrice() );
@@ -382,8 +400,12 @@
inXml += "<batch-execution>";
inXml += " <get-object out-identifier='outStilton' fact-handle='" + factHandle.toExternalForm() + "' />";
inXml += "</batch-execution>";
- outXml = template.requestBody("direct:exec", inXml, String.class);
- result = template.requestBody("direct:unmarshal", outXml, ExecutionResults.class);
+ outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
+ result = template.requestBody( "direct:unmarshal",
+ outXml,
+ ExecutionResults.class );
stilton = (Cheese) result.getValue( "outStilton" );
assertEquals( 30,
stilton.getPrice() );
@@ -416,9 +438,13 @@
StatefulKnowledgeSession ksession = getStatefulKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
- ExecutionResults result = template.requestBody("direct:unmarshal", outXml, ExecutionResults.class);
-
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
+ ExecutionResults result = template.requestBody( "direct:unmarshal",
+ outXml,
+ ExecutionResults.class );
+
Cheese stilton = (Cheese) result.getValue( "outStilton" );
assertEquals( 30,
stilton.getPrice() );
@@ -428,15 +454,21 @@
inXml += "<batch-execution>";
inXml += " <retract fact-handle='" + factHandle.toExternalForm() + "' />";
inXml += "</batch-execution>";
- template.requestBody("direct:exec", inXml, String.class);
+ template.requestBody( "direct:exec",
+ inXml,
+ String.class );
inXml = "";
inXml += "<batch-execution>";
inXml += " <get-object out-identifier='outStilton' fact-handle='" + factHandle.toExternalForm() + "' />";
inXml += "</batch-execution>";
-
- outXml = template.requestBody("direct:exec", inXml, String.class);
- result = template.requestBody("direct:unmarshal", outXml, ExecutionResults.class);
+
+ outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
+ result = template.requestBody( "direct:unmarshal",
+ outXml,
+ ExecutionResults.class );
assertNull( result.getValue( "outStilton" ) );
}
@@ -467,8 +499,12 @@
StatefulKnowledgeSession ksession = getStatefulKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
- ExecutionResults result = template.requestBody("direct:unmarshal", outXml, ExecutionResults.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
+ ExecutionResults result = template.requestBody( "direct:unmarshal",
+ outXml,
+ ExecutionResults.class );
Cheese stilton = (Cheese) result.getValue( "outStilton" );
assertEquals( 30,
stilton.getPrice() );
@@ -495,17 +531,22 @@
inXml += " <modify fact-handle='" + factHandle.toExternalForm() + "'> <set accessor='oldPrice' value='\"42\"' /><set accessor='price' value='50' /></modify>";
inXml += " <fire-all-rules />";
inXml += "</batch-execution>";
- template.requestBody("direct:exec", inXml, String.class);
+ template.requestBody( "direct:exec",
+ inXml,
+ String.class );
-
inXml = "";
inXml += "<batch-execution>";
inXml += " <get-object out-identifier='outCheddar' fact-handle='" + factHandle.toExternalForm() + "' />";
inXml += "</batch-execution>";
setExec( ksession );
- outXml = template.requestBody("direct:exec", inXml, String.class);
- result = template.requestBody("direct:unmarshal", outXml, ExecutionResults.class);
+ outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
+ result = template.requestBody( "direct:unmarshal",
+ outXml,
+ ExecutionResults.class );
Cheese cheddar = (Cheese) result.getValue( "outCheddar" );
assertEquals( 42,
@@ -520,10 +561,14 @@
inXml += " <modify fact-handle='" + factHandle.toExternalForm() + "'> <set accessor='type' value='44\"; System.exit(1);' /><set accessor='price' value='50' /></modify>";
inXml += " <fire-all-rules />";
inXml += "</batch-execution>";
-
- outXml = template.requestBody("direct:exec", inXml, String.class);
- result = template.requestBody("direct:unmarshal", outXml, ExecutionResults.class);
-
+
+ outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
+ result = template.requestBody( "direct:unmarshal",
+ outXml,
+ ExecutionResults.class );
+
result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml );
ModifyCommand.ALLOW_MODIFY_EXPRESSIONS = true;
@@ -565,7 +610,9 @@
StatelessKnowledgeSession ksession = getStatelessKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
String expectedXml = "";
expectedXml += "<execution-results>\n";
@@ -588,7 +635,9 @@
assertXMLEqual( expectedXml,
outXml );
- ExecutionResults result = template.requestBody("direct:unmarshal", outXml, ExecutionResults.class);
+ ExecutionResults result = template.requestBody( "direct:unmarshal",
+ outXml,
+ ExecutionResults.class );
List list = (List) result.getValue( "list" );
Cheese stilton25 = new Cheese( "stilton",
@@ -633,7 +682,9 @@
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
System.err.println( outXml );
String expectedXml = "";
@@ -681,7 +732,9 @@
StatefulKnowledgeSession ksession = getStatefulKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
Collection< ? extends FactHandle> factHandles = ksession.getFactHandles();
@@ -784,7 +837,9 @@
StatelessKnowledgeSession ksession = getStatelessKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
String expectedXml = "";
expectedXml += "<execution-results>\n";
@@ -857,7 +912,9 @@
StatelessKnowledgeSession ksession = getStatelessKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
String expectedXml = "";
expectedXml += "<execution-results>\n";
@@ -908,7 +965,9 @@
StatelessKnowledgeSession ksession = getStatelessKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
String expectedXml = "";
expectedXml += "<execution-results>";
@@ -999,7 +1058,9 @@
StatefulKnowledgeSession ksession = getStatefulKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
Iterator<QueryResultsRow> it1 = ksession.getQueryResults( "cheeses" ).iterator();
Iterator<QueryResultsRow> it2 = ksession.getQueryResults( "cheesesWithParams",
@@ -1155,7 +1216,9 @@
StatelessKnowledgeSession ksession = getStatelessKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
FactHandle factHandle = (FactHandle) ((ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml )).getFactHandle( "outBrie" );
@@ -1281,7 +1344,9 @@
inXml += " <get-global identifier='list' out-identifier='out-list'/>";
inXml += "</batch-execution>";
- String outXml = template.requestBody("direct:exec", inXml, String.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
assertEquals( 1,
list.size() );
@@ -1357,7 +1422,9 @@
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
assertEquals( ProcessInstance.STATE_COMPLETED,
processInstance.getState() );
@@ -1421,7 +1488,9 @@
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
assertEquals( ProcessInstance.STATE_COMPLETED,
processInstance.getState() );
@@ -1537,7 +1606,9 @@
inXml = "<complete-work-item id='" + workItem.getId() + "' />";
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
assertEquals( WorkItem.COMPLETED,
workItem.getState() );
@@ -1579,7 +1650,9 @@
inXml += " </result>";
inXml += "</complete-work-item>";
- outXml = template.requestBody("direct:exec", inXml, String.class);
+ outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
assertEquals( WorkItem.COMPLETED,
workItem.getState() );
@@ -1693,7 +1766,9 @@
String inXml = "<abort-work-item id='" + workItem.getId() + "' />";
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
assertEquals( WorkItem.ABORTED,
workItem.getState() );
@@ -1745,7 +1820,9 @@
StatefulKnowledgeSession ksession = getStatefulKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
ClassLoader cl = ((InternalRuleBase) ((StatefulKnowledgeSessionImpl) ksession).getRuleBase()).getRootClassLoader();
XStream xstream = BatchExecutionHelper.newXStreamMarshaller();
@@ -1798,10 +1875,16 @@
StatefulKnowledgeSession ksession = getStatefulKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:exec", inXml, String.class);
- ExecutionResults result = template.requestBody("direct:unmarshal", outXml, ExecutionResults.class);
+ String outXml = template.requestBody( "direct:exec",
+ inXml,
+ String.class );
+ ExecutionResults result = template.requestBody( "direct:unmarshal",
+ outXml,
+ ExecutionResults.class );
- outXml = template.requestBody("direct:exec", "<batch-execution><query out-identifier='matchingthings' name='results'/></batch-execution>", String.class);
+ outXml = template.requestBody( "direct:exec",
+ "<batch-execution><query out-identifier='matchingthings' name='results'/></batch-execution>",
+ String.class );
//we have not fired the rules yet
assertFalse( outXml.indexOf( "<price>30</price>" ) > -1 );
@@ -1811,11 +1894,15 @@
inXml += "<batch-execution>";
inXml += " <fire-all-rules max='100'/>";
inXml += "</batch-execution>";
- template.requestBody("direct:exec", inXml, String.class);
+ template.requestBody( "direct:exec",
+ inXml,
+ String.class );
//ksession.fireAllRules();
//ok lets try that again...
- outXml = template.requestBody("direct:exec", "<batch-execution><query out-identifier='matchingthings' name='results'/></batch-execution>", String.class);
+ outXml = template.requestBody( "direct:exec",
+ "<batch-execution><query out-identifier='matchingthings' name='results'/></batch-execution>",
+ String.class );
assertTrue( outXml.indexOf( "<price>30</price>" ) > -1 );
}
@@ -1843,12 +1930,15 @@
inXml += " <fire-all-rules />";
inXml += "</batch-execution>";
-
StatefulKnowledgeSession ksession = getStatefulKnowledgeSession( ResourceFactory.newByteArrayResource( str.getBytes() ) );
setExec( ksession );
- String outXml = template.requestBody("direct:execWithLookup", inXml, String.class);
- ExecutionResults result = template.requestBody("direct:unmarshal", outXml, ExecutionResults.class);
+ String outXml = template.requestBody( "direct:execWithLookup",
+ inXml,
+ String.class );
+ ExecutionResults result = template.requestBody( "direct:unmarshal",
+ outXml,
+ ExecutionResults.class );
Cheese stilton = (Cheese) result.getValue( "outStilton" );
assertEquals( 30,
stilton.getPrice() );
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchTest.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/XStreamBatchTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -8,11 +8,11 @@
@Ignore
public class XStreamBatchTest extends BatchTest {
-
+
public XStreamBatchTest() {
this.dataformat = "xstream";
}
-
+
@Override
public void setUp() throws Exception {
XMLUnit.setIgnoreComments( true );
@@ -34,6 +34,6 @@
throw new RuntimeException( "XML Assertion failure",
e );
}
- }
-
+ }
+
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/cxf/CxfRestTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/cxf/CxfRestTest.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/cxf/CxfRestTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -21,12 +21,12 @@
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class CxfRestTest extends CamelSpringTestSupport {
-
+
@Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/drools/camel/component/CxfRsSpring.xml");
- }
-
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext( "org/drools/camel/component/CxfRsSpring.xml" );
+ }
+
public void test1() throws Exception {
String cmd = "";
cmd += "<batch-execution lookup=\"ksession1\">\n";
@@ -37,10 +37,10 @@
cmd += " </insert>\n";
cmd += " <fire-all-rules/>\n";
cmd += "</batch-execution>\n";
-
-
- Object object = this.context.createProducerTemplate().requestBody("direct://http", cmd);
- System.out.println( object );
+
+ Object object = this.context.createProducerTemplate().requestBody( "direct://http",
+ cmd );
+ System.out.println( object );
}
-
+
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/cxf/CxfSoapTest.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/cxf/CxfSoapTest.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/camel/component/cxf/CxfSoapTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -16,7 +16,6 @@
package org.drools.camel.component.cxf;
-
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
@@ -31,40 +30,43 @@
public class CxfSoapTest extends CamelSpringTestSupport {
- @Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("org/drools/camel/component/CxfSoapSpring.xml");
- }
+ @Override
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext( "org/drools/camel/component/CxfSoapSpring.xml" );
+ }
- public void test1() throws Exception {
+ public void test1() throws Exception {
- SOAPMessage soapMessage = MessageFactory.newInstance().createMessage();
- SOAPBody body = soapMessage.getSOAPPart().getEnvelope().getBody();
- QName payloadName = new QName("http://soap.jax.drools.org", "execute", "ns1");
+ SOAPMessage soapMessage = MessageFactory.newInstance().createMessage();
+ SOAPBody body = soapMessage.getSOAPPart().getEnvelope().getBody();
+ QName payloadName = new QName( "http://soap.jax.drools.org",
+ "execute",
+ "ns1" );
- body.addBodyElement(payloadName);
+ body.addBodyElement( payloadName );
- String cmd = "";
- cmd += "<batch-execution lookup=\"ksession1\">\n";
- cmd += " <insert out-identifier=\"salaboy\" disconnected=\"true\">\n";
- cmd += " <org.drools.pipeline.camel.Person>\n";
- cmd += " <name>salaboy</name>\n";
- cmd += " <age>27</age>\n";
- cmd += " </org.drools.pipeline.camel.Person>\n";
- cmd += " </insert>\n";
- cmd += " <fire-all-rules/>\n";
- cmd += "</batch-execution>\n";
+ String cmd = "";
+ cmd += "<batch-execution lookup=\"ksession1\">\n";
+ cmd += " <insert out-identifier=\"salaboy\" disconnected=\"true\">\n";
+ cmd += " <org.drools.pipeline.camel.Person>\n";
+ cmd += " <name>salaboy</name>\n";
+ cmd += " <age>27</age>\n";
+ cmd += " </org.drools.pipeline.camel.Person>\n";
+ cmd += " </insert>\n";
+ cmd += " <fire-all-rules/>\n";
+ cmd += "</batch-execution>\n";
- body.addTextNode(cmd);
+ body.addTextNode( cmd );
- Object object = this.context.createProducerTemplate().requestBody("direct://http", soapMessage);
+ Object object = this.context.createProducerTemplate().requestBody( "direct://http",
+ soapMessage );
- OutputStream out = new ByteArrayOutputStream();
- out = new ByteArrayOutputStream();
- soapMessage = (SOAPMessage) object;
- soapMessage.writeTo(out);
- String response = out.toString();
- assertTrue(response.contains("fact-handle identifier=\"salaboy\""));
- }
+ OutputStream out = new ByteArrayOutputStream();
+ out = new ByteArrayOutputStream();
+ soapMessage = (SOAPMessage) object;
+ soapMessage.writeTo( out );
+ String response = out.toString();
+ assertTrue( response.contains( "fact-handle identifier=\"salaboy\"" ) );
+ }
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/pipeline/camel/ObjectFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/pipeline/camel/ObjectFactory.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/pipeline/camel/ObjectFactory.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -23,8 +23,8 @@
public Person createPerson() {
return new Person();
}
-
+
public WrappedList createWrappedList() {
return new WrappedList();
}
-}
+}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/pipeline/camel/Person.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/pipeline/camel/Person.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/pipeline/camel/Person.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -22,7 +22,6 @@
package org.drools.pipeline.camel;
import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
/**
*
@@ -30,42 +29,43 @@
*/
@XmlRootElement
public class Person {
- private String name;
- private Integer age;
+ private String name;
+ private Integer age;
- public Person() {
- }
+ public Person() {
+ }
- public Person(String name) {
- super();
- this.name = name;
- }
+ public Person(String name) {
+ super();
+ this.name = name;
+ }
- public Person(String name, int age) {
- super();
- this.name = name;
- this.age = age;
- }
+ public Person(String name,
+ int age) {
+ super();
+ this.name = name;
+ this.age = age;
+ }
- public String getName() {
- return name;
- }
+ public String getName() {
+ return name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public void setAge(Integer age) {
- this.age = age;
- }
+ public void setAge(Integer age) {
+ this.age = age;
+ }
- public Integer getAge() {
- return age;
- }
+ public Integer getAge() {
+ return age;
+ }
- @Override
- public String toString() {
- return "Person [age=" + age + ", name=" + name + "]";
- }
-
+ @Override
+ public String toString() {
+ return "Person [age=" + age + ", name=" + name + "]";
+ }
+
}
Modified: labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/pipeline/camel/WrappedList.java
===================================================================
--- labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/pipeline/camel/WrappedList.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-camel/src/test/java/org/drools/pipeline/camel/WrappedList.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -31,112 +31,119 @@
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement;
+ at XmlRootElement(name = "list")
+ at XmlAccessorType(XmlAccessType.FIELD)
+public class WrappedList {
+ // @XmlElementWrapper(name="list")
+ @XmlElements({@XmlElement(name = "org.drools.pipeline.camel.Person", type = Person.class)})
+ private List<Person> people = new ArrayList<Person>();
- at XmlRootElement(name="list")
- @XmlAccessorType(XmlAccessType.FIELD)
- public class WrappedList {
-// @XmlElementWrapper(name="list")
- @XmlElements({@XmlElement(name="org.drools.pipeline.camel.Person", type=Person.class)})
- private List<Person> people = new ArrayList<Person>();
+ public void add(int index,
+ Person element) {
+ people.add( index,
+ element );
+ }
- public void add(int index, Person element) {
- people.add(index, element);
- }
+ public boolean add(Person e) {
+ return people.add( e );
+ }
- public boolean add(Person e) {
- return people.add(e);
- }
+ public boolean addAll(Collection< ? extends Person> c) {
+ return people.addAll( c );
+ }
- public boolean addAll(Collection<? extends Person> c) {
- return people.addAll(c);
- }
+ public boolean addAll(int index,
+ Collection< ? extends Person> c) {
+ return people.addAll( index,
+ c );
+ }
- public boolean addAll(int index, Collection<? extends Person> c) {
- return people.addAll(index, c);
- }
+ public void clear() {
+ people.clear();
+ }
- public void clear() {
- people.clear();
- }
+ public boolean contains(Object o) {
+ return people.contains( o );
+ }
- public boolean contains(Object o) {
- return people.contains(o);
- }
+ public boolean containsAll(Collection< ? > c) {
+ return people.containsAll( c );
+ }
- public boolean containsAll(Collection<?> c) {
- return people.containsAll(c);
- }
+ public boolean equals(Object o) {
+ return people.equals( o );
+ }
- public boolean equals(Object o) {
- return people.equals(o);
- }
+ public Person get(int index) {
+ return people.get( index );
+ }
- public Person get(int index) {
- return people.get(index);
- }
+ public int hashCode() {
+ return people.hashCode();
+ }
- public int hashCode() {
- return people.hashCode();
- }
+ public int indexOf(Object o) {
+ return people.indexOf( o );
+ }
- public int indexOf(Object o) {
- return people.indexOf(o);
- }
+ public boolean isEmpty() {
+ return people.isEmpty();
+ }
- public boolean isEmpty() {
- return people.isEmpty();
- }
+ public Iterator<Person> iterator() {
+ return people.iterator();
+ }
- public Iterator<Person> iterator() {
- return people.iterator();
- }
+ public int lastIndexOf(Object o) {
+ return people.lastIndexOf( o );
+ }
- public int lastIndexOf(Object o) {
- return people.lastIndexOf(o);
- }
+ public ListIterator<Person> listIterator() {
+ return people.listIterator();
+ }
- public ListIterator<Person> listIterator() {
- return people.listIterator();
- }
+ public ListIterator<Person> listIterator(int index) {
+ return people.listIterator( index );
+ }
- public ListIterator<Person> listIterator(int index) {
- return people.listIterator(index);
- }
+ public Person remove(int index) {
+ return people.remove( index );
+ }
- public Person remove(int index) {
- return people.remove(index);
- }
+ public boolean remove(Object o) {
+ return people.remove( o );
+ }
- public boolean remove(Object o) {
- return people.remove(o);
- }
+ public boolean removeAll(Collection< ? > c) {
+ return people.removeAll( c );
+ }
- public boolean removeAll(Collection<?> c) {
- return people.removeAll(c);
- }
+ public boolean retainAll(Collection< ? > c) {
+ return people.retainAll( c );
+ }
- public boolean retainAll(Collection<?> c) {
- return people.retainAll(c);
- }
+ public Person set(int index,
+ Person element) {
+ return people.set( index,
+ element );
+ }
- public Person set(int index, Person element) {
- return people.set(index, element);
- }
+ public int size() {
+ return people.size();
+ }
- public int size() {
- return people.size();
- }
+ public List<Person> subList(int fromIndex,
+ int toIndex) {
+ return people.subList( fromIndex,
+ toIndex );
+ }
- public List<Person> subList(int fromIndex, int toIndex) {
- return people.subList(fromIndex, toIndex);
- }
+ public Object[] toArray() {
+ return people.toArray();
+ }
- public Object[] toArray() {
- return people.toArray();
- }
+ public <T> T[] toArray(T[] a) {
+ return people.toArray( a );
+ }
- public <T> T[] toArray(T[] a) {
- return people.toArray(a);
- }
-
- }
\ No newline at end of file
+}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/DroolsResourceAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/DroolsResourceAdapter.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/DroolsResourceAdapter.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -52,29 +52,28 @@
}
}
-
- public void setBasicAuthenticationEnabled(Boolean enabled){
- if (enabled && !(this.resource instanceof UrlResource)){
- throw new IllegalArgumentException("Authentication Attributes are only valid for URL Resources");
+ public void setBasicAuthenticationEnabled(Boolean enabled) {
+ if ( enabled && !(this.resource instanceof UrlResource) ) {
+ throw new IllegalArgumentException( "Authentication Attributes are only valid for URL Resources" );
}
- if (this.resource instanceof UrlResource){
- ((UrlResource)this.resource).setBasicAuthentication(enabled?"enabled":"disabled");
+ if ( this.resource instanceof UrlResource ) {
+ ((UrlResource) this.resource).setBasicAuthentication( enabled ? "enabled" : "disabled" );
}
}
- public void setBasicAuthenticationUsername(String username){
- if (!(this.resource instanceof UrlResource)){
- throw new IllegalArgumentException("Authentication Attributes are only valid for URL Resources");
+ public void setBasicAuthenticationUsername(String username) {
+ if ( !(this.resource instanceof UrlResource) ) {
+ throw new IllegalArgumentException( "Authentication Attributes are only valid for URL Resources" );
}
- ((UrlResource)this.resource).setUsername(username);
+ ((UrlResource) this.resource).setUsername( username );
}
- public void setBasicAuthenticationPassword(String password){
- if (!(this.resource instanceof UrlResource)){
- throw new IllegalArgumentException("Authentication Attributes are only valid for URL Resources");
+ public void setBasicAuthenticationPassword(String password) {
+ if ( !(this.resource instanceof UrlResource) ) {
+ throw new IllegalArgumentException( "Authentication Attributes are only valid for URL Resources" );
}
- ((UrlResource)this.resource).setPassword(password);
+ ((UrlResource) this.resource).setPassword( password );
}
public DroolsResourceAdapter(String resource,
@@ -132,7 +131,7 @@
if ( resourceType == null ) {
throw new IllegalArgumentException( "resourceType property is mandatory" );
}
- if ( resourceConfiguration != null && !(ResourceType.DTABLE.equals( resourceType ) || ResourceType.XSD.equals( resourceType )) ) {
+ if ( resourceConfiguration != null && !(ResourceType.DTABLE.equals( resourceType ) || ResourceType.XSD.equals( resourceType )) ) {
throw new IllegalArgumentException( "Only Decision Tables or XSD resources can have configuration" );
}
}
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:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/GridBeanFactory.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -47,17 +47,17 @@
FactoryBean,
InitializingBean {
- private String id;
- private GridImpl grid;
+ private String id;
+ private GridImpl grid;
- private Map coreServices;
+ private Map coreServices;
- private WhitePages whitePages;
+ private WhitePages whitePages;
- private JpaConfiguration jpaConfiguration;
-
- private SocketServiceConfiguration socketServiceConfiguration ;
+ private JpaConfiguration jpaConfiguration;
+ private SocketServiceConfiguration socketServiceConfiguration;
+
// private String type;
// private GenericConnection connection;
//
@@ -77,55 +77,57 @@
public void afterPropertiesSet() throws Exception {
this.grid = new GridImpl( new HashMap() );
MultiplexSocketServiceCongifuration socketConf = null;
-
+
if ( this.coreServices == null ) {
this.coreServices = new HashMap();
}
GridPeerConfiguration conf = new GridPeerConfiguration();
GridPeerServiceConfiguration coreSeviceLookupConf = new CoreServicesLookupConfiguration( this.coreServices );
- conf.addConfiguration( coreSeviceLookupConf );
-
+ conf.addConfiguration( coreSeviceLookupConf );
+
//Configuring the WhitePages
if ( this.whitePages != null ) {
WhitePagesLocalConfiguration wplConf = new WhitePagesLocalConfiguration();
wplConf.setWhitePages( this.whitePages );
conf.addConfiguration( wplConf );
}
-
- conf.configure( this.grid );
-
+
+ conf.configure( this.grid );
+
// We do this after the main grid configuration, to make sure all services are instantiated
- if ( this.socketServiceConfiguration != null ) {
+ if ( this.socketServiceConfiguration != null ) {
AcceptorFactoryService acc = null;
if ( "mina".equals( this.socketServiceConfiguration.getAcceptor() ) ) {
- acc = new MinaAcceptorFactoryService();
+ acc = new MinaAcceptorFactoryService();
}
if ( acc == null ) {
// Mina is the default for the moment
acc = new MinaAcceptorFactoryService();
}
-
+
socketConf = new MultiplexSocketServiceCongifuration( new MultiplexSocketServerImpl( this.socketServiceConfiguration.getIp(),
acc,
SystemEventListenerFactory.getSystemEventListener(),
- this.grid) );
-
- for (String[] services : this.socketServiceConfiguration.getServices() ) {
- Object service = ((GridImpl)this.grid).get( services[0].trim() );
+ this.grid ) );
+
+ for ( String[] services : this.socketServiceConfiguration.getServices() ) {
+ Object service = ((GridImpl) this.grid).get( services[0].trim() );
if ( service == null ) {
throw new RuntimeException( "Unable to configure socket. Service '" + services[0] + "' could not be found" );
}
if ( "auto".equals( services[1].trim() ) ) {
-
+
} else {
- socketConf.addService( services[0].trim(), service, Integer.parseInt( services[1].trim() ) );
+ socketConf.addService( services[0].trim(),
+ service,
+ Integer.parseInt( services[1].trim() ) );
}
}
-
+
socketConf.configureService( this.grid );
- }
+ }
}
public void setId(String id) {
@@ -160,7 +162,6 @@
this.jpaConfiguration = jpaConfiguration;
}
-
public SocketServiceConfiguration getSocketServiceConfiguration() {
return socketServiceConfiguration;
}
@@ -170,36 +171,37 @@
}
public static class SocketServiceConfiguration {
- private String ip;
- private String acceptor;
+ private String ip;
+ private String acceptor;
private List<String[]> services;
-
+
public String getIp() {
return ip;
}
+
public void setIp(String ip) {
this.ip = ip;
}
+
public String getAcceptor() {
return acceptor;
}
+
public void setAcceptor(String acceptor) {
this.acceptor = acceptor;
- }
-
+ }
+
public List<String[]> getServices() {
if ( this.services == null ) {
this.services = new ArrayList<String[]>();
}
return services;
- }
-
+ }
+
public void setServices(List<String[]> services) {
this.services = services;
}
-
-
-
+
}
}
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:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/GridNodeBeanFactory.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -41,7 +41,7 @@
private String id;
private Grid grid;
private GridNode node;
-
+
private String port;
//
@@ -66,9 +66,11 @@
new WhitePagesImpl() );
}
this.node = this.grid.createGridNode( id );
-
+
if ( StringUtils.hasText( this.port ) ) {
- this.grid.get( SocketService.class ).addService( id, Integer.parseInt( port ), this.node );
+ this.grid.get( SocketService.class ).addService( id,
+ Integer.parseInt( port ),
+ this.node );
}
// connection.addExecutionNode(new LocalNodeConnector());
// connection.addDirectoryNode(new LocalDirectoryConnector());
@@ -100,7 +102,5 @@
public void setPort(String port) {
this.port = port;
}
-
-
}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeAgentBeanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeAgentBeanFactory.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeAgentBeanFactory.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -71,23 +71,23 @@
this.kagent = KnowledgeAgentFactory.newKnowledgeAgent( this.id,
this.kbase,
kagentConf );
-
+
if ( resources != null && !resources.isEmpty() ) {
Collection<Resource> rs = new ArrayList<Resource>();
for ( DroolsResourceAdapter res : resources ) {
InternalResource resource = (InternalResource) res.getDroolsResource();
-
+
resource.setResourceType( res.getResourceType() );
-
+
if ( res.getResourceConfiguration() != null ) {
resource.setConfiguration( res.getResourceConfiguration() );
}
-
+
rs.add( resource );
}
ChangeSetImpl changeSet = new ChangeSetImpl();
changeSet.setResourcesAdded( rs );
-
+
kagent.applyChangeSet( changeSet );
}
}
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:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/KnowledgeBaseBeanFactory.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -47,14 +47,14 @@
FactoryBean,
InitializingBean {
- private KnowledgeBaseConfiguration conf;
- private Map<String, AccumulateFunction> accumulateFunctions;
- private Map<String, EvaluatorDefinition> evaluators;
-
- private KnowledgeBase kbase;
- private GridNode node;
- private List<DroolsResourceAdapter> resources = Collections.emptyList();
+ private KnowledgeBaseConfiguration conf;
+ private Map<String, AccumulateFunction> accumulateFunctions;
+ private Map<String, EvaluatorDefinition> evaluators;
+ private KnowledgeBase kbase;
+ private GridNode node;
+ private List<DroolsResourceAdapter> resources = Collections.emptyList();
+
public Object getObject() throws Exception {
return kbase;
}
@@ -70,40 +70,42 @@
public void afterPropertiesSet() throws Exception {
if ( this.node == null ) {
this.node = new GridNodeImpl();
-// GenericConnection connection = new GridConnection();
-// connection.addExecutionNode(new LocalNodeConnector());
-// connection.addDirectoryNode(new LocalDirectoryConnector());
-// this.node = connection.getExecutionNode();
+ // GenericConnection connection = new GridConnection();
+ // connection.addExecutionNode(new LocalNodeConnector());
+ // connection.addDirectoryNode(new LocalDirectoryConnector());
+ // this.node = connection.getExecutionNode();
- }
-
- PackageBuilderConfiguration kconf = (PackageBuilderConfiguration) KnowledgeBuilderFactory.newKnowledgeBuilderConfiguration();
- if (this.accumulateFunctions != null && !this.accumulateFunctions.isEmpty()) {
+ }
+
+ PackageBuilderConfiguration kconf = (PackageBuilderConfiguration) KnowledgeBuilderFactory.newKnowledgeBuilderConfiguration();
+ if ( this.accumulateFunctions != null && !this.accumulateFunctions.isEmpty() ) {
for ( Entry<String, AccumulateFunction> entry : this.accumulateFunctions.entrySet() ) {
- kconf.setOption( AccumulateFunctionOption.get( entry.getKey(), entry.getValue()) );
+ kconf.setOption( AccumulateFunctionOption.get( entry.getKey(),
+ entry.getValue() ) );
}
}
-
- if (this.evaluators != null && !this.evaluators.isEmpty()) {
+
+ if ( this.evaluators != null && !this.evaluators.isEmpty() ) {
for ( Entry<String, EvaluatorDefinition> entry : this.evaluators.entrySet() ) {
- kconf.setOption( EvaluatorOption.get( entry.getKey(), entry.getValue()) );
+ kconf.setOption( EvaluatorOption.get( entry.getKey(),
+ entry.getValue() ) );
}
- }
-
- KnowledgeBuilder kbuilder = node.get( KnowledgeBuilderFactoryService.class ).newKnowledgeBuilder(kconf);
+ }
+
+ KnowledgeBuilder kbuilder = node.get( KnowledgeBuilderFactoryService.class ).newKnowledgeBuilder( kconf );
if ( this.conf != null ) {
- kbase = node.get( KnowledgeBaseFactoryService.class ).newKnowledgeBase(conf);
+ kbase = node.get( KnowledgeBaseFactoryService.class ).newKnowledgeBase( conf );
} else {
- kbase = node.get( KnowledgeBaseFactoryService.class ).newKnowledgeBase( );
+ kbase = node.get( KnowledgeBaseFactoryService.class ).newKnowledgeBase();
}
-
+
List<JaxbConfigurationImpl> xsds = new ArrayList<JaxbConfigurationImpl>();
-
- for ( DroolsResourceAdapter res : resources ) {
+
+ for ( DroolsResourceAdapter res : resources ) {
if ( res.getResourceType().equals( ResourceType.XSD ) ) {
- xsds.add( ( JaxbConfigurationImpl ) res.getResourceConfiguration() );
+ xsds.add( (JaxbConfigurationImpl) res.getResourceConfiguration() );
}
-
+
if ( res.getResourceConfiguration() == null ) {
kbuilder.add( res.getDroolsResource(),
res.getResourceType() );
@@ -120,15 +122,14 @@
}
kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
-
- KnowledgeBaseImpl kbaseImpl = ( KnowledgeBaseImpl ) kbase;
+
+ KnowledgeBaseImpl kbaseImpl = (KnowledgeBaseImpl) kbase;
kbaseImpl.jaxbClasses = new ArrayList<List<String>>();
for ( JaxbConfigurationImpl conf : xsds ) {
- kbaseImpl.jaxbClasses.add( conf.getClasses() );
+ kbaseImpl.jaxbClasses.add( conf.getClasses() );
}
}
-
public Map<String, AccumulateFunction> getAccumulateFunctions() {
return accumulateFunctions;
@@ -176,6 +177,6 @@
public void setNode(GridNode gridNode) {
this.node = gridNode;
- }
+ }
}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/ResourceChangeScannerBeanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/ResourceChangeScannerBeanFactory.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/ResourceChangeScannerBeanFactory.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -32,7 +32,7 @@
InitializingBean {
private String id;
- private int interval;
+ private int interval;
public Object getObject() throws Exception {
return ResourceFactory.getResourceChangeScannerService();
@@ -47,7 +47,7 @@
}
public void afterPropertiesSet() throws Exception {
- ResourceFactory.getResourceChangeScannerService().setInterval( this.interval );
+ ResourceFactory.getResourceChangeScannerService().setInterval( this.interval );
}
public void setId(String id) {
@@ -58,14 +58,12 @@
return id;
}
- public int getInterval() {
- return interval;
- }
+ public int getInterval() {
+ return interval;
+ }
- public void setInterval(int interval) {
- this.interval = interval;
- }
+ public void setInterval(int interval) {
+ this.interval = interval;
+ }
-
-
}
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:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/StatefulKnowledgeSessionBeanFactory.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -62,18 +62,17 @@
Map<String, WorkItemHandler> map = ((SessionConfiguration) getConf()).getWorkItemHandlers();
map.putAll( getWorkItems() );
}
-
+
if ( jpaConfiguration != null ) {
-
-
+
Environment env = KnowledgeBaseFactory.newEnvironment();
env.set( EnvironmentName.ENTITY_MANAGER_FACTORY,
jpaConfiguration.getEntityManagerFactory() );
env.set( EnvironmentName.TRANSACTION_MANAGER,
jpaConfiguration.getPlatformTransactionManager() );
- env.set( EnvironmentName.OBJECT_MARSHALLING_STRATEGIES,
- new ObjectMarshallingStrategy[]{ new SerializablePlaceholderResolverStrategy(ClassObjectMarshallingStrategyAcceptor.DEFAULT)} );
-
+ env.set( EnvironmentName.OBJECT_MARSHALLING_STRATEGIES,
+ new ObjectMarshallingStrategy[]{new SerializablePlaceholderResolverStrategy( ClassObjectMarshallingStrategyAcceptor.DEFAULT )} );
+
if ( jpaConfiguration.getId() >= 0 ) {
ksession = JPAKnowledgeService.loadStatefulKnowledgeSession( jpaConfiguration.getId(),
getKbase(),
@@ -85,17 +84,19 @@
env );
}
} else {
- ksession = getKbase().newStatefulKnowledgeSession( getConf(), null);
+ ksession = getKbase().newStatefulKnowledgeSession( getConf(),
+ null );
}
-
- if ( getBatch() != null && !getBatch().isEmpty()) {
- for ( Command<?> cmd : getBatch() ) {
+
+ if ( getBatch() != null && !getBatch().isEmpty() ) {
+ for ( Command< ? > cmd : getBatch() ) {
ksession.execute( cmd );
}
}
-
+
if ( getNode() != null ) {
- getNode().set( getName(), this.ksession );
+ getNode().set( getName(),
+ this.ksession );
}
}
@@ -105,8 +106,6 @@
private PlatformTransactionManager tm;
private int id = -1;
-
-
public EntityManagerFactory getEntityManagerFactory() {
return this.emf;
@@ -131,7 +130,6 @@
public void setId(int id) {
this.id = id;
}
-
-
+
}
}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/StatelessKnowledgeSessionBeanFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/StatelessKnowledgeSessionBeanFactory.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/StatelessKnowledgeSessionBeanFactory.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -26,14 +26,14 @@
public class StatelessKnowledgeSessionBeanFactory extends AbstractKnowledgeSessionBeanFactory {
private StatelessKnowledgeSession ksession;
- private KnowledgeAgent kagent;
-
+ private KnowledgeAgent kagent;
+
public void setKnowledgeAgent(KnowledgeAgent kagent) {
- this.kagent = kagent;
+ this.kagent = kagent;
}
-
+
public KnowledgeAgent getKnowledgeAgent() {
- return this.kagent;
+ return this.kagent;
}
public Class<StatelessKnowledgeSession> getObjectType() {
@@ -51,15 +51,16 @@
Map<String, WorkItemHandler> map = ((SessionConfiguration) getConf()).getWorkItemHandlers();
map.putAll( getWorkItems() );
}
-
- if ( this.kagent != null ) {
- ksession = this.kagent.newStatelessKnowledgeSession( getConf() );
- } else {
- ksession = getKbase().newStatelessKnowledgeSession( getConf() );
- }
-
+
+ if ( this.kagent != null ) {
+ ksession = this.kagent.newStatelessKnowledgeSession( getConf() );
+ } else {
+ ksession = getKbase().newStatelessKnowledgeSession( getConf() );
+ }
+
if ( getNode() != null ) {
- getNode().set( getName(), this.ksession );
- }
+ getNode().set( getName(),
+ this.ksession );
+ }
}
}
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:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringJpaManager.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -36,7 +36,7 @@
implements
JpaManager {
- Logger logger = LoggerFactory.getLogger( getClass() );
+ Logger logger = LoggerFactory.getLogger( getClass() );
Environment env;
@@ -48,7 +48,7 @@
public DroolsSpringJpaManager(Environment env) {
this.env = env;
- this.emf = ( EntityManagerFactory ) env.get( EnvironmentName.ENTITY_MANAGER_FACTORY );
+ this.emf = (EntityManagerFactory) env.get( EnvironmentName.ENTITY_MANAGER_FACTORY );
getApplicationScopedEntityManager(); // we create this on initialisation so that we own the EMF reference
// otherwise Spring will close it after the transaction finishes
@@ -59,14 +59,14 @@
// Use the App scoped EntityManager if the user has provided it, and it is open.
this.appScopedEntityManager = (EntityManager) this.env.get( EnvironmentName.APP_SCOPED_ENTITY_MANAGER );
if ( this.appScopedEntityManager != null && !this.appScopedEntityManager.isOpen() ) {
- throw new RuntimeException("Provided APP_SCOPED_ENTITY_MANAGER is not open");
+ throw new RuntimeException( "Provided APP_SCOPED_ENTITY_MANAGER is not open" );
}
if ( this.appScopedEntityManager == null ) {
- EntityManagerHolder emHolder = ( EntityManagerHolder ) TransactionSynchronizationManager.getResource( this.emf );
+ EntityManagerHolder emHolder = (EntityManagerHolder) TransactionSynchronizationManager.getResource( this.emf );
if ( emHolder == null ) {
this.appScopedEntityManager = this.emf.createEntityManager();
- emHolder = new EntityManagerHolder( this.appScopedEntityManager );
+ emHolder = new EntityManagerHolder( this.appScopedEntityManager );
TransactionSynchronizationManager.bindResource( this.emf,
emHolder );
internalAppScopedEntityManager = true;
@@ -74,28 +74,27 @@
this.appScopedEntityManager = emHolder.getEntityManager();
}
-
this.env.set( EnvironmentName.APP_SCOPED_ENTITY_MANAGER,
emHolder.getEntityManager() );
}
}
- if (TransactionSynchronizationManager.isActualTransactionActive()){
+ if ( TransactionSynchronizationManager.isActualTransactionActive() ) {
this.appScopedEntityManager.joinTransaction();
}
return this.appScopedEntityManager;
}
public EntityManager getCommandScopedEntityManager() {
- return (EntityManager) this.env.get( EnvironmentName.CMD_SCOPED_ENTITY_MANAGER);
+ return (EntityManager) this.env.get( EnvironmentName.CMD_SCOPED_ENTITY_MANAGER );
}
public void beginCommandScopedEntityManager() {
if ( this.getCommandScopedEntityManager() == null || !this.getCommandScopedEntityManager().isOpen() ) {
- EntityManagerHolder emHolder = ( EntityManagerHolder ) TransactionSynchronizationManager.getResource( "cmdEM" );
+ EntityManagerHolder emHolder = (EntityManagerHolder) TransactionSynchronizationManager.getResource( "cmdEM" );
EntityManager em = null;
if ( emHolder == null ) {
em = this.emf.createEntityManager();
- emHolder = new EntityManagerHolder( em );
+ emHolder = new EntityManagerHolder( em );
TransactionSynchronizationManager.bindResource( "cmdEM",
emHolder );
} else {
@@ -111,9 +110,9 @@
}
public void endCommandScopedEntityManager() {
- if (TransactionSynchronizationManager.hasResource("cmdEM")){
- TransactionSynchronizationManager.unbindResource("cmdEM");
- if (getCommandScopedEntityManager() != null){
+ if ( TransactionSynchronizationManager.hasResource( "cmdEM" ) ) {
+ TransactionSynchronizationManager.unbindResource( "cmdEM" );
+ if ( getCommandScopedEntityManager() != null ) {
getCommandScopedEntityManager().close();
}
@@ -121,18 +120,18 @@
}
public void dispose() {
- logger.trace("Disposing DroolsSpringJpaManager");
+ logger.trace( "Disposing DroolsSpringJpaManager" );
if ( internalAppScopedEntityManager ) {
//TransactionSynchronizationManager.unbindResource( "appEM" );
TransactionSynchronizationManager.unbindResource( this.emf );
- if ( this.appScopedEntityManager != null && this.appScopedEntityManager.isOpen() ) {
+ if ( this.appScopedEntityManager != null && this.appScopedEntityManager.isOpen() ) {
this.appScopedEntityManager.close();
this.internalAppScopedEntityManager = false;
- this.env.set( EnvironmentName.APP_SCOPED_ENTITY_MANAGER, null );
+ this.env.set( EnvironmentName.APP_SCOPED_ENTITY_MANAGER,
+ null );
}
this.endCommandScopedEntityManager();
}
}
}
-
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:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/DroolsSpringTransactionManager.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -35,7 +35,7 @@
implements
TransactionManager {
- Logger logger = LoggerFactory.getLogger( getClass() );
+ Logger logger = LoggerFactory.getLogger( getClass() );
private AbstractPlatformTransactionManager ptm;
TransactionDefinition td = new DefaultTransactionDefinition();
@@ -68,11 +68,11 @@
}
public void rollback() {
- if ( this.localTransaction ) {
- this.localTransaction = false;
- this.ptm.rollback( currentTransaction );
- currentTransaction = null;
- }
+ if ( this.localTransaction ) {
+ this.localTransaction = false;
+ this.ptm.rollback( currentTransaction );
+ currentTransaction = null;
+ }
}
/**
@@ -84,7 +84,7 @@
return TransactionManager.STATUS_NO_TRANSACTION;
}
- logger.debug("Current TX name (According to TransactionSynchronizationManager) : "+TransactionSynchronizationManager.getCurrentTransactionName());
+ logger.debug( "Current TX name (According to TransactionSynchronizationManager) : " + TransactionSynchronizationManager.getCurrentTransactionName() );
if ( TransactionSynchronizationManager.isActualTransactionActive() ) {
TransactionStatus transaction = null;
try {
@@ -96,7 +96,7 @@
} else {
transaction = currentTransaction;
}
- logger.debug("Current TX: "+transaction);
+ logger.debug( "Current TX: " + transaction );
// If SynchronizationManager thinks it has an active transaction but
// our transaction is a new one
// then we must be in the middle of committing
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/SpringTransactionSynchronizationAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/SpringTransactionSynchronizationAdapter.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/beans/persistence/SpringTransactionSynchronizationAdapter.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -23,7 +23,7 @@
implements
TransactionSynchronization {
private org.drools.persistence.session.TransactionSynchronization ts;
-
+
public SpringTransactionSynchronizationAdapter(org.drools.persistence.session.TransactionSynchronization ts) {
this.ts = ts;
}
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:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/GridDefinitionParser.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -43,105 +43,122 @@
*
*/
public class GridDefinitionParser extends AbstractBeanDefinitionParser {
-
- private static final String EMF_ATTRIBUTE = "entity-manager-factory";
+ private static final String EMF_ATTRIBUTE = "entity-manager-factory";
+
protected AbstractBeanDefinition parseInternal(Element element,
ParserContext parserContext) {
BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition( GridBeanFactory.class );
-
- String id = element.getAttribute( "id" );
+
+ String id = element.getAttribute( "id" );
factory.addPropertyValue( "id",
- id );
-
- for (int i = 0, length = element.getChildNodes().getLength(); i < length; i++) {
+ id );
+
+ for ( int i = 0, length = element.getChildNodes().getLength(); i < length; i++ ) {
Node n = element.getChildNodes().item( i );
if ( n instanceof Element ) {
- Element e = ( Element ) n;
-
+ Element e = (Element) n;
+
if ( "core-services".equals( e.getLocalName() ) ) {
String ref = e.getAttribute( "ref" );
- Element nestedElm = getFirstElement( e.getChildNodes() );
+ Element nestedElm = getFirstElement( e.getChildNodes() );
if ( StringUtils.hasText( ref ) ) {
- factory.addPropertyReference( "coreServices", ref );
- } else if ( nestedElm != null ) {
- factory.addPropertyValue( "coreServices", parserContext.getDelegate().parsePropertySubElement(nestedElm, null, null) );
+ factory.addPropertyReference( "coreServices",
+ ref );
+ } else if ( nestedElm != null ) {
+ factory.addPropertyValue( "coreServices",
+ parserContext.getDelegate().parsePropertySubElement( nestedElm,
+ null,
+ null ) );
} else {
throw new IllegalArgumentException( "set-global must either specify a 'ref' attribute or have a nested bean" );
- }
- } else if ( "whitepages".equals( e.getLocalName() ) ) {
- Element persistenceElm = DomUtils.getChildElementByTagName(e, "jpa-persistence");
- if ( persistenceElm != null) {
+ }
+ } else if ( "whitepages".equals( e.getLocalName() ) ) {
+ Element persistenceElm = DomUtils.getChildElementByTagName( e,
+ "jpa-persistence" );
+ if ( persistenceElm != null ) {
BeanDefinitionBuilder beanBuilder = BeanDefinitionBuilder.genericBeanDefinition( JpaWhitePages.class );
-
- Element emf = DomUtils.getChildElementByTagName(persistenceElm, EMF_ATTRIBUTE);
+
+ Element emf = DomUtils.getChildElementByTagName( persistenceElm,
+ EMF_ATTRIBUTE );
String ref = emf.getAttribute( "ref" );
-
+
beanBuilder.addConstructorArgReference( ref );
- factory.addPropertyValue( "whitePages", beanBuilder.getBeanDefinition() );
+ factory.addPropertyValue( "whitePages",
+ beanBuilder.getBeanDefinition() );
} else {
String ref = e.getAttribute( "ref" );
- Element nestedElm = getFirstElement( e.getChildNodes() );
+ Element nestedElm = getFirstElement( e.getChildNodes() );
if ( StringUtils.hasText( ref ) ) {
- factory.addPropertyReference( "whitePages", ref );
- } else if ( nestedElm != null ) {
- factory.addPropertyValue( "whitePages", parserContext.getDelegate().parsePropertySubElement(nestedElm, null, null) );
+ factory.addPropertyReference( "whitePages",
+ ref );
+ } else if ( nestedElm != null ) {
+ factory.addPropertyValue( "whitePages",
+ parserContext.getDelegate().parsePropertySubElement( nestedElm,
+ null,
+ null ) );
} else {
- factory.addPropertyValue( "whitePages", new WhitePagesImpl() );
+ factory.addPropertyValue( "whitePages",
+ new WhitePagesImpl() );
}
}
} else if ( "socket-service".equals( e.getLocalName() ) ) {
String acceptor = e.getAttribute( "acceptor" );
String ip = e.getAttribute( "ip" );
-
+
AcceptorFactoryService acc = null;
if ( StringUtils.hasText( acceptor ) ) {
- if ( "mina".equals( acceptor )) {
+ if ( "mina".equals( acceptor ) ) {
acc = new MinaAcceptorFactoryService();
}
- }
+ }
if ( acc == null ) {
acc = new MinaAcceptorFactoryService();
- }
-
+ }
+
if ( !StringUtils.hasText( ip ) ) {
try {
ip = InetAddress.getLocalHost().getHostAddress();
} catch ( UnknownHostException e1 ) {
- throw new RuntimeException( "socket-service did not specify an ip address and one could not be determined", e1 );
+ throw new RuntimeException( "socket-service did not specify an ip address and one could not be determined",
+ e1 );
}
}
-
+
if ( !StringUtils.hasText( ip ) ) {
throw new RuntimeException( "socket-service did not specify an ip address and one could not be determined" );
}
-
+
BeanDefinitionBuilder beanBuilder = BeanDefinitionBuilder.genericBeanDefinition( SocketServiceConfiguration.class );
- beanBuilder.addPropertyValue( "ip", ip );
- beanBuilder.addPropertyValue( "acceptor", acceptor );
-
+ beanBuilder.addPropertyValue( "ip",
+ ip );
+ beanBuilder.addPropertyValue( "acceptor",
+ acceptor );
+
//e.getChildNodes()
List<String[]> services = new ArrayList<String[]>();
- for (int j = 0, serviceLength = e.getChildNodes().getLength(); j < serviceLength; j++) {
+ for ( int j = 0, serviceLength = e.getChildNodes().getLength(); j < serviceLength; j++ ) {
Node e2 = e.getChildNodes().item( j );
- if ( e2 instanceof Element && "service".equals(((Element)e2).getLocalName())) {
- Element se = ( Element ) e2;
+ if ( e2 instanceof Element && "service".equals( ((Element) e2).getLocalName() ) ) {
+ Element se = (Element) e2;
String name = se.getAttribute( "name" );
- String port = se.getAttribute( "port" );
- services.add( new String[] { name, port } );
+ String port = se.getAttribute( "port" );
+ services.add( new String[]{name, port} );
}
}
- beanBuilder.addPropertyValue( "services", services );
- factory.addPropertyValue( "socketServiceConfiguration", beanBuilder.getBeanDefinition() );
+ beanBuilder.addPropertyValue( "services",
+ services );
+ factory.addPropertyValue( "socketServiceConfiguration",
+ beanBuilder.getBeanDefinition() );
}
-
+
}
- }
-
+ }
+
return factory.getBeanDefinition();
}
@@ -152,14 +169,14 @@
throw new IllegalArgumentException( "<" + element + "> requires a '" + attributeName + "' attribute" );
}
}
-
- private Element getFirstElement(NodeList list) {
- for (int j = 0, lengthj = list.getLength(); j < lengthj; j++) {
+
+ private Element getFirstElement(NodeList list) {
+ for ( int j = 0, lengthj = list.getLength(); j < lengthj; j++ ) {
if ( list.item( j ) instanceof Element ) {
- return ( Element ) list.item( j );
+ return (Element) list.item( j );
}
- }
+ }
return null;
- }
+ }
}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/GridNodeDefinitionParser.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/GridNodeDefinitionParser.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/GridNodeDefinitionParser.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -41,25 +41,26 @@
BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition( GridNodeBeanFactory.class );
- String id = element.getAttribute( "id" );
+ String id = element.getAttribute( "id" );
factory.addPropertyValue( "id",
- id );
-
+ id );
+
String connectionRef = element.getAttribute( GRID_ATTRIBUTE );
if ( StringUtils.hasText( connectionRef ) ) {
factory.addPropertyReference( GRID_ATTRIBUTE,
connectionRef );
}
-
- for (int i = 0, length = element.getChildNodes().getLength(); i < length; i++) {
+
+ for ( int i = 0, length = element.getChildNodes().getLength(); i < length; i++ ) {
Node n = element.getChildNodes().item( i );
if ( n instanceof Element ) {
- Element e = ( Element ) n;
-
+ Element e = (Element) n;
+
if ( "socket-service".equals( e.getLocalName() ) ) {
String port = e.getAttribute( PORT_ATTRIBUTE );
if ( StringUtils.hasText( port ) ) {
- factory.addPropertyValue( "port", port );
+ factory.addPropertyValue( "port",
+ port );
}
}
}
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-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeAgentDefinitionParser.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -46,43 +46,45 @@
String id = element.getAttribute( "id" );
emptyAttributeCheck( element.getLocalName(),
- "id",
- id);
+ "id",
+ id );
factory.addPropertyValue( "id",
id );
-
+
String kbase = element.getAttribute( "kbase" );
if ( StringUtils.hasText( kbase ) ) {
factory.addPropertyReference( "kbase",
- kbase );
+ kbase );
}
-
+
String newInstance = element.getAttribute( "new-instance" );
if ( StringUtils.hasText( newInstance ) ) {
factory.addPropertyValue( "newInstance",
- newInstance );
+ newInstance );
}
-
- ManagedList resources = KnowledgeBaseDefinitionParser.getResources(element, parserContext, factory);
+ ManagedList resources = KnowledgeBaseDefinitionParser.getResources( element,
+ parserContext,
+ factory );
+
if ( resources != null ) {
factory.addPropertyValue( "resources",
resources );
- }
-
+ }
+
// inject the kagent into any stateless sessions
for ( String beanName : parserContext.getRegistry().getBeanDefinitionNames() ) {
- BeanDefinition def = parserContext.getRegistry().getBeanDefinition(beanName);
- if ( def.getBeanClassName().equals( StatelessKnowledgeSessionBeanFactory.class.getName() ) ) {
- PropertyValue pvalue = def.getPropertyValues().getPropertyValue( "kbase" );
- RuntimeBeanReference tbf = ( RuntimeBeanReference ) pvalue.getValue();
- if ( kbase.equals( tbf.getBeanName() ) ) {
- def.getPropertyValues().addPropertyValue( "knowledgeAgent", new RuntimeBeanReference( id ) );
- }
- }
+ BeanDefinition def = parserContext.getRegistry().getBeanDefinition( beanName );
+ if ( def.getBeanClassName().equals( StatelessKnowledgeSessionBeanFactory.class.getName() ) ) {
+ PropertyValue pvalue = def.getPropertyValues().getPropertyValue( "kbase" );
+ RuntimeBeanReference tbf = (RuntimeBeanReference) pvalue.getValue();
+ if ( kbase.equals( tbf.getBeanName() ) ) {
+ def.getPropertyValues().addPropertyValue( "knowledgeAgent",
+ new RuntimeBeanReference( id ) );
+ }
+ }
}
-
return factory.getBeanDefinition();
}
}
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-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeBaseDefinitionParser.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -46,15 +46,15 @@
private static final String MBEABS = "mbeans";
private static final String EVENT_PROCESSING_MODE = "event-processing-mode";
-
+
private static final String ASSERT_BEHAVIOR = "assert-behavior";
-
+
private static final String ACCUMULATE_FUNCTIONS = "accumulate-functions";
-
+
private static final String ACCUMULATE_FUNCTION = "accumulate-function";
-
+
private static final String EVALUATORS = "evaluators";
-
+
private static final String EVALUATOR = "evaluator";
private static final String CONSEQUENCE_EXCEPTION_HANDLER = "consequenceExceptionHandler";
@@ -64,70 +64,91 @@
protected AbstractBeanDefinition parseInternal(Element element,
ParserContext parserContext) {
BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition( KnowledgeBaseBeanFactory.class );
-
- Element kbaseConf = DomUtils.getChildElementByTagName(element, "configuration");
+
+ Element kbaseConf = DomUtils.getChildElementByTagName( element,
+ "configuration" );
if ( kbaseConf != null ) {
BeanDefinitionBuilder rbaseConfBuilder = BeanDefinitionBuilder.rootBeanDefinition( RuleBaseConfiguration.class );
- Element e = DomUtils.getChildElementByTagName(kbaseConf, ADVANCED_PROCESS_RULE_INTEGRATED);
- if ( e != null && !StringUtils.isEmpty( e.getAttribute( "enabled" ) )) {
- rbaseConfBuilder.addPropertyValue( "advancedProcessRuleIntegration", Boolean.parseBoolean( e.getAttribute( "enabled" ) ) );
+ Element e = DomUtils.getChildElementByTagName( kbaseConf,
+ ADVANCED_PROCESS_RULE_INTEGRATED );
+ if ( e != null && !StringUtils.isEmpty( e.getAttribute( "enabled" ) ) ) {
+ rbaseConfBuilder.addPropertyValue( "advancedProcessRuleIntegration",
+ Boolean.parseBoolean( e.getAttribute( "enabled" ) ) );
}
-
- e = DomUtils.getChildElementByTagName(kbaseConf, MULTITHREADS);
- if ( e != null && !StringUtils.isEmpty( e.getAttribute( "enabled" ) )) {
- rbaseConfBuilder.addPropertyValue( "multithreadEvaluation", Boolean.parseBoolean( e.getAttribute( "enabled" ) ));
- if ( !StringUtils.isEmpty( e.getAttribute( MAX_THREADS ) ) ) {
- rbaseConfBuilder.addPropertyValue( "maxThreads" , Integer.parseInt( e.getAttribute( MAX_THREADS ) ) );
+
+ e = DomUtils.getChildElementByTagName( kbaseConf,
+ MULTITHREADS );
+ if ( e != null && !StringUtils.isEmpty( e.getAttribute( "enabled" ) ) ) {
+ rbaseConfBuilder.addPropertyValue( "multithreadEvaluation",
+ Boolean.parseBoolean( e.getAttribute( "enabled" ) ) );
+ if ( !StringUtils.isEmpty( e.getAttribute( MAX_THREADS ) ) ) {
+ rbaseConfBuilder.addPropertyValue( "maxThreads",
+ Integer.parseInt( e.getAttribute( MAX_THREADS ) ) );
}
- }
-
- e = DomUtils.getChildElementByTagName(kbaseConf, MBEABS);
- if ( e != null && !StringUtils.isEmpty( e.getAttribute( "enabled" ) )) {
- rbaseConfBuilder.addPropertyValue( "MBeansEnabled", Boolean.parseBoolean( e.getAttribute( "enabled" ) ) );
- }
-
- e = DomUtils.getChildElementByTagName(kbaseConf, EVENT_PROCESSING_MODE);
- if ( e != null && !StringUtils.isEmpty( e.getAttribute( "mode" ) )) {
- rbaseConfBuilder.addPropertyValue( "eventProcessingMode", EventProcessingOption.valueOf( e.getAttribute( "mode" ) ) );
- }
-
- e = DomUtils.getChildElementByTagName(kbaseConf, ASSERT_BEHAVIOR);
- if ( e != null && !StringUtils.isEmpty( e.getAttribute( "mode" ) )) {
- rbaseConfBuilder.addPropertyValue( "assertBehaviour", AssertBehaviour.determineAssertBehaviour( e.getAttribute( "mode" ) ) );
- }
-
- e = DomUtils.getChildElementByTagName(kbaseConf, ACCUMULATE_FUNCTIONS);
+ }
+
+ e = DomUtils.getChildElementByTagName( kbaseConf,
+ MBEABS );
+ if ( e != null && !StringUtils.isEmpty( e.getAttribute( "enabled" ) ) ) {
+ rbaseConfBuilder.addPropertyValue( "MBeansEnabled",
+ Boolean.parseBoolean( e.getAttribute( "enabled" ) ) );
+ }
+
+ e = DomUtils.getChildElementByTagName( kbaseConf,
+ EVENT_PROCESSING_MODE );
+ if ( e != null && !StringUtils.isEmpty( e.getAttribute( "mode" ) ) ) {
+ rbaseConfBuilder.addPropertyValue( "eventProcessingMode",
+ EventProcessingOption.valueOf( e.getAttribute( "mode" ) ) );
+ }
+
+ e = DomUtils.getChildElementByTagName( kbaseConf,
+ ASSERT_BEHAVIOR );
+ if ( e != null && !StringUtils.isEmpty( e.getAttribute( "mode" ) ) ) {
+ rbaseConfBuilder.addPropertyValue( "assertBehaviour",
+ AssertBehaviour.determineAssertBehaviour( e.getAttribute( "mode" ) ) );
+ }
+
+ e = DomUtils.getChildElementByTagName( kbaseConf,
+ ACCUMULATE_FUNCTIONS );
if ( e != null ) {
- List<Element> children = DomUtils.getChildElementsByTagName( e, ACCUMULATE_FUNCTION );
+ List<Element> children = DomUtils.getChildElementsByTagName( e,
+ ACCUMULATE_FUNCTION );
if ( children != null && !children.isEmpty() ) {
ManagedMap functions = new ManagedMap();
for ( Element child : children ) {
- functions.put( child.getAttribute( "name" ),
+ functions.put( child.getAttribute( "name" ),
new RuntimeBeanReference( child.getAttribute( "ref" ) ) );
}
- factory.addPropertyValue( "accumulateFunctions", functions );
+ factory.addPropertyValue( "accumulateFunctions",
+ functions );
}
}
-
- e = DomUtils.getChildElementByTagName(kbaseConf, EVALUATORS);
+
+ e = DomUtils.getChildElementByTagName( kbaseConf,
+ EVALUATORS );
if ( e != null ) {
- List<Element> children = DomUtils.getChildElementsByTagName( e, EVALUATOR );
+ List<Element> children = DomUtils.getChildElementsByTagName( e,
+ EVALUATOR );
if ( children != null && !children.isEmpty() ) {
ManagedMap evaluators = new ManagedMap();
for ( Element child : children ) {
- evaluators.put( child.getAttribute( "name" ),
+ evaluators.put( child.getAttribute( "name" ),
new RuntimeBeanReference( child.getAttribute( "ref" ) ) );
}
- factory.addPropertyValue( "evaluators", evaluators );
+ factory.addPropertyValue( "evaluators",
+ evaluators );
}
}
- e = DomUtils.getChildElementByTagName(kbaseConf, CONSEQUENCE_EXCEPTION_HANDLER);
- if ( e != null && !StringUtils.isEmpty( e.getAttribute( "handler" ) )) {
- rbaseConfBuilder.addPropertyValue( "consequenceExceptionHandler", e.getAttribute( "handler" ) );
+ e = DomUtils.getChildElementByTagName( kbaseConf,
+ CONSEQUENCE_EXCEPTION_HANDLER );
+ if ( e != null && !StringUtils.isEmpty( e.getAttribute( "handler" ) ) ) {
+ rbaseConfBuilder.addPropertyValue( "consequenceExceptionHandler",
+ e.getAttribute( "handler" ) );
}
-
- factory.addPropertyValue( "conf", rbaseConfBuilder.getBeanDefinition() );
+
+ factory.addPropertyValue( "conf",
+ rbaseConfBuilder.getBeanDefinition() );
}
String nodeRef = element.getAttribute( EXECUTION_NODE_ATTRIBUTE );
@@ -149,7 +170,7 @@
}
@SuppressWarnings("unchecked")
- public static ManagedList getResources(Element element,
+ 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-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeSessionDefinitionParser.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -48,34 +48,33 @@
import org.w3c.dom.NodeList;
public class KnowledgeSessionDefinitionParser extends AbstractBeanDefinitionParser {
-
+
private static final String KBASE_ATTRIBUTE = "kbase";
private static final String EMF_ATTRIBUTE = "entity-manager-factory";
private static final String TX_MANAGER_ATTRIBUTE = "transaction-manager";
private static final String FORCLASS_ATTRIBUTE = "for-class";
- private static final String IMPLEMENTATION_ATTRIBUTE = "implementation";
+ private static final String IMPLEMENTATION_ATTRIBUTE = "implementation";
private static final String NAME_ATTRIBUTE = "name";
- private static final String GRID_NODE_ATTRIBUTE = "node";
+ private static final String GRID_NODE_ATTRIBUTE = "node";
private static final String TYPE_ATTRIBUTE = "type";
private static final String KEEP_REFERENCE = "keep-reference";
private static final String CLOCK_TYPE = "clock-type";
-
+
private static final String WORK_ITEMS = "work-item-handlers";
-
- private static final String WORK_ITEM = "work-item-handler";
-
+
+ private static final String WORK_ITEM = "work-item-handler";
+
@SuppressWarnings("unchecked")
- protected AbstractBeanDefinition parseInternal(Element element,
+ protected AbstractBeanDefinition parseInternal(Element element,
ParserContext parserContext) {
-
+
String id = element.getAttribute( "id" );
emptyAttributeCheck( element.getLocalName(),
- "id",
- id);
-
-
+ "id",
+ id );
+
String kbase = element.getAttribute( KBASE_ATTRIBUTE );
emptyAttributeCheck( element.getLocalName(),
KBASE_ATTRIBUTE,
@@ -102,137 +101,164 @@
}
String name = element.getAttribute( NAME_ATTRIBUTE );
- if ( StringUtils.hasText(name) ) {
+ if ( StringUtils.hasText( name ) ) {
factory.addPropertyValue( "name",
name );
} else {
factory.addPropertyValue( "name",
- id );
+ id );
}
-
- Element ksessionConf = DomUtils.getChildElementByTagName(element, "configuration");
+
+ Element ksessionConf = DomUtils.getChildElementByTagName( element,
+ "configuration" );
if ( ksessionConf != null ) {
- Element persistenceElm = DomUtils.getChildElementByTagName(ksessionConf, "jpa-persistence");
- if ( persistenceElm != null) {
+ Element persistenceElm = DomUtils.getChildElementByTagName( ksessionConf,
+ "jpa-persistence" );
+ if ( persistenceElm != null ) {
BeanDefinitionBuilder beanBuilder = BeanDefinitionBuilder.genericBeanDefinition( JpaConfiguration.class );
-
+
String loadId = persistenceElm.getAttribute( "load" );
if ( StringUtils.hasText( loadId ) ) {
- beanBuilder.addPropertyValue( "id", Long.parseLong( loadId ) );
+ beanBuilder.addPropertyValue( "id",
+ Long.parseLong( loadId ) );
}
-
- Element tnxMng = DomUtils.getChildElementByTagName(persistenceElm, TX_MANAGER_ATTRIBUTE);
+
+ Element tnxMng = DomUtils.getChildElementByTagName( persistenceElm,
+ TX_MANAGER_ATTRIBUTE );
String ref = tnxMng.getAttribute( "ref" );
-
- beanBuilder.addPropertyReference( "platformTransactionManager", ref );
-
- Element emf = DomUtils.getChildElementByTagName(persistenceElm, EMF_ATTRIBUTE);
+
+ beanBuilder.addPropertyReference( "platformTransactionManager",
+ ref );
+
+ Element emf = DomUtils.getChildElementByTagName( persistenceElm,
+ EMF_ATTRIBUTE );
ref = emf.getAttribute( "ref" );
- beanBuilder.addPropertyReference( "entityManagerFactory", ref );
-
- Element variablePersisters = DomUtils.getChildElementByTagName(persistenceElm, "variable-persisters");
+ beanBuilder.addPropertyReference( "entityManagerFactory",
+ ref );
+
+ Element variablePersisters = DomUtils.getChildElementByTagName( persistenceElm,
+ "variable-persisters" );
if ( variablePersisters != null && variablePersisters.hasChildNodes() ) {
- List<Element> childPersisterElems = DomUtils.getChildElementsByTagName(variablePersisters, "persister");
+ List<Element> childPersisterElems = DomUtils.getChildElementsByTagName( variablePersisters,
+ "persister" );
ManagedMap persistors = new ManagedMap( childPersisterElems.size() );
- for ( Element persisterElem : childPersisterElems) {
+ for ( Element persisterElem : childPersisterElems ) {
String forClass = persisterElem.getAttribute( FORCLASS_ATTRIBUTE );
String implementation = persisterElem.getAttribute( IMPLEMENTATION_ATTRIBUTE );
- if ( !StringUtils.hasText( forClass ) ) {
+ if ( !StringUtils.hasText( forClass ) ) {
throw new RuntimeException( "persister element must have valid for-class attribute" );
}
- if ( !StringUtils.hasText( implementation ) ) {
+ if ( !StringUtils.hasText( implementation ) ) {
throw new RuntimeException( "persister element must have valid implementation attribute" );
- }
+ }
persistors.put( forClass,
- implementation );
+ implementation );
}
- beanBuilder.addPropertyValue( "variablePersisters", persistors );
+ beanBuilder.addPropertyValue( "variablePersisters",
+ persistors );
}
-
- factory.addPropertyValue( "jpaConfiguration", beanBuilder.getBeanDefinition() );
+
+ factory.addPropertyValue( "jpaConfiguration",
+ beanBuilder.getBeanDefinition() );
}
BeanDefinitionBuilder rbaseConfBuilder = BeanDefinitionBuilder.rootBeanDefinition( SessionConfiguration.class );
- Element e = DomUtils.getChildElementByTagName(ksessionConf, KEEP_REFERENCE);
- if ( e != null && StringUtils.hasText( e.getAttribute( "enabled" ) )) {
- rbaseConfBuilder.addPropertyValue( "keepReference", Boolean.parseBoolean( e.getAttribute( "enabled" ) ) );
- }
-
- e = DomUtils.getChildElementByTagName(ksessionConf, CLOCK_TYPE);
- if ( e != null && StringUtils.hasText( e.getAttribute( "type" ) )) {
- rbaseConfBuilder.addPropertyValue( "clockType", ClockType.resolveClockType( e.getAttribute( "type" ) ) );
- }
- factory.addPropertyValue( "conf", rbaseConfBuilder.getBeanDefinition() );
-
- e = DomUtils.getChildElementByTagName(ksessionConf, WORK_ITEMS);
+ Element e = DomUtils.getChildElementByTagName( ksessionConf,
+ KEEP_REFERENCE );
+ if ( e != null && StringUtils.hasText( e.getAttribute( "enabled" ) ) ) {
+ rbaseConfBuilder.addPropertyValue( "keepReference",
+ Boolean.parseBoolean( e.getAttribute( "enabled" ) ) );
+ }
+
+ e = DomUtils.getChildElementByTagName( ksessionConf,
+ CLOCK_TYPE );
+ if ( e != null && StringUtils.hasText( e.getAttribute( "type" ) ) ) {
+ rbaseConfBuilder.addPropertyValue( "clockType",
+ ClockType.resolveClockType( e.getAttribute( "type" ) ) );
+ }
+ factory.addPropertyValue( "conf",
+ rbaseConfBuilder.getBeanDefinition() );
+
+ e = DomUtils.getChildElementByTagName( ksessionConf,
+ WORK_ITEMS );
if ( e != null ) {
- List<Element> children = DomUtils.getChildElementsByTagName( e, WORK_ITEM );
+ List<Element> children = DomUtils.getChildElementsByTagName( e,
+ WORK_ITEM );
if ( children != null && !children.isEmpty() ) {
ManagedMap workDefs = new ManagedMap();
for ( Element child : children ) {
- workDefs.put( child.getAttribute( "name" ),
+ workDefs.put( child.getAttribute( "name" ),
new RuntimeBeanReference( child.getAttribute( "ref" ) ) );
}
- factory.addPropertyValue( "workItems", workDefs );
+ factory.addPropertyValue( "workItems",
+ workDefs );
}
- }
+ }
}
-
- Element batch = DomUtils.getChildElementByTagName(element, "batch");
+
+ Element batch = DomUtils.getChildElementByTagName( element,
+ "batch" );
if ( batch == null ) {
// just temporary legacy suppport
- batch = DomUtils.getChildElementByTagName(element, "script");
+ batch = DomUtils.getChildElementByTagName( element,
+ "script" );
}
- if ( batch != null) {
+ if ( batch != null ) {
// we know there can only ever be one
ManagedList children = new ManagedList();
- for (int i = 0, length = batch.getChildNodes().getLength(); i < length; i++) {
+ for ( int i = 0, length = batch.getChildNodes().getLength(); i < length; i++ ) {
Node n = batch.getChildNodes().item( i );
if ( n instanceof Element ) {
- Element e = ( Element ) n;
-
+ Element e = (Element) n;
+
BeanDefinitionBuilder beanBuilder = null;
if ( "insert-object".equals( e.getLocalName() ) ) {
String ref = e.getAttribute( "ref" );
- Element nestedElm = getFirstElement( e.getChildNodes() );
- beanBuilder = BeanDefinitionBuilder.genericBeanDefinition( InsertObjectCommand.class );
+ Element nestedElm = getFirstElement( e.getChildNodes() );
+ beanBuilder = BeanDefinitionBuilder.genericBeanDefinition( InsertObjectCommand.class );
if ( StringUtils.hasText( ref ) ) {
beanBuilder.addConstructorArgReference( ref );
- } else if ( nestedElm != null ) {
- beanBuilder.addConstructorArgValue( parserContext.getDelegate().parsePropertySubElement(nestedElm, null, null) );
+ } else if ( nestedElm != null ) {
+ beanBuilder.addConstructorArgValue( parserContext.getDelegate().parsePropertySubElement( nestedElm,
+ null,
+ null ) );
} else {
throw new IllegalArgumentException( "insert-object must either specify a 'ref' attribute or have a nested bean" );
}
} else if ( "set-global".equals( e.getLocalName() ) ) {
String ref = e.getAttribute( "ref" );
- Element nestedElm = getFirstElement( e.getChildNodes() );
+ Element nestedElm = getFirstElement( e.getChildNodes() );
beanBuilder = BeanDefinitionBuilder.genericBeanDefinition( SetGlobalCommand.class );
beanBuilder.addConstructorArgValue( e.getAttribute( "identifier" ) );
if ( StringUtils.hasText( ref ) ) {
beanBuilder.addConstructorArgReference( ref );
- } else if ( nestedElm != null ) {
- beanBuilder.addConstructorArgValue( parserContext.getDelegate().parsePropertySubElement(nestedElm, null, null) );
+ } else if ( nestedElm != null ) {
+ beanBuilder.addConstructorArgValue( parserContext.getDelegate().parsePropertySubElement( nestedElm,
+ null,
+ null ) );
} else {
throw new IllegalArgumentException( "set-global must either specify a 'ref' attribute or have a nested bean" );
}
- } else if ( "fire-until-halt".equals( e.getLocalName() ) ) {
+ } else if ( "fire-until-halt".equals( e.getLocalName() ) ) {
beanBuilder = BeanDefinitionBuilder.genericBeanDefinition( FireUntilHaltCommand.class );
- } else if ( "fire-all-rules".equals( e.getLocalName() ) ) {
+ } else if ( "fire-all-rules".equals( e.getLocalName() ) ) {
beanBuilder = BeanDefinitionBuilder.genericBeanDefinition( FireAllRulesCommand.class );
String max = e.getAttribute( "max" );
if ( StringUtils.hasText( max ) ) {
- beanBuilder.addPropertyValue( "max", max );
+ beanBuilder.addPropertyValue( "max",
+ max );
}
- } else if ( "start-process".equals( e.getLocalName() ) ) {
-
+ } else if ( "start-process".equals( e.getLocalName() ) ) {
+
beanBuilder = BeanDefinitionBuilder.genericBeanDefinition( StartProcessCommand.class );
String processId = e.getAttribute( "process-id" );
if ( !StringUtils.hasText( processId ) ) {
throw new IllegalArgumentException( "start-process must specify a process-id" );
}
beanBuilder.addConstructorArgValue( processId );
-
- List<Element> params = DomUtils.getChildElementsByTagName( e, "parameter" );
+
+ List<Element> params = DomUtils.getChildElementsByTagName( e,
+ "parameter" );
if ( !params.isEmpty() ) {
ManagedMap map = new ManagedMap();
for ( Element param : params ) {
@@ -240,68 +266,77 @@
if ( !StringUtils.hasText( identifier ) ) {
throw new IllegalArgumentException( "start-process paramaters must specify an identifier" );
}
-
+
String ref = param.getAttribute( "ref" );
- Element nestedElm = getFirstElement( param.getChildNodes() );
+ Element nestedElm = getFirstElement( param.getChildNodes() );
if ( StringUtils.hasText( ref ) ) {
- map.put( identifier, new RuntimeBeanReference( ref) );
- } else if ( nestedElm != null ) {
- map.put( identifier, parserContext.getDelegate().parsePropertySubElement(nestedElm, null, null) );
+ map.put( identifier,
+ new RuntimeBeanReference( ref ) );
+ } else if ( nestedElm != null ) {
+ map.put( identifier,
+ parserContext.getDelegate().parsePropertySubElement( nestedElm,
+ null,
+ null ) );
} else {
throw new IllegalArgumentException( "start-process paramaters must either specify a 'ref' attribute or have a nested bean" );
- }
- }
- beanBuilder.addPropertyValue( "parameters", map );
+ }
+ }
+ beanBuilder.addPropertyValue( "parameters",
+ map );
}
} else if ( "signal-event".equals( e.getLocalName() ) ) {
beanBuilder = BeanDefinitionBuilder.genericBeanDefinition( SignalEventCommand.class );
String processInstanceId = e.getAttribute( "process-instance-id" );
if ( StringUtils.hasText( processInstanceId ) ) {
- beanBuilder.addConstructorArgValue( processInstanceId );
+ beanBuilder.addConstructorArgValue( processInstanceId );
}
-
+
beanBuilder.addConstructorArgValue( e.getAttribute( "event-type" ) );
-
+
String ref = e.getAttribute( "ref" );
- Element nestedElm = getFirstElement( e.getChildNodes() );
+ Element nestedElm = getFirstElement( e.getChildNodes() );
if ( StringUtils.hasText( ref ) ) {
beanBuilder.addConstructorArgReference( ref );
- } else if ( nestedElm != null ) {
- beanBuilder.addConstructorArgValue( parserContext.getDelegate().parsePropertySubElement(nestedElm, null, null) );
+ } else if ( nestedElm != null ) {
+ beanBuilder.addConstructorArgValue( parserContext.getDelegate().parsePropertySubElement( nestedElm,
+ null,
+ null ) );
} 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());
+ if ( beanBuilder == null ) {
+ throw new IllegalStateException( "Unknow element: " + e.getLocalName() );
}
children.add( beanBuilder.getBeanDefinition() );
}
}
- factory.addPropertyValue( "batch", children );
- }
-
+ factory.addPropertyValue( "batch",
+ children );
+ }
+
// find any kagent's for the current kbase and assign
for ( String beanName : parserContext.getRegistry().getBeanDefinitionNames() ) {
- BeanDefinition def = parserContext.getRegistry().getBeanDefinition(beanName);
- if ( def.getBeanClassName().equals( KnowledgeAgentBeanFactory.class.getName() ) ) {
- PropertyValue pvalue = def.getPropertyValues().getPropertyValue( "kbase" );
- RuntimeBeanReference tbf = ( RuntimeBeanReference ) pvalue.getValue();
- if ( kbase.equals( tbf.getBeanName() ) ) {
- factory.addPropertyValue( "knowledgeAgent", new RuntimeBeanReference( beanName ) );
- }
- }
- }
+ BeanDefinition def = parserContext.getRegistry().getBeanDefinition( beanName );
+ if ( def.getBeanClassName().equals( KnowledgeAgentBeanFactory.class.getName() ) ) {
+ PropertyValue pvalue = def.getPropertyValues().getPropertyValue( "kbase" );
+ RuntimeBeanReference tbf = (RuntimeBeanReference) pvalue.getValue();
+ if ( kbase.equals( tbf.getBeanName() ) ) {
+ factory.addPropertyValue( "knowledgeAgent",
+ new RuntimeBeanReference( beanName ) );
+ }
+ }
+ }
return factory.getBeanDefinition();
}
-
- private Element getFirstElement(NodeList list) {
- for (int j = 0, lengthj = list.getLength(); j < lengthj; j++) {
+
+ private Element getFirstElement(NodeList list) {
+ for ( int j = 0, lengthj = list.getLength(); j < lengthj; j++ ) {
if ( list.item( j ) instanceof Element ) {
- return ( Element ) list.item( j );
+ return (Element) list.item( j );
}
- }
+ }
return null;
}
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-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/KnowledgeStoreDefinitionParser.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -27,7 +27,7 @@
@Override
protected AbstractBeanDefinition parseInternal(Element element,
- ParserContext parserContext) {
+ ParserContext parserContext) {
BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition( KnowledgeStoreBeanFactory.class );
return factory.getBeanDefinition();
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-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceChangeScannerDefinitionParser.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -38,7 +38,7 @@
BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition( ResourceChangeScannerBeanFactory.class );
factory.addPropertyValue( INTERVAL,
- element.getAttribute( INTERVAL ) );
+ element.getAttribute( INTERVAL ) );
return factory.getBeanDefinition();
}
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-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/ResourceDefinitionParser.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -32,28 +32,27 @@
public class ResourceDefinitionParser extends AbstractBeanDefinitionParser {
- private static final String WORKSHEET_NAME_ATTRIBUTE = "worksheet-name";
- private static final String INPUT_TYPE_ATTRIBUTE = "input-type";
- private static final String TYPE_ATTRIBUTE = "type";
- private static final String SOURCE_ATTRIBUTE = "source";
+ private static final String WORKSHEET_NAME_ATTRIBUTE = "worksheet-name";
+ private static final String INPUT_TYPE_ATTRIBUTE = "input-type";
+ private static final String TYPE_ATTRIBUTE = "type";
+ private static final String SOURCE_ATTRIBUTE = "source";
private static final String BASIC_AUTHENTICATION_ATTRIBUTE = "basic-authentication";
- private static final String USERNAME_ATTRIBUTE = "username";
- private static final String PASSWORD_ATTRIBUTE = "password";
- private static final String REF = "ref";
+ private static final String USERNAME_ATTRIBUTE = "username";
+ private static final String PASSWORD_ATTRIBUTE = "password";
+ private static final String REF = "ref";
-
@SuppressWarnings("unchecked")
@Override
protected AbstractBeanDefinition parseInternal(Element element,
ParserContext parserContext) {
BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition( DroolsResourceAdapter.class );
-
- if ( StringUtils.hasText( element.getAttribute( REF ) )) {
- String ref = element.getAttribute( REF);
+
+ if ( StringUtils.hasText( element.getAttribute( REF ) ) ) {
+ String ref = element.getAttribute( REF );
emptyAttributeCheck( element.getLocalName(),
REF,
ref );
- return (AbstractBeanDefinition) parserContext.getRegistry().getBeanDefinition( ref );
+ return (AbstractBeanDefinition) parserContext.getRegistry().getBeanDefinition( ref );
}
String source = element.getAttribute( SOURCE_ATTRIBUTE );
@@ -70,19 +69,24 @@
factory.addPropertyValue( "resourceType",
resourceType );
- boolean basicAuthenticationEnabled = element.getAttribute( BASIC_AUTHENTICATION_ATTRIBUTE ) != null && element.getAttribute( BASIC_AUTHENTICATION_ATTRIBUTE ).equalsIgnoreCase("enabled");
- factory.addPropertyValue("basicAuthenticationEnabled", basicAuthenticationEnabled);
+ boolean basicAuthenticationEnabled = element.getAttribute( BASIC_AUTHENTICATION_ATTRIBUTE ) != null && element.getAttribute( BASIC_AUTHENTICATION_ATTRIBUTE ).equalsIgnoreCase( "enabled" );
+ factory.addPropertyValue( "basicAuthenticationEnabled",
+ basicAuthenticationEnabled );
- if (basicAuthenticationEnabled){
+ if ( basicAuthenticationEnabled ) {
String username = element.getAttribute( USERNAME_ATTRIBUTE );
- factory.addPropertyValue("basicAuthenticationUsername", username);
+ factory.addPropertyValue( "basicAuthenticationUsername",
+ username );
String password = element.getAttribute( PASSWORD_ATTRIBUTE );
- factory.addPropertyValue("basicAuthenticationPassword", password);
+ factory.addPropertyValue( "basicAuthenticationPassword",
+ password );
}
if ( "xsd".equals( resourceType.toLowerCase() ) ) {
- XsdParser.parse( element, parserContext, factory );
+ XsdParser.parse( element,
+ parserContext,
+ factory );
} else if ( "dtable".equals( resourceType.toLowerCase() ) ) {
List<Element> childElements = DomUtils.getChildElementsByTagName( element,
"decisiontable-conf" );
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsHandler.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/SpringDroolsHandler.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -26,19 +26,19 @@
new ResourceDefinitionParser() );
registerBeanDefinitionParser( "resource-change-scanner",
- new ResourceChangeScannerDefinitionParser() );
+ new ResourceChangeScannerDefinitionParser() );
registerBeanDefinitionParser( "model",
new ResourceDefinitionParser() );
registerBeanDefinitionParser( "kbase",
new KnowledgeBaseDefinitionParser() );
-
+
registerBeanDefinitionParser( "kagent",
- new KnowledgeAgentDefinitionParser() );
-
+ new KnowledgeAgentDefinitionParser() );
+
registerBeanDefinitionParser( "kstore",
- new KnowledgeStoreDefinitionParser() );
+ new KnowledgeStoreDefinitionParser() );
registerBeanDefinitionParser( "ksession",
new KnowledgeSessionDefinitionParser() );
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-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/java/org/drools/container/spring/namespace/XsdParser.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -29,28 +29,27 @@
import com.sun.tools.xjc.Options;
public class XsdParser {
- private static final String SYSTEM_ID = "system-id";
- private static final String SCHEMA_LANGUAGE = "schema-language";
-
+ private static final String SYSTEM_ID = "system-id";
+ private static final String SCHEMA_LANGUAGE = "schema-language";
+
@SuppressWarnings("unchecked")
- public static void parse(Element element,
+ public static void parse(Element element,
ParserContext parserContext,
BeanDefinitionBuilder factory) {
-
+
List<Element> childElements = DomUtils.getChildElementsByTagName( element,
"jaxb-conf" );
if ( !childElements.isEmpty() ) {
Element conf = childElements.get( 0 );
-
+
String systemId = conf.getAttribute( SYSTEM_ID );
- systemId = ( systemId != null && systemId.trim().length() > 0) ? systemId : "xsd";
-
+ systemId = (systemId != null && systemId.trim().length() > 0) ? systemId : "xsd";
+
String schemaLanguage = conf.getAttribute( SCHEMA_LANGUAGE );
- schemaLanguage = ( schemaLanguage != null && schemaLanguage.trim().length() > 0) ? schemaLanguage : "XMLSCHEMA";
-
+ schemaLanguage = (schemaLanguage != null && schemaLanguage.trim().length() > 0) ? schemaLanguage : "XMLSCHEMA";
+
Options options = new Options();
options.setSchemaLanguage( Language.valueOf( schemaLanguage ) );
-
JaxbConfiguration jaxbConf = KnowledgeBuilderFactory.newJaxbConfiguration( new Options(),
systemId );
@@ -62,7 +61,7 @@
"xsd" );
factory.addPropertyValue( "resourceConfiguration",
- jaxbConf );
- }
+ jaxbConf );
+ }
}
}
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:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockAccumulateFunction.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -23,12 +23,14 @@
import org.drools.base.accumulators.AccumulateFunction;
-public class MockAccumulateFunction implements AccumulateFunction {
+public class MockAccumulateFunction
+ implements
+ AccumulateFunction {
public void accumulate(Serializable context,
Object value) {
// TODO Auto-generated method stub
-
+
}
public Serializable createContext() {
@@ -43,13 +45,13 @@
public void init(Serializable context) throws Exception {
// TODO Auto-generated method stub
-
+
}
public void reverse(Serializable context,
Object value) throws Exception {
// TODO Auto-generated method stub
-
+
}
public boolean supportsReverse() {
@@ -60,12 +62,12 @@
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
// TODO Auto-generated method stub
-
+
}
public void writeExternal(ObjectOutput out) throws IOException {
// TODO Auto-generated method stub
-
+
}
}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockConsequenceExceptionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockConsequenceExceptionHandler.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockConsequenceExceptionHandler.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -11,9 +11,12 @@
public class MockConsequenceExceptionHandler extends DefaultConsequenceExceptionHandler {
@Override
- public void handleException(Activation activation, WorkingMemory workingMemory, Exception exception) {
- super.handleException(activation, workingMemory, exception);
+ public void handleException(Activation activation,
+ WorkingMemory workingMemory,
+ Exception exception) {
+ super.handleException( activation,
+ workingMemory,
+ exception );
}
-
}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockEvaluatorDefinition.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/MockEvaluatorDefinition.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -25,7 +25,9 @@
import org.drools.base.evaluators.Operator;
import org.drools.spi.Evaluator;
-public class MockEvaluatorDefinition implements EvaluatorDefinition {
+public class MockEvaluatorDefinition
+ implements
+ EvaluatorDefinition {
public Evaluator getEvaluator(ValueType type,
String operatorId,
@@ -55,7 +57,7 @@
}
public String[] getEvaluatorIds() {
- return new String[] { "id1", "id2" };
+ return new String[]{"id1", "id2"};
}
public Target getTarget() {
@@ -72,7 +74,7 @@
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
-
+
}
public void writeExternal(ObjectOutput out) throws IOException {
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:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsGridTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -54,19 +54,18 @@
wp.create( "s1" );
wp.create( "s2" );
- wp.create( "s3" );
+ wp.create( "s3" );
}
-
public void testGrid() throws Exception {
- ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/drools/container/spring/grid.xml" );
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/drools/container/spring/grid.xml" );
Grid grid1 = (Grid) context.getBean( "grid1" );
assertTrue( grid1.get( WhitePages.class ) instanceof JpaWhitePages );
Grid grid2 = (Grid) context.getBean( "grid2" );
assertTrue( grid2.get( WhitePages.class ) instanceof WhitePagesClient );
-
+
Grid grid3 = (Grid) context.getBean( "grid3" );
assertTrue( grid3.get( WhitePages.class ) instanceof WhitePagesImpl );
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/SpringDroolsTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -46,23 +46,22 @@
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringDroolsTest extends TestCase {
-
-
+
protected void setUp() throws Exception {
}
-
+
@Override
protected void tearDown() throws Exception {
}
-
+
public void testNoConnection() throws Exception {
- ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/drools/container/spring/beans.xml" );
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/drools/container/spring/beans.xml" );
- GridNode node1 = (GridNode) context.getBean( "node1" );
- assertNotNull( node1 );
-
- GridNode node2 = (GridNode) context.getBean( "node2" );
- assertNotNull( node2 );
+ GridNode node1 = (GridNode) context.getBean( "node1" );
+ assertNotNull( node1 );
+
+ GridNode node2 = (GridNode) context.getBean( "node2" );
+ assertNotNull( node2 );
}
public void testNoNodeKSessions() throws Exception {
@@ -114,48 +113,59 @@
assertEquals( 2,
list.size() );
}
-
- public void testAgents() throws Exception {
+
+ public void testAgents() throws Exception {
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/drools/container/spring/kagents-beans.xml" );
-
- ResourceChangeScannerImpl scanner = ( ResourceChangeScannerImpl ) ResourceFactory.getResourceChangeScannerService();
- assertEquals( 5, scanner.getInterval() );
-
- KnowledgeBaseImpl kbase1 = ( KnowledgeBaseImpl ) context.getBean( "kbase1" );
- KnowledgeBaseImpl kbase2 = ( KnowledgeBaseImpl ) context.getBean( "kbase2" );
-
- KnowledgeAgentImpl kagent1 = ( KnowledgeAgentImpl ) context.getBean( "kagent1" );
- assertSame( kagent1.getKnowledgeBase(), kbase1 );
- assertEquals( 0, kagent1.getResourceDirectories().size() );
+
+ ResourceChangeScannerImpl scanner = (ResourceChangeScannerImpl) ResourceFactory.getResourceChangeScannerService();
+ assertEquals( 5,
+ scanner.getInterval() );
+
+ KnowledgeBaseImpl kbase1 = (KnowledgeBaseImpl) context.getBean( "kbase1" );
+ KnowledgeBaseImpl kbase2 = (KnowledgeBaseImpl) context.getBean( "kbase2" );
+
+ KnowledgeAgentImpl kagent1 = (KnowledgeAgentImpl) context.getBean( "kagent1" );
+ assertSame( kagent1.getKnowledgeBase(),
+ kbase1 );
+ assertEquals( 0,
+ kagent1.getResourceDirectories().size() );
assertFalse( kagent1.isNewInstance() );
-
- KnowledgeAgentImpl kagent2 = ( KnowledgeAgentImpl ) context.getBean( "kagent2" );
- assertSame( kagent2.getKnowledgeBase(), kbase2 );
- assertEquals( 1, kagent2.getResourceDirectories().size() );
+
+ KnowledgeAgentImpl kagent2 = (KnowledgeAgentImpl) context.getBean( "kagent2" );
+ assertSame( kagent2.getKnowledgeBase(),
+ kbase2 );
+ assertEquals( 1,
+ kagent2.getResourceDirectories().size() );
assertFalse( kagent2.isNewInstance() );
-
- KnowledgeAgentImpl kagent3 = ( KnowledgeAgentImpl ) context.getBean( "kagent3" );
+
+ KnowledgeAgentImpl kagent3 = (KnowledgeAgentImpl) context.getBean( "kagent3" );
assertTrue( kagent3.isNewInstance() );
-
- StatelessKnowledgeSessionImpl ksession1 = (StatelessKnowledgeSessionImpl) context.getBean( "ksession1" );
- assertSame( kbase1.getRuleBase(), ksession1.getRuleBase() );
- assertSame( kagent1, ksession1.getKnowledgeAgent() );
-
- StatefulKnowledgeSessionImpl ksession2 = (StatefulKnowledgeSessionImpl) context.getBean( "ksession2" );
- assertSame( kbase1.getRuleBase(), ksession2.getRuleBase() );
-
- StatelessKnowledgeSessionImpl ksession3 = (StatelessKnowledgeSessionImpl) context.getBean( "ksession3" );
- assertSame( kagent2, ksession3.getKnowledgeAgent() );
- assertSame( kbase2.getRuleBase(), ksession3.getRuleBase() );
- }
+ StatelessKnowledgeSessionImpl ksession1 = (StatelessKnowledgeSessionImpl) context.getBean( "ksession1" );
+ assertSame( kbase1.getRuleBase(),
+ ksession1.getRuleBase() );
+ assertSame( kagent1,
+ ksession1.getKnowledgeAgent() );
+ StatefulKnowledgeSessionImpl ksession2 = (StatefulKnowledgeSessionImpl) context.getBean( "ksession2" );
+ assertSame( kbase1.getRuleBase(),
+ ksession2.getRuleBase() );
+
+ StatelessKnowledgeSessionImpl ksession3 = (StatelessKnowledgeSessionImpl) context.getBean( "ksession3" );
+ assertSame( kagent2,
+ ksession3.getKnowledgeAgent() );
+ assertSame( kbase2.getRuleBase(),
+ ksession3.getRuleBase() );
+
+ }
+
public void testNode() {
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/drools/container/spring/beans.xml" );
GridNode node = (GridNode) context.getBean( "node1" );
List<String> list = new ArrayList<String>();
- StatelessKnowledgeSession kstateless = node.get( "stateless1", StatelessKnowledgeSession.class );
+ StatelessKnowledgeSession kstateless = node.get( "stateless1",
+ StatelessKnowledgeSession.class );
assertNotNull( "can't obtain session named: stateless1",
kstateless );
kstateless.setGlobal( "list",
@@ -167,7 +177,8 @@
list.size() );
list = new ArrayList<String>();
- StatefulKnowledgeSession kstateful = node.get( "ksession2", StatefulKnowledgeSession.class );
+ StatefulKnowledgeSession kstateful = node.get( "ksession2",
+ StatefulKnowledgeSession.class );
kstateful.setGlobal( "list",
list );
kstateful.insert( new Person( "Darth",
@@ -180,73 +191,90 @@
public void testConfiguration() {
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/drools/container/spring/session-conf-beans.xml" );
- KnowledgeBaseImpl kbase1 = ( KnowledgeBaseImpl ) context.getBean( "kbase1" );
- RuleBaseConfiguration rconf = ((InternalRuleBase)kbase1.getRuleBase()).getConfiguration();
+ KnowledgeBaseImpl kbase1 = (KnowledgeBaseImpl) context.getBean( "kbase1" );
+ RuleBaseConfiguration rconf = ((InternalRuleBase) kbase1.getRuleBase()).getConfiguration();
assertTrue( rconf.isAdvancedProcessRuleIntegration() );
assertTrue( rconf.isMultithreadEvaluation() );
- assertEquals( 5, rconf.getMaxThreads() );
- assertEquals( EventProcessingOption.STREAM, rconf.getEventProcessingMode() );
- assertEquals( AssertBehaviour.IDENTITY, rconf.getAssertBehaviour() );
- assertEquals( "org.drools.container.spring.MockConsequenceExceptionHandler", rconf.getConsequenceExceptionHandler() );
+ assertEquals( 5,
+ rconf.getMaxThreads() );
+ assertEquals( EventProcessingOption.STREAM,
+ rconf.getEventProcessingMode() );
+ assertEquals( AssertBehaviour.IDENTITY,
+ rconf.getAssertBehaviour() );
+ assertEquals( "org.drools.container.spring.MockConsequenceExceptionHandler",
+ rconf.getConsequenceExceptionHandler() );
- KnowledgeBaseImpl kbase2 = ( KnowledgeBaseImpl ) context.getBean( "kbase2" );
- rconf = ((InternalRuleBase)kbase2.getRuleBase()).getConfiguration();
+ KnowledgeBaseImpl kbase2 = (KnowledgeBaseImpl) context.getBean( "kbase2" );
+ rconf = ((InternalRuleBase) kbase2.getRuleBase()).getConfiguration();
assertFalse( rconf.isAdvancedProcessRuleIntegration() );
assertFalse( rconf.isMultithreadEvaluation() );
- assertEquals( 3, rconf.getMaxThreads() );
- assertEquals( EventProcessingOption.CLOUD, rconf.getEventProcessingMode() );
- assertEquals( AssertBehaviour.EQUALITY, rconf.getAssertBehaviour() );
-
-
- StatefulKnowledgeSessionImpl ksession1 = ( StatefulKnowledgeSessionImpl ) context.getBean( "ksession1" );
+ assertEquals( 3,
+ rconf.getMaxThreads() );
+ assertEquals( EventProcessingOption.CLOUD,
+ rconf.getEventProcessingMode() );
+ assertEquals( AssertBehaviour.EQUALITY,
+ rconf.getAssertBehaviour() );
+
+ StatefulKnowledgeSessionImpl ksession1 = (StatefulKnowledgeSessionImpl) context.getBean( "ksession1" );
SessionConfiguration sconf = ksession1.session.getSessionConfiguration();
assertTrue( sconf.isKeepReference() );
- assertEquals( ClockType.REALTIME_CLOCK , sconf.getClockType() );
+ assertEquals( ClockType.REALTIME_CLOCK,
+ sconf.getClockType() );
Map<String, WorkItemHandler> wih = sconf.getWorkItemHandlers();
- assertEquals( 4, wih.size() );
- assertTrue( wih.containsKey( "wih1" ));
- assertTrue( wih.containsKey( "wih2" ));
- assertTrue( wih.containsKey( "Human Task" ));
- assertTrue( wih.containsKey( "MyWork" ));
- assertNotSame( wih.get( "wih1" ), wih.get( "wih2" ));
- assertEquals( HumanTaskHandler.class, wih.get( "wih1" ).getClass() );
- assertEquals( HumanTaskHandler.class, wih.get( "wih2" ).getClass() );
-
- StatefulKnowledgeSessionImpl ksession2 = ( StatefulKnowledgeSessionImpl ) context.getBean( "ksession2" );
+ assertEquals( 4,
+ wih.size() );
+ assertTrue( wih.containsKey( "wih1" ) );
+ assertTrue( wih.containsKey( "wih2" ) );
+ assertTrue( wih.containsKey( "Human Task" ) );
+ assertTrue( wih.containsKey( "MyWork" ) );
+ assertNotSame( wih.get( "wih1" ),
+ wih.get( "wih2" ) );
+ assertEquals( HumanTaskHandler.class,
+ wih.get( "wih1" ).getClass() );
+ assertEquals( HumanTaskHandler.class,
+ wih.get( "wih2" ).getClass() );
+
+ StatefulKnowledgeSessionImpl ksession2 = (StatefulKnowledgeSessionImpl) context.getBean( "ksession2" );
sconf = ksession2.session.getSessionConfiguration();
assertFalse( sconf.isKeepReference() );
- assertEquals( ClockType.PSEUDO_CLOCK, sconf.getClockType() );
+ assertEquals( ClockType.PSEUDO_CLOCK,
+ sconf.getClockType() );
-
}
public void testResourceAuthenication() throws Exception {
- ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/drools/container/spring/beans.xml" );
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "org/drools/container/spring/beans.xml" );
- //Secure Resource
- DroolsResourceAdapter resourceAdapter = (DroolsResourceAdapter) context.getBean( "secureResource" );
- assertNotNull( resourceAdapter );
+ //Secure Resource
+ DroolsResourceAdapter resourceAdapter = (DroolsResourceAdapter) context.getBean( "secureResource" );
+ assertNotNull( resourceAdapter );
- Resource resource = resourceAdapter.getDroolsResource();
- assertTrue(resource instanceof UrlResource);
+ Resource resource = resourceAdapter.getDroolsResource();
+ assertTrue( resource instanceof UrlResource );
- UrlResource ur = (UrlResource)resource;
+ UrlResource ur = (UrlResource) resource;
- assertEquals("enabled",ur.getBasicAuthentication());
- assertEquals("someUser",ur.getUsername());
- assertEquals("somePassword",ur.getPassword());
+ assertEquals( "enabled",
+ ur.getBasicAuthentication() );
+ assertEquals( "someUser",
+ ur.getUsername() );
+ assertEquals( "somePassword",
+ ur.getPassword() );
- //Insecure Resource
- resourceAdapter = (DroolsResourceAdapter) context.getBean( "insecureResource" );
- assertNotNull( resourceAdapter );
+ //Insecure Resource
+ resourceAdapter = (DroolsResourceAdapter) context.getBean( "insecureResource" );
+ assertNotNull( resourceAdapter );
- resource = resourceAdapter.getDroolsResource();
- assertTrue(resource instanceof UrlResource);
+ resource = resourceAdapter.getDroolsResource();
+ assertTrue( resource instanceof UrlResource );
- ur = (UrlResource)resource;
+ ur = (UrlResource) resource;
- assertEquals("disabled",ur.getBasicAuthentication());
- assertEquals("",ur.getUsername());
- assertEquals("",ur.getPassword());
+ assertEquals( "disabled",
+ ur.getBasicAuthentication() );
+ assertEquals( "",
+ ur.getUsername() );
+ assertEquals( "",
+ ur.getPassword() );
}
}
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:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -116,8 +116,8 @@
writePackage( getProcessTimer2(),
new File( TMPDIR + "/processTimer2.pkg" ) );
} catch ( Exception e ) {
- log.error( "can't create packages!",
- e );
+ log.error( "can't create packages!",
+ e );
throw new RuntimeException( e );
}
}
@@ -157,7 +157,7 @@
int sessionId = service.getId();
log.info( "---> created SingleSessionCommandService id: " + sessionId );
-
+
ProcessInstance processInstance = service.startProcess( "org.drools.test.TestProcess" );
log.info( "Started process instance {}",
processInstance.getId() );
@@ -166,50 +166,76 @@
WorkItem workItem = handler.getWorkItem();
assertNotNull( workItem );
service.dispose();
-
+
Environment env = KnowledgeBaseFactory.newEnvironment();
- env.set( EnvironmentName.ENTITY_MANAGER_FACTORY, ctx.getBean( "myEmf" ));
- env.set( EnvironmentName.TRANSACTION_MANAGER, ctx.getBean( "txManager" ));
+ env.set( EnvironmentName.ENTITY_MANAGER_FACTORY,
+ ctx.getBean( "myEmf" ) );
+ env.set( EnvironmentName.TRANSACTION_MANAGER,
+ ctx.getBean( "txManager" ) );
- KnowledgeStoreService kstore = ( KnowledgeStoreService ) ctx.getBean( "kstore1" );
- KnowledgeBase kbase1 = ( KnowledgeBase ) ctx.getBean( "kbProcessWorkItems" );
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
- processInstance = service.getProcessInstance( processInstance.getId() );
+ KnowledgeStoreService kstore = (KnowledgeStoreService) ctx.getBean( "kstore1" );
+ KnowledgeBase kbase1 = (KnowledgeBase) ctx.getBean( "kbProcessWorkItems" );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+ processInstance = service.getProcessInstance( processInstance.getId() );
assertNotNull( processInstance );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
- service.getWorkItemManager().completeWorkItem( workItem.getId(), null );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+ service.getWorkItemManager().completeWorkItem( workItem.getId(),
+ null );
workItem = handler.getWorkItem();
assertNotNull( workItem );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
- processInstance = service.getProcessInstance( processInstance.getId() );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+ processInstance = service.getProcessInstance( processInstance.getId() );
assertNotNull( processInstance );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
- service.getWorkItemManager().completeWorkItem( workItem.getId(), null );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+ service.getWorkItemManager().completeWorkItem( workItem.getId(),
+ null );
workItem = handler.getWorkItem();
assertNotNull( workItem );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
- processInstance = service.getProcessInstance( processInstance.getId() );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+ processInstance = service.getProcessInstance( processInstance.getId() );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
- service.getWorkItemManager().completeWorkItem( workItem.getId(), null );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+ service.getWorkItemManager().completeWorkItem( workItem.getId(),
+ null );
workItem = handler.getWorkItem();
assertNull( workItem );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
- processInstance = service.getProcessInstance( processInstance.getId() );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+ processInstance = service.getProcessInstance( processInstance.getId() );
service.dispose();
}
@@ -227,57 +253,82 @@
WorkItem workItem = handler.getWorkItem();
assertNotNull( workItem );
service.dispose();
-
+
Environment env = KnowledgeBaseFactory.newEnvironment();
- env.set( EnvironmentName.ENTITY_MANAGER_FACTORY, ctx.getBean( "myEmf" ));
- env.set( EnvironmentName.TRANSACTION_MANAGER, ctx.getBean( "txManager" ));
+ env.set( EnvironmentName.ENTITY_MANAGER_FACTORY,
+ ctx.getBean( "myEmf" ) );
+ env.set( EnvironmentName.TRANSACTION_MANAGER,
+ ctx.getBean( "txManager" ) );
- KnowledgeStoreService kstore = ( KnowledgeStoreService ) ctx.getBean( "kstore1" );
- KnowledgeBase kbase1 = ( KnowledgeBase ) ctx.getBean( "kbProcessWorkItems" );
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
+ KnowledgeStoreService kstore = (KnowledgeStoreService) ctx.getBean( "kstore1" );
+ KnowledgeBase kbase1 = (KnowledgeBase) ctx.getBean( "kbProcessWorkItems" );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
processInstance = service.getProcessInstance( processInstance.getId() );
assertNotNull( processInstance );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
- service.getWorkItemManager().completeWorkItem( workItem.getId(), null );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+ service.getWorkItemManager().completeWorkItem( workItem.getId(),
+ null );
workItem = handler.getWorkItem();
assertNotNull( workItem );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
- processInstance = service.getProcessInstance( processInstance.getId() );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+ processInstance = service.getProcessInstance( processInstance.getId() );
assertNotNull( processInstance );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
- service.getWorkItemManager().abortWorkItem( workItem.getId() );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+ service.getWorkItemManager().abortWorkItem( workItem.getId() );
workItem = handler.getWorkItem();
assertNotNull( workItem );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
- processInstance = service.getProcessInstance( processInstance.getId() );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+ processInstance = service.getProcessInstance( processInstance.getId() );
assertNotNull( processInstance );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
- service.getWorkItemManager().completeWorkItem( workItem.getId(), null );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+ service.getWorkItemManager().completeWorkItem( workItem.getId(),
+ null );
workItem = handler.getWorkItem();
assertNull( workItem );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
- processInstance = service.getProcessInstance( processInstance.getId() );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+ processInstance = service.getProcessInstance( processInstance.getId() );
assertNull( processInstance );
service.dispose();
}
@SuppressWarnings("unused")
- private static Package getProcessWorkItems() {
+ private static Package getProcessWorkItems() {
RuleFlowProcess process = new RuleFlowProcess();
process.setId( "org.drools.test.TestProcess" );
process.setName( "TestProcess" );
@@ -350,7 +401,7 @@
public static void writePackage(Package pkg,
File dest) {
- dest.deleteOnExit();
+ dest.deleteOnExit();
OutputStream out = null;
try {
out = new BufferedOutputStream( new FileOutputStream( dest ) );
@@ -386,13 +437,18 @@
service.dispose();
Environment env = KnowledgeBaseFactory.newEnvironment();
- env.set( EnvironmentName.ENTITY_MANAGER_FACTORY, ctx.getBean( "myEmf" ));
- env.set( EnvironmentName.TRANSACTION_MANAGER, ctx.getBean( "txManager" ));
+ env.set( EnvironmentName.ENTITY_MANAGER_FACTORY,
+ ctx.getBean( "myEmf" ) );
+ env.set( EnvironmentName.TRANSACTION_MANAGER,
+ ctx.getBean( "txManager" ) );
- KnowledgeStoreService kstore = ( KnowledgeStoreService ) ctx.getBean( "kstore1" );
- KnowledgeBase kbase1 = ( KnowledgeBase ) ctx.getBean( "kbProcessWorkItems" );
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
-
+ KnowledgeStoreService kstore = (KnowledgeStoreService) ctx.getBean( "kstore1" );
+ KnowledgeBase kbase1 = (KnowledgeBase) ctx.getBean( "kbProcessWorkItems" );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+
processInstance = (RuleFlowProcessInstance) service.getProcessInstance( processInstanceId );
assertNotNull( processInstance );
@@ -405,21 +461,28 @@
assertNotNull( subProcessInstance );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
- service.getWorkItemManager().completeWorkItem( workItem.getId() , null );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+ service.getWorkItemManager().completeWorkItem( workItem.getId(),
+ null );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
subProcessInstance = (RuleFlowProcessInstance) service.getProcessInstance( subProcessInstanceId );
assertNull( subProcessInstance );
-
- processInstance = (RuleFlowProcessInstance) service.getProcessInstance( processInstanceId );
+
+ processInstance = (RuleFlowProcessInstance) service.getProcessInstance( processInstanceId );
assertNull( processInstance );
service.dispose();
}
@SuppressWarnings("unused")
- private static Package getProcessSubProcess() {
+ private static Package getProcessSubProcess() {
RuleFlowProcess process = new RuleFlowProcess();
process.setId( "org.drools.test.ProcessSubProcess" );
process.setName( "ProcessSubProcess" );
@@ -516,7 +579,7 @@
int sessionId = service.getId();
log.info( "---> created SingleSessionCommandService id: " + sessionId );
- ProcessInstance processInstance = service.startProcess( "org.drools.test.ProcessTimer" );
+ ProcessInstance processInstance = service.startProcess( "org.drools.test.ProcessTimer" );
long procId = processInstance.getId();
log.info( "---> Started ProcessTimer id: {}",
procId );
@@ -524,13 +587,18 @@
log.info( "---> session disposed" );
Environment env = KnowledgeBaseFactory.newEnvironment();
- env.set( EnvironmentName.ENTITY_MANAGER_FACTORY, ctx.getBean( "myEmf" ));
- env.set( EnvironmentName.TRANSACTION_MANAGER, ctx.getBean( "txManager" ));
+ env.set( EnvironmentName.ENTITY_MANAGER_FACTORY,
+ ctx.getBean( "myEmf" ) );
+ env.set( EnvironmentName.TRANSACTION_MANAGER,
+ ctx.getBean( "txManager" ) );
- KnowledgeStoreService kstore = ( KnowledgeStoreService ) ctx.getBean( "kstore1" );
- KnowledgeBase kbase1 = ( KnowledgeBase ) ctx.getBean( "kbProcessWorkItems" );
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
-
+ KnowledgeStoreService kstore = (KnowledgeStoreService) ctx.getBean( "kstore1" );
+ KnowledgeBase kbase1 = (KnowledgeBase) ctx.getBean( "kbProcessWorkItems" );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+
log.info( "---> load session: " + sessionId );
processInstance = service.getProcessInstance( procId );
log.info( "---> GetProcessInstanceCommand id: " + procId );
@@ -538,10 +606,13 @@
log.info( "---> session disposed" );
service.dispose();
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
log.info( "---> load session: " + sessionId );
Thread.sleep( 3000 );
-
+
log.info( "---> GetProcessInstanceCommand id: " + procId );
processInstance = service.getProcessInstance( procId );
log.info( "---> session disposed" );
@@ -549,7 +620,7 @@
}
@SuppressWarnings("unused")
- private static Package getProcessTimer() {
+ private static Package getProcessTimer() {
RuleFlowProcess process = new RuleFlowProcess();
process.setId( "org.drools.test.ProcessTimer" );
process.setName( "ProcessTimer" );
@@ -610,19 +681,24 @@
Thread.sleep( 2000 );
Environment env = KnowledgeBaseFactory.newEnvironment();
- env.set( EnvironmentName.ENTITY_MANAGER_FACTORY, ctx.getBean( "myEmf" ));
- env.set( EnvironmentName.TRANSACTION_MANAGER, ctx.getBean( "txManager" ));
+ env.set( EnvironmentName.ENTITY_MANAGER_FACTORY,
+ ctx.getBean( "myEmf" ) );
+ env.set( EnvironmentName.TRANSACTION_MANAGER,
+ ctx.getBean( "txManager" ) );
- KnowledgeStoreService kstore = ( KnowledgeStoreService ) ctx.getBean( "kstore1" );
- KnowledgeBase kbase1 = ( KnowledgeBase ) ctx.getBean( "kbProcessWorkItems" );
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
-
- processInstance = service.getProcessInstance( processInstance.getId() );
+ KnowledgeStoreService kstore = (KnowledgeStoreService) ctx.getBean( "kstore1" );
+ KnowledgeBase kbase1 = (KnowledgeBase) ctx.getBean( "kbProcessWorkItems" );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+
+ processInstance = service.getProcessInstance( processInstance.getId() );
assertNull( processInstance );
}
@SuppressWarnings("unused")
- private static Package getProcessTimer2() {
+ private static Package getProcessTimer2() {
RuleFlowProcess process = new RuleFlowProcess();
process.setId( "org.drools.test.ProcessTimer2" );
process.setName( "ProcessTimer2" );
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:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/VariablePersistenceStrategyTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -119,130 +119,147 @@
@Test
public void testTransactionsRollback() throws Exception {
- final List<?> list = new ArrayList<Object>();
- PlatformTransactionManager txManager = (PlatformTransactionManager) ctx.getBean( "txManager" );
-
- final Environment env = KnowledgeBaseFactory.newEnvironment();
- env.set( EnvironmentName.ENTITY_MANAGER_FACTORY, ctx.getBean( "myEmf" ));
- env.set( EnvironmentName.TRANSACTION_MANAGER, txManager);
- env.set( EnvironmentName.GLOBALS, new MapGlobalResolver() );
- env.set( EnvironmentName.OBJECT_MARSHALLING_STRATEGIES, new ObjectMarshallingStrategy[]{new JPAPlaceholderResolverStrategy(env),
- new SerializablePlaceholderResolverStrategy(ClassObjectMarshallingStrategyAcceptor.DEFAULT)} );
-
- final KnowledgeStoreService kstore = ( KnowledgeStoreService ) ctx.getBean( "kstore1" );
- final KnowledgeBase kbRollback = ( KnowledgeBase ) ctx.getBean( "kbRollback" );
-
- TransactionTemplate txTemplate = new TransactionTemplate(txManager);
- final StatefulKnowledgeSession ksession = (StatefulKnowledgeSession) txTemplate.execute(new TransactionCallback() {
-
- public Object doInTransaction(TransactionStatus status) {
- StatefulKnowledgeSession kNewSession = kstore.newStatefulKnowledgeSession(kbRollback, null, env);
- kNewSession.setGlobal( "list", list );
- kNewSession.insert( 1 );
- kNewSession.insert( 2 );
- return kNewSession;
- }
- });
-
- final int sessionId = ksession.getId();
+ final List< ? > list = new ArrayList<Object>();
+ PlatformTransactionManager txManager = (PlatformTransactionManager) ctx.getBean( "txManager" );
- txTemplate = new TransactionTemplate(txManager);
- txTemplate.execute(new TransactionCallback() {
-
- public Object doInTransaction(TransactionStatus status) {
- ksession.insert( 3 );
- status.setRollbackOnly();
- return null;
- }
- });
-
- txTemplate = new TransactionTemplate(txManager);
- txTemplate.execute(new TransactionCallback() {
-
- public Object doInTransaction(TransactionStatus status) {
- ksession.fireAllRules();
- return null;
- }
- });
+ final Environment env = KnowledgeBaseFactory.newEnvironment();
+ env.set( EnvironmentName.ENTITY_MANAGER_FACTORY,
+ ctx.getBean( "myEmf" ) );
+ env.set( EnvironmentName.TRANSACTION_MANAGER,
+ txManager );
+ env.set( EnvironmentName.GLOBALS,
+ new MapGlobalResolver() );
+ env.set( EnvironmentName.OBJECT_MARSHALLING_STRATEGIES,
+ new ObjectMarshallingStrategy[]{new JPAPlaceholderResolverStrategy( env ),
+ new SerializablePlaceholderResolverStrategy( ClassObjectMarshallingStrategyAcceptor.DEFAULT )} );
- assertEquals( 2,
+ final KnowledgeStoreService kstore = (KnowledgeStoreService) ctx.getBean( "kstore1" );
+ final KnowledgeBase kbRollback = (KnowledgeBase) ctx.getBean( "kbRollback" );
+
+ TransactionTemplate txTemplate = new TransactionTemplate( txManager );
+ final StatefulKnowledgeSession ksession = (StatefulKnowledgeSession) txTemplate.execute( new TransactionCallback() {
+
+ public Object doInTransaction(TransactionStatus status) {
+ StatefulKnowledgeSession kNewSession = kstore.newStatefulKnowledgeSession( kbRollback,
+ null,
+ env );
+ kNewSession.setGlobal( "list",
+ list );
+ kNewSession.insert( 1 );
+ kNewSession.insert( 2 );
+ return kNewSession;
+ }
+ } );
+
+ final int sessionId = ksession.getId();
+
+ txTemplate = new TransactionTemplate( txManager );
+ txTemplate.execute( new TransactionCallback() {
+
+ public Object doInTransaction(TransactionStatus status) {
+ ksession.insert( 3 );
+ status.setRollbackOnly();
+ return null;
+ }
+ } );
+
+ txTemplate = new TransactionTemplate( txManager );
+ txTemplate.execute( new TransactionCallback() {
+
+ public Object doInTransaction(TransactionStatus status) {
+ ksession.fireAllRules();
+ return null;
+ }
+ } );
+
+ assertEquals( 2,
list.size() );
- txTemplate = new TransactionTemplate(txManager);
- txTemplate.execute(new TransactionCallback() {
-
- public Object doInTransaction(TransactionStatus status) {
- ksession.insert( 3 );
- ksession.insert( 4 );
- return null;
- }
- });
-
- txTemplate = new TransactionTemplate(txManager);
- txTemplate.execute(new TransactionCallback() {
-
- public Object doInTransaction(TransactionStatus status) {
- ksession.insert( 5 );
- ksession.insert( 6 );
- status.setRollbackOnly();
- return null;
- }
- });
+ txTemplate = new TransactionTemplate( txManager );
+ txTemplate.execute( new TransactionCallback() {
- txTemplate = new TransactionTemplate(txManager);
- txTemplate.execute(new TransactionCallback() {
-
- public Object doInTransaction(TransactionStatus status) {
- ksession.fireAllRules();
- return null;
- }
- });
+ public Object doInTransaction(TransactionStatus status) {
+ ksession.insert( 3 );
+ ksession.insert( 4 );
+ return null;
+ }
+ } );
+ txTemplate = new TransactionTemplate( txManager );
+ txTemplate.execute( new TransactionCallback() {
+
+ public Object doInTransaction(TransactionStatus status) {
+ ksession.insert( 5 );
+ ksession.insert( 6 );
+ status.setRollbackOnly();
+ return null;
+ }
+ } );
+
+ txTemplate = new TransactionTemplate( txManager );
+ txTemplate.execute( new TransactionCallback() {
+
+ public Object doInTransaction(TransactionStatus status) {
+ ksession.fireAllRules();
+ return null;
+ }
+ } );
+
assertEquals( 4,
list.size() );
-
+
ksession.dispose();
-
+
// now load the ksession
- final StatefulKnowledgeSession ksession2 = JPAKnowledgeService.loadStatefulKnowledgeSession( sessionId, kbRollback, null, env );
-
- txTemplate = new TransactionTemplate(txManager);
- txTemplate.execute(new TransactionCallback() {
-
- public Object doInTransaction(TransactionStatus status) {
- ksession2.setGlobal( "list", list );
- ksession2.insert( 7 );
- ksession2.insert( 8 );
- return null;
- }
- });
+ final StatefulKnowledgeSession ksession2 = JPAKnowledgeService.loadStatefulKnowledgeSession( sessionId,
+ kbRollback,
+ null,
+ env );
- txTemplate.execute(new TransactionCallback() {
- public Object doInTransaction(TransactionStatus status) {
- ksession2.fireAllRules();
- return null;
- }
- });
+ txTemplate = new TransactionTemplate( txManager );
+ txTemplate.execute( new TransactionCallback() {
+ public Object doInTransaction(TransactionStatus status) {
+ ksession2.setGlobal( "list",
+ list );
+ ksession2.insert( 7 );
+ ksession2.insert( 8 );
+ return null;
+ }
+ } );
+
+ txTemplate.execute( new TransactionCallback() {
+ public Object doInTransaction(TransactionStatus status) {
+ ksession2.fireAllRules();
+ return null;
+ }
+ } );
+
assertEquals( 6,
list.size() );
}
-
+
@Test
- public void testPersistenceVariables() throws NamingException, NotSupportedException, SystemException, IllegalStateException, RollbackException, HeuristicMixedException, HeuristicRollbackException {
+ public void testPersistenceVariables() throws NamingException,
+ NotSupportedException,
+ SystemException,
+ IllegalStateException,
+ RollbackException,
+ HeuristicMixedException,
+ HeuristicRollbackException {
MyEntity myEntity = new MyEntity( "This is a test Entity with annotation in fields" );
MyEntityMethods myEntityMethods = new MyEntityMethods( "This is a test Entity with annotations in methods" );
- MyEntityOnlyFields myEntityOnlyFields = new MyEntityOnlyFields( "This is a test Entity with annotations in fields and without accesors methods" ) ;
+ MyEntityOnlyFields myEntityOnlyFields = new MyEntityOnlyFields( "This is a test Entity with annotations in fields and without accesors methods" );
MyVariableSerializable myVariableSerializable = new MyVariableSerializable( "This is a test SerializableObject" );
- EntityManager em = ((EntityManagerFactory)ctx.getBean( "myEmf" )).createEntityManager();
-
+ EntityManager em = ((EntityManagerFactory) ctx.getBean( "myEmf" )).createEntityManager();
+
em.getTransaction().begin();
- em.persist(myEntity);
- em.persist(myEntityMethods);
- em.persist(myEntityOnlyFields);
+ em.persist( myEntity );
+ em.persist( myEntityMethods );
+ em.persist( myEntityOnlyFields );
em.getTransaction().commit();
em.close();
-
+
log.info( "---> get bean jpaSingleSessionCommandService" );
StatefulKnowledgeSession service = (StatefulKnowledgeSession) ctx.getBean( "jpaSingleSessionCommandService" );
@@ -254,14 +271,15 @@
parameters.put( "x",
"SomeString" );
parameters.put( "y",
- myEntity);
+ myEntity );
parameters.put( "m",
- myEntityMethods);
+ myEntityMethods );
parameters.put( "f",
- myEntityOnlyFields);
+ myEntityOnlyFields );
parameters.put( "z",
- myVariableSerializable);
- WorkflowProcessInstance processInstance = (WorkflowProcessInstance) service.startProcess( "com.sample.ruleflow", parameters );
+ myVariableSerializable );
+ WorkflowProcessInstance processInstance = (WorkflowProcessInstance) service.startProcess( "com.sample.ruleflow",
+ parameters );
log.info( "Started process instance {}",
processInstance.getId() );
@@ -272,23 +290,29 @@
EntityManagerFactory emf = (EntityManagerFactory) ctx.getBean( "myEmf" );
-// List< ? > result = emf.createEntityManager().createQuery( "select i from VariableInstanceInfo i" ).getResultList();
-// assertEquals( 5,
-// result.size() );
+ // List< ? > result = emf.createEntityManager().createQuery( "select i from VariableInstanceInfo i" ).getResultList();
+ // assertEquals( 5,
+ // result.size() );
log.info( "### Retrieving process instance ###" );
Environment env = KnowledgeBaseFactory.newEnvironment();
- env.set( EnvironmentName.ENTITY_MANAGER_FACTORY, emf);
- env.set( EnvironmentName.TRANSACTION_MANAGER, ctx.getBean( "txManager" ));
- env.set( EnvironmentName.OBJECT_MARSHALLING_STRATEGIES, new ObjectMarshallingStrategy[]{
+ env.set( EnvironmentName.ENTITY_MANAGER_FACTORY,
+ emf );
+ env.set( EnvironmentName.TRANSACTION_MANAGER,
+ ctx.getBean( "txManager" ) );
+ env.set( EnvironmentName.OBJECT_MARSHALLING_STRATEGIES,
+ new ObjectMarshallingStrategy[]{
// new JPAPlaceholderResolverStrategy(env),
- new SerializablePlaceholderResolverStrategy(ClassObjectMarshallingStrategyAcceptor.DEFAULT)
- });
+ new SerializablePlaceholderResolverStrategy( ClassObjectMarshallingStrategyAcceptor.DEFAULT )
+ } );
- KnowledgeStoreService kstore = ( KnowledgeStoreService ) ctx.getBean( "kstore1" );
- KnowledgeBase kbase1 = ( KnowledgeBase ) ctx.getBean( "kbase1" );
- service = kstore.loadStatefulKnowledgeSession( sessionId, kbase1, null, env );
-
+ KnowledgeStoreService kstore = (KnowledgeStoreService) ctx.getBean( "kstore1" );
+ KnowledgeBase kbase1 = (KnowledgeBase) ctx.getBean( "kbase1" );
+ service = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase1,
+ null,
+ env );
+
processInstance = (WorkflowProcessInstance) service.getProcessInstance( processInstance.getId() );
assertNotNull( processInstance );
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:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/timer/MyDroolsBean.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -15,67 +15,77 @@
public class MyDroolsBean {
- public static int TIMER_TRIGGER_COUNT;
- private static int sessionId;
- private EntityManagerFactory emf;
- private KnowledgeBase kbase;
+ public static int TIMER_TRIGGER_COUNT;
+ private static int sessionId;
+ private EntityManagerFactory emf;
+ private KnowledgeBase kbase;
private KnowledgeStoreService kstore;
private JpaTransactionManager txm;
- org.slf4j.Logger logger = LoggerFactory.getLogger( getClass() );
+ org.slf4j.Logger logger = LoggerFactory.getLogger( getClass() );
+ private TestWorkItemHandler workItemHandler = new TestWorkItemHandler();
- private TestWorkItemHandler workItemHandler = new TestWorkItemHandler();
-
public void initStartDisposeAndLoadSession() {
try {
EntityManager em = txm.getEntityManagerFactory().createEntityManager();
// create new ksession with kstore
- StatefulKnowledgeSession ksession = kstore.newStatefulKnowledgeSession(kbase, null, getEnvironment());
+ StatefulKnowledgeSession ksession = kstore.newStatefulKnowledgeSession( kbase,
+ null,
+ getEnvironment() );
sessionId = ksession.getId();
- logger.info("\n\tSession id: "+sessionId+"\n");
+ logger.info( "\n\tSession id: " + sessionId + "\n" );
- ksession.getWorkItemManager().registerWorkItemHandler("testWorkItemHandler", workItemHandler);
+ ksession.getWorkItemManager().registerWorkItemHandler( "testWorkItemHandler",
+ workItemHandler );
- ksession.startProcess("timer-flow", null);
- Thread.sleep(4000);
+ ksession.startProcess( "timer-flow",
+ null );
+ Thread.sleep( 4000 );
ksession.dispose();
- } catch (Exception ex) {
- logger.error("Exception", ex);
+ } catch ( Exception ex ) {
+ logger.error( "Exception",
+ ex );
}
-
}
public void endTheProcess() {
try {
- StatefulKnowledgeSession ksession = kstore.loadStatefulKnowledgeSession(sessionId, kbase, null, getEnvironment());
+ StatefulKnowledgeSession ksession = kstore.loadStatefulKnowledgeSession( sessionId,
+ kbase,
+ null,
+ getEnvironment() );
//Sleep to check if the timer continues executing.
- logger.info("\n\nSleeping to check that the timer is still running");
- Thread.sleep(5000);
+ logger.info( "\n\nSleeping to check that the timer is still running" );
+ Thread.sleep( 5000 );
- ksession.getWorkItemManager().completeWorkItem(TestWorkItemHandler.getWorkItem().getId(), null);
+ ksession.getWorkItemManager().completeWorkItem( TestWorkItemHandler.getWorkItem().getId(),
+ null );
- logger.info("\n\nSleeping to check that the timer is no longer running");
- Thread.sleep(3000);
- logger.info("Ok");
-
-
+ logger.info( "\n\nSleeping to check that the timer is no longer running" );
+ Thread.sleep( 3000 );
+ logger.info( "Ok" );
+
ksession.dispose();
- } catch (InterruptedException ex) {
- logger.error("Exception", ex);
+ } catch ( InterruptedException ex ) {
+ logger.error( "Exception",
+ ex );
}
}
private Environment getEnvironment() {
Environment environment = KnowledgeBaseFactory.newEnvironment();
- environment.set(EnvironmentName.ENTITY_MANAGER_FACTORY, emf);
- environment.set(EnvironmentName.TRANSACTION_MANAGER, txm);
- environment.set(EnvironmentName.GLOBALS, new MapGlobalResolver());
-
+ environment.set( EnvironmentName.ENTITY_MANAGER_FACTORY,
+ emf );
+ environment.set( EnvironmentName.TRANSACTION_MANAGER,
+ txm );
+ environment.set( EnvironmentName.GLOBALS,
+ new MapGlobalResolver() );
+
return environment;
}
Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/timer/TestWorkItemHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/timer/TestWorkItemHandler.java 2010-11-16 10:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/timer/TestWorkItemHandler.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -4,22 +4,26 @@
import org.drools.runtime.process.WorkItemHandler;
import org.drools.runtime.process.WorkItemManager;
-public class TestWorkItemHandler implements WorkItemHandler {
- private static WorkItem workItem = null;
+public class TestWorkItemHandler
+ implements
+ WorkItemHandler {
+ private static WorkItem workItem = null;
- public void abortWorkItem(WorkItem arg0, WorkItemManager arg1) {
- // TODO Auto-generated method stub
+ public void abortWorkItem(WorkItem arg0,
+ WorkItemManager arg1) {
+ // TODO Auto-generated method stub
- }
+ }
- public void executeWorkItem(WorkItem item, WorkItemManager manager) {
- // TODO Auto-generated method stub
- workItem = item;
- System.out.println("**** Inside TestWorkItemHandler, suspending.... ****");
- }
+ public void executeWorkItem(WorkItem item,
+ WorkItemManager manager) {
+ // TODO Auto-generated method stub
+ workItem = item;
+ System.out.println( "**** Inside TestWorkItemHandler, suspending.... ****" );
+ }
- public static WorkItem getWorkItem() {
- return workItem;
- }
+ public static WorkItem getWorkItem() {
+ return workItem;
+ }
}
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:45:55 UTC (rev 35989)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/java/org/drools/container/spring/timer/TimerFlowTest.java 2010-11-16 10:47:46 UTC (rev 35990)
@@ -12,7 +12,6 @@
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-
public class TimerFlowTest {
private static final Logger log = LoggerFactory.getLogger( TimerFlowTest.class );
@@ -41,19 +40,19 @@
}
@Test
- public void doTest() throws Exception{
+ public void doTest() throws Exception {
+ MyDroolsBean myDroolsBean = (MyDroolsBean) ctx.getBean( "myDroolsBean" );
- MyDroolsBean myDroolsBean = (MyDroolsBean) ctx.getBean( "myDroolsBean");
+ assertEquals( 0,
+ myDroolsBean.TIMER_TRIGGER_COUNT );
- assertEquals(0,myDroolsBean.TIMER_TRIGGER_COUNT);
-
myDroolsBean.initStartDisposeAndLoadSession();
int n = myDroolsBean.TIMER_TRIGGER_COUNT;
- assertTrue(n > 0);
+ assertTrue( n > 0 );
myDroolsBean.endTheProcess();
- assertTrue(myDroolsBean.TIMER_TRIGGER_COUNT > n);
+ assertTrue( myDroolsBean.TIMER_TRIGGER_COUNT > n );
}
}
More information about the jboss-svn-commits
mailing list