[seam-commits] Seam SVN: r12687 - in modules/drools/trunk: api and 17 other directories.

Author: tsurdilovic Date: 2010-05-06 18:04:23 -0400 (Thu, 06 May 2010) New Revision: 12687 Added: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Stateful.java modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Stateless.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/StatefulKnowledgeSessionWrapper.java Modified: modules/drools/trunk/api/pom.xml modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/FactProvider.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/ExecutionResultsProducer.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeAgentProducer.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/annotations/InsertFact.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/annotations/flow/SignalEvent.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/annotations/flow/StartProcess.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/interceptor/InsertFactInterceptor.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/interceptor/SignalEventInterceptor.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/interceptor/StartProcessInterceptor.java modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/utils/ConfigUtils.java modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/cep/CEPTest.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/flow/FlowTest.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/interceptors/InterceptorsTest.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/interceptors/InterceptorsTestBean.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/kagent/KAgentTest.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/kbase/KBaseTest.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/query/QueryFactProvider.java modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/query/QueryTest.java modules/drools/trunk/pom.xml Log: updated to weld extensions api changes. changed back to weld-parent. Modified: modules/drools/trunk/api/pom.xml =================================================================== --- modules/drools/trunk/api/pom.xml 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/api/pom.xml 2010-05-06 22:04:23 UTC (rev 12687) @@ -76,6 +76,10 @@ <artifactId>drools-workitems</artifactId> </dependency> <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-transformer-xstream</artifactId> + </dependency> + <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-extensions</artifactId> <version>1.0.0-SNAPSHOT</version> Modified: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/FactProvider.java =================================================================== --- modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/FactProvider.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/FactProvider.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -41,4 +41,8 @@ public List<String> getQueries(); public void setQueries(List<String> queries); + + public String getBatchXml(); + + public void setBatchXml(String batchXml); } Added: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Stateful.java =================================================================== --- modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Stateful.java (rev 0) +++ modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Stateful.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.drools.qualifiers; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +/** + * + * @author Tihomir Surdilovic + */ +@Qualifier +@Target( { TYPE, METHOD, FIELD, PARAMETER }) +@Documented +@Retention(RUNTIME) +@Inherited +public @interface Stateful { + +} Added: modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Stateless.java =================================================================== --- modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Stateless.java (rev 0) +++ modules/drools/trunk/api/src/main/java/org/jboss/seam/drools/qualifiers/Stateless.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.drools.qualifiers; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +/** + * + * @author Tihomir Surdilovic + */ +@Qualifier +@Target( { TYPE, METHOD, FIELD, PARAMETER }) +@Documented +@Retention(RUNTIME) +@Inherited +public @interface Stateless { + +} Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/ExecutionResultsProducer.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/ExecutionResultsProducer.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/ExecutionResultsProducer.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -35,10 +35,20 @@ import org.drools.command.CommandFactory; import org.drools.runtime.ExecutionResults; +import org.drools.runtime.StatefulKnowledgeSession; import org.drools.runtime.StatelessKnowledgeSession; +import org.drools.runtime.help.BatchExecutionHelper; +import org.drools.runtime.pipeline.Action; +import org.drools.runtime.pipeline.KnowledgeRuntimeCommand; +import org.drools.runtime.pipeline.Pipeline; +import org.drools.runtime.pipeline.PipelineFactory; +import org.drools.runtime.pipeline.ResultHandler; +import org.drools.runtime.pipeline.Transformer; import org.jboss.seam.drools.bootstrap.DroolsExtension; import org.jboss.seam.drools.qualifiers.Scanned; -import org.jboss.weld.extensions.resources.ResourceProvider; +import org.jboss.seam.drools.qualifiers.Stateful; +import org.jboss.seam.drools.qualifiers.Stateless; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,19 +72,82 @@ @SuppressWarnings("unchecked") @Produces + @Stateless @RequestScoped - public ExecutionResults produceExecutionResults(StatelessKnowledgeSession ksession) { + public ExecutionResults produceStatelessExecutionResults(StatelessKnowledgeSession ksession) { return ksession.execute(CommandFactory.newBatchExecution(getCommandList())); } @SuppressWarnings("unchecked") @Produces + @Stateless @Scanned @RequestScoped - public ExecutionResults produceScannedExecutionResults(@Scanned StatelessKnowledgeSession ksession) { + public ExecutionResults produceStatelessScannedExecutionResults(@Scanned StatelessKnowledgeSession ksession) { return ksession.execute(CommandFactory.newBatchExecution(getCommandList())); } + @Produces + @Stateful + @RequestScoped + public ExecutionResults produceStateFulExecutionResults(StatefulKnowledgeSession ksession) { + ResultHandlerImpl resultsHandler = new ResultHandlerImpl(); + Pipeline pip = getPipelineStateful(ksession); + Iterator<FactProvider> iter = droolsExtension.getFactProviderSet().iterator(); + while(iter.hasNext()) + { + FactProvider factProvider = iter.next(); + if(factProvider.getBatchXml() != null) { + pip.insert(factProvider.getBatchXml(), resultsHandler); + } + } + + return (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML((String) resultsHandler.getObject()); + } + + @Produces + @Stateful + @Scanned + @RequestScoped + public ExecutionResults produceStateFulScannedExecutionResults(@Scanned StatefulKnowledgeSession ksession) { + ResultHandlerImpl resultsHandler = new ResultHandlerImpl(); + Pipeline pip = getPipelineStateful(ksession); + Iterator<FactProvider> iter = droolsExtension.getFactProviderSet().iterator(); + while(iter.hasNext()) + { + FactProvider factProvider = iter.next(); + if(factProvider.getBatchXml() != null) { + pip.insert(factProvider.getBatchXml(), resultsHandler); + } + } + + return (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML((String) resultsHandler.getObject()); + + } + + private Pipeline getPipelineStateful(StatefulKnowledgeSession ksession) + { + Action executeResultHandler = PipelineFactory.newExecuteResultHandler(); + + Action assignResult = PipelineFactory.newAssignObjectAsResult(); + assignResult.setReceiver(executeResultHandler); + + Transformer outTransformer = PipelineFactory.newXStreamToXmlTransformer(BatchExecutionHelper.newXStreamMarshaller()); + outTransformer.setReceiver(assignResult); + + KnowledgeRuntimeCommand batchExecution = PipelineFactory.newCommandExecutor(); + batchExecution.setReceiver(outTransformer); + + Transformer inTransformer = PipelineFactory.newXStreamFromXmlTransformer(BatchExecutionHelper.newXStreamMarshaller()); + inTransformer.setReceiver(batchExecution); + + Pipeline pipeline = PipelineFactory.newStatefulKnowledgeSessionPipeline(ksession); + pipeline.setReceiver(inTransformer); + + return pipeline; + } + + @SuppressWarnings("unchecked") private List getCommandList() { List commandList = new ArrayList(); @@ -104,5 +177,22 @@ return commandList; } + public static class ResultHandlerImpl implements ResultHandler + { + Object object; + public void handleResult(Object object) + { + this.object = object; + } + + public Object getObject() + { + return this.object; + } + + } + + + } Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeAgentProducer.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeAgentProducer.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeAgentProducer.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -38,7 +38,7 @@ import org.jboss.seam.drools.config.DroolsConfig; import org.jboss.seam.drools.config.RuleResources; import org.jboss.seam.drools.qualifiers.Scanned; -import org.jboss.weld.extensions.resources.ResourceProvider; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeBaseProducer.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -47,7 +47,7 @@ import org.jboss.seam.drools.config.RuleResources; import org.jboss.seam.drools.events.KnowledgeBuilderErrorsEvent; import org.jboss.seam.drools.events.RuleResourceAddedEvent; -import org.jboss.weld.extensions.resources.ResourceProvider; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/KnowledgeSessionProducer.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -43,7 +43,7 @@ import org.jboss.seam.drools.bootstrap.DroolsExtension; import org.jboss.seam.drools.config.DroolsConfig; import org.jboss.seam.drools.qualifiers.Scanned; -import org.jboss.weld.extensions.resources.ResourceProvider; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Added: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/StatefulKnowledgeSessionWrapper.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/StatefulKnowledgeSessionWrapper.java (rev 0) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/StatefulKnowledgeSessionWrapper.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -0,0 +1,328 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.seam.drools; + +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.Collection; +import java.util.Map; + +import org.drools.KnowledgeBase; +import org.drools.command.Command; +import org.drools.event.process.ProcessEventListener; +import org.drools.event.rule.AgendaEventListener; +import org.drools.event.rule.WorkingMemoryEventListener; +import org.drools.runtime.Environment; +import org.drools.runtime.ExecutionResults; +import org.drools.runtime.ExitPoint; +import org.drools.runtime.Globals; +import org.drools.runtime.ObjectFilter; +import org.drools.runtime.StatefulKnowledgeSession; +import org.drools.runtime.process.ProcessInstance; +import org.drools.runtime.process.WorkItemManager; +import org.drools.runtime.rule.Agenda; +import org.drools.runtime.rule.AgendaFilter; +import org.drools.runtime.rule.FactHandle; +import org.drools.runtime.rule.QueryResults; +import org.drools.runtime.rule.WorkingMemoryEntryPoint; +import org.drools.time.SessionClock; + +/** + * + * @author Tihomir Surdilovic + */ +public class StatefulKnowledgeSessionWrapper implements StatefulKnowledgeSession, Externalizable +{ + private StatefulKnowledgeSession ksession; + + public StatefulKnowledgeSessionWrapper(StatefulKnowledgeSession ksession) + { + this.ksession = ksession; + } + + public StatefulKnowledgeSessionWrapper() + { + + } + + public StatefulKnowledgeSession getKsession() + { + return ksession; + } + + public void setKsession(StatefulKnowledgeSession ksession) + { + this.ksession = ksession; + } + + public void dispose() + { + ksession.dispose(); + } + + public int getId() + { + return ksession.getId(); + } + + 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 + + } + + public FactHandle getFactHandle(Object object) + { + return ksession.getFactHandle(object); + } + + public <T extends FactHandle> Collection<T> getFactHandles() + { + return ksession.getFactHandles(); + } + + public <T extends FactHandle> Collection<T> getFactHandles(ObjectFilter filter) + { + return ksession.getFactHandles(filter); + } + + public Object getObject(FactHandle factHandle) + { + return ksession.getObject(factHandle); + } + + public Collection<Object> getObjects() + { + return ksession.getObjects(); + } + + public Collection<Object> getObjects(ObjectFilter filter) + { + return ksession.getObjects(filter); + } + + public FactHandle insert(Object object) + { + return ksession.insert(object); + } + + public void retract(FactHandle handle) + { + ksession.retract(handle); + } + + public void update(FactHandle handle, Object object) + { + ksession.update(handle, object); + } + + public void abortProcessInstance(long id) + { + ksession.abortProcessInstance(id); + } + + public ProcessInstance getProcessInstance(long id) + { + return ksession.getProcessInstance(id); + } + + public Collection<ProcessInstance> getProcessInstances() + { + return ksession.getProcessInstances(); + } + + public WorkItemManager getWorkItemManager() + { + return ksession.getWorkItemManager(); + } + + public void signalEvent(String type, Object event) + { + ksession.signalEvent(type, event); + } + + public ProcessInstance startProcess(String processId, Map<String, Object> parameters) + { + return ksession.startProcess(processId, parameters); + } + + public ProcessInstance startProcess(String processId) + { + return ksession.startProcess(processId); + } + + public int fireAllRules() + { + return ksession.fireAllRules(); + } + + public int fireAllRules(AgendaFilter agendaFilter) + { + return ksession.fireAllRules(agendaFilter); + } + + public int fireAllRules(int max) + { + return ksession.fireAllRules(max); + } + + public void fireUntilHalt() + { + ksession.fireUntilHalt(); + } + + public void fireUntilHalt(AgendaFilter agendaFilter) + { + ksession.fireUntilHalt(agendaFilter); + } + + public Environment getEnvironment() + { + return ksession.getEnvironment(); + } + + public Object getGlobal(String identifier) + { + return ksession.getGlobal(identifier); + } + + public Globals getGlobals() + { + return ksession.getGlobals(); + } + + public KnowledgeBase getKnowledgeBase() + { + return ksession.getKnowledgeBase(); + } + + public <T extends SessionClock> T getSessionClock() + { + // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6302954 + return ksession.<T>getSessionClock(); + } + + public void registerExitPoint(String name, ExitPoint exitPoint) + { + ksession.registerExitPoint(name, exitPoint); + } + + public void setGlobal(String identifier, Object object) + { + ksession.setGlobal(identifier, object); + } + + public void unregisterExitPoint(String name) + { + ksession.unregisterExitPoint(name); + } + + public void addEventListener(ProcessEventListener listener) + { + ksession.addEventListener(listener); + } + + public Collection<ProcessEventListener> getProcessEventListeners() + { + return ksession.getProcessEventListeners(); + } + + public void removeEventListener(ProcessEventListener listener) + { + ksession.removeEventListener(listener); + } + + @SuppressWarnings("unchecked") + public ExecutionResults execute(Command command) + { + return ksession.execute(command); + } + + public void addEventListener(AgendaEventListener listener) + { + ksession.addEventListener(listener); + } + + public void addEventListener(WorkingMemoryEventListener listener) + { + ksession.addEventListener(listener); + } + + public Collection<AgendaEventListener> getAgendaEventListeners() + { + return ksession.getAgendaEventListeners(); + } + + public Collection<WorkingMemoryEventListener> getWorkingMemoryEventListeners() + { + return ksession.getWorkingMemoryEventListeners(); + } + + public void removeEventListener(AgendaEventListener listener) + { + ksession.removeEventListener(listener); + } + + public void removeEventListener(WorkingMemoryEventListener listener) + { + ksession.removeEventListener(listener); + } + + public Agenda getAgenda() + { + return ksession.getAgenda(); + } + + public QueryResults getQueryResults(String query, Object[] arguments) + { + return ksession.getQueryResults(query, arguments); + } + + public QueryResults getQueryResults(String query) + { + return ksession.getQueryResults(query); + } + + public WorkingMemoryEntryPoint getWorkingMemoryEntryPoint(String name) + { + return ksession.getWorkingMemoryEntryPoint(name); + } + + public Collection<? extends WorkingMemoryEntryPoint> getWorkingMemoryEntryPoints() + { + return ksession.getWorkingMemoryEntryPoints(); + } + + public void halt() + { + ksession.halt(); + } + +} Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/annotations/InsertFact.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/annotations/InsertFact.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/annotations/InsertFact.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -18,7 +18,7 @@ * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + */ package org.jboss.seam.drools.annotations; import static java.lang.annotation.ElementType.METHOD; @@ -43,7 +43,15 @@ @Retention(RUNTIME) public @interface InsertFact { - @Nonbinding boolean fire() default false; - @Nonbinding boolean untilHalt() default false; - @Nonbinding String entrypoint() default ""; + @Nonbinding + boolean fire() default false; + + @Nonbinding + boolean untilHalt() default false; + + @Nonbinding + String entrypoint() default ""; + + @Nonbinding + boolean allEntryPoints() default false; } Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/annotations/flow/SignalEvent.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/annotations/flow/SignalEvent.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/annotations/flow/SignalEvent.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -51,4 +51,7 @@ @Nonbinding String processName() default ""; + + @Nonbinding + String processId() default ""; } Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/annotations/flow/StartProcess.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/annotations/flow/StartProcess.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/annotations/flow/StartProcess.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -44,7 +44,7 @@ public @interface StartProcess { @Nonbinding - String name() default ""; + String processName() default ""; @Nonbinding boolean fire() default false; Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/config/DroolsConfig.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -41,7 +41,8 @@ import org.drools.io.ResourceFactory; import org.drools.runtime.KnowledgeSessionConfiguration; import org.jboss.seam.drools.utils.ConfigUtils; -import org.jboss.weld.extensions.resources.ResourceProvider; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/interceptor/InsertFactInterceptor.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/interceptor/InsertFactInterceptor.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/interceptor/InsertFactInterceptor.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -18,11 +18,12 @@ * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + */ package org.jboss.seam.drools.interceptor; import java.lang.annotation.Annotation; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import javax.enterprise.inject.Any; @@ -34,6 +35,7 @@ import javax.interceptor.InvocationContext; import org.drools.runtime.StatefulKnowledgeSession; +import org.drools.runtime.rule.WorkingMemoryEntryPoint; import org.jboss.seam.drools.annotations.InsertFact; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,52 +46,77 @@ { @Inject BeanManager manager; - - @Inject @Any Instance<StatefulKnowledgeSession> ksessionSource; - + + @Inject + @Any + Instance<StatefulKnowledgeSession> ksessionSource; + private static final Logger log = LoggerFactory.getLogger(InsertFactInterceptor.class); - @AroundInvoke public Object insertFact(InvocationContext ctx) throws Exception { boolean fire = false; boolean untilHalt = false; String entryPointName = null; - + boolean allEntryPoints = false; + Annotation[] methodAnnotations = ctx.getMethod().getAnnotations(); List<Annotation> annotationTypeList = new ArrayList<Annotation>(); - - for(Annotation nextAnnotation : methodAnnotations) { - if(manager.isQualifier(nextAnnotation.annotationType())) { + + for (Annotation nextAnnotation : methodAnnotations) + { + if (manager.isQualifier(nextAnnotation.annotationType())) + { annotationTypeList.add(nextAnnotation); } - if(manager.isInterceptorBinding(nextAnnotation.annotationType())) { - if(nextAnnotation instanceof InsertFact) { + if (manager.isInterceptorBinding(nextAnnotation.annotationType())) + { + if (nextAnnotation instanceof InsertFact) + { fire = ((InsertFact) nextAnnotation).fire(); untilHalt = ((InsertFact) nextAnnotation).untilHalt(); entryPointName = ((InsertFact) nextAnnotation).entrypoint(); + allEntryPoints = ((InsertFact) nextAnnotation).allEntryPoints(); } } } - - StatefulKnowledgeSession ksession = ksessionSource.select((Annotation[])annotationTypeList.toArray(new Annotation[annotationTypeList.size()])).get(); - if(ksession != null) { + + StatefulKnowledgeSession ksession = ksessionSource.select((Annotation[]) annotationTypeList.toArray(new Annotation[annotationTypeList.size()])).get(); + if (ksession != null) + { Object retObj = ctx.proceed(); - if(entryPointName != null && entryPointName.length() > 0 ) { + if (entryPointName != null && entryPointName.length() > 0) + { ksession.getWorkingMemoryEntryPoint(entryPointName).insert(retObj); - } else { + } + else if (allEntryPoints) + { + Iterator<? extends WorkingMemoryEntryPoint> iter = ksession.getWorkingMemoryEntryPoints().iterator(); + while(iter.hasNext()) { + WorkingMemoryEntryPoint ep = iter.next(); + ep.insert(retObj); + } + } + else + { ksession.insert(retObj); } - if(fire) { - if(untilHalt) { - - } else { + if (fire) + { + if (untilHalt) + { + ksession.fireUntilHalt(); + } + else + { ksession.fireAllRules(); } } return retObj; - } else { + } + else + { log.info("Could not obtain StatefulKnowledgeSession."); return ctx.proceed(); } Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/interceptor/SignalEventInterceptor.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/interceptor/SignalEventInterceptor.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/interceptor/SignalEventInterceptor.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -61,6 +61,7 @@ public Object signalEvent(InvocationContext ctx) throws Exception { String processName = null; + String processId = null; String type = null; String event = null; @@ -78,6 +79,7 @@ if (nextAnnotation instanceof SignalEvent) { processName = ((SignalEvent) nextAnnotation).processName(); + processId = ((SignalEvent) nextAnnotation).processId(); type = ((SignalEvent) nextAnnotation).type(); event = ((SignalEvent) nextAnnotation).event(); } @@ -109,6 +111,12 @@ } } } + else if(processId != null && processId.length() > 0) { + ProcessInstance pi = ksession.getProcessInstance(Long.parseLong(processId)); + if(pi != null) { + pi.signalEvent(type, event); + } + } else { if (event != null && event.length() > 0) Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/interceptor/StartProcessInterceptor.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/interceptor/StartProcessInterceptor.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/interceptor/StartProcessInterceptor.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -65,7 +65,7 @@ } if(manager.isInterceptorBinding(nextAnnotation.annotationType())) { if(nextAnnotation instanceof StartProcess) { - processName = ((StartProcess) nextAnnotation).name(); + processName = ((StartProcess) nextAnnotation).processName(); fire = ((StartProcess) nextAnnotation).fire(); untilHalt = ((StartProcess) nextAnnotation).untilHalt(); } Modified: modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/utils/ConfigUtils.java =================================================================== --- modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/utils/ConfigUtils.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/main/java/org/jboss/seam/drools/utils/ConfigUtils.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -26,8 +26,9 @@ import java.util.Properties; import java.util.regex.Pattern; -import org.jboss.weld.extensions.resources.ResourceProvider; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; + /** * * @author Tihomir Surdilovic Modified: modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml =================================================================== --- modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/main/resources/META-INF/beans.xml 2010-05-06 22:04:23 UTC (rev 12687) @@ -216,7 +216,7 @@ <d:ExecutionResultsProducer> <s:specializes /> - <d:produceExecutionResults> + <d:produceStatelessExecutionResults> <s:ApplyQualifiers /> <s:parameters> <drools:StatelessKnowledgeSession> @@ -224,8 +224,8 @@ <s:ApplyQualifiers /> </drools:StatelessKnowledgeSession> </s:parameters> - </d:produceExecutionResults> - <d:produceScannedExecutionResults> + </d:produceStatelessExecutionResults> + <d:produceStatelessScannedExecutionResults> <s:ApplyQualifiers /> <s:parameters> <drools:StatelessKnowledgeSession> @@ -233,7 +233,25 @@ <s:ApplyQualifiers /> </drools:StatelessKnowledgeSession> </s:parameters> - </d:produceScannedExecutionResults> + </d:produceStatelessScannedExecutionResults> + <d:produceStateFulExecutionResults> + <s:ApplyQualifiers /> + <s:parameters> + <drools:StatefulKnowledgeSession> + <s:Inject /> + <s:ApplyQualifiers /> + </drools:StatefulKnowledgeSession> + </s:parameters> + </d:produceStateFulExecutionResults> + <d:produceStateFulScannedExecutionResults> + <s:ApplyQualifiers /> + <s:parameters> + <drools:StatefulKnowledgeSession> + <s:Inject /> + <s:ApplyQualifiers /> + </drools:StatefulKnowledgeSession> + </s:parameters> + </d:produceStateFulScannedExecutionResults> </d:ExecutionResultsProducer> <d:QueryResultsProducer> Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/cep/CEPTest.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/cep/CEPTest.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/cep/CEPTest.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -42,7 +42,7 @@ import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.weld.extensions.resources.ResourceProvider; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; import org.junit.Test; import org.junit.runner.RunWith; Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/delegate/DelegateTest.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -37,7 +37,7 @@ import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.weld.extensions.resources.ResourceProvider; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; import org.junit.Test; import org.junit.runner.RunWith; Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/flow/FlowTest.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/flow/FlowTest.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/flow/FlowTest.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -40,7 +40,7 @@ import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.weld.extensions.resources.ResourceProvider; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; import org.junit.Test; import org.junit.runner.RunWith; Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/interceptors/InterceptorsTest.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/interceptors/InterceptorsTest.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/interceptors/InterceptorsTest.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -42,7 +42,7 @@ import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.weld.extensions.resources.ResourceProvider; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; import org.junit.Test; import org.junit.runner.RunWith; Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/interceptors/InterceptorsTestBean.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/interceptors/InterceptorsTestBean.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/interceptors/InterceptorsTestBean.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -56,7 +56,7 @@ return p; } - @StartProcess(name="interceptorstestflow", fire=true) @Default @InterceptorsTestConfig + @StartProcess(processName="interceptorstestflow", fire=true) @Default @InterceptorsTestConfig public void startProcess() { // this will start the process.... } Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/kagent/KAgentTest.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/kagent/KAgentTest.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/kagent/KAgentTest.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -42,7 +42,7 @@ import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.weld.extensions.resources.ResourceProvider; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; import org.junit.Test; import org.junit.runner.RunWith; Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/kbase/KBaseTest.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/kbase/KBaseTest.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/kbase/KBaseTest.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -37,7 +37,7 @@ import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.formatter.Formatters; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.weld.extensions.resources.ResourceProvider; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; import org.junit.Test; import org.junit.runner.RunWith; Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/ksession/KSessionTest.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -40,7 +40,7 @@ import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.weld.extensions.resources.ResourceProvider; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; import org.junit.Test; import org.junit.runner.RunWith; Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/query/QueryFactProvider.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/query/QueryFactProvider.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/query/QueryFactProvider.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -79,6 +79,16 @@ { } + + public String getBatchXml() + { + return null; + } + + public void setBatchXml(String batchXml) + { + + } Modified: modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/query/QueryTest.java =================================================================== --- modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/query/QueryTest.java 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/impl/src/test/java/org/jboss/seam/drools/test/query/QueryTest.java 2010-05-06 22:04:23 UTC (rev 12687) @@ -35,12 +35,13 @@ import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.drools.KnowledgeBaseProducer; import org.jboss.seam.drools.qualifiers.Query; +import org.jboss.seam.drools.qualifiers.Stateless; import org.jboss.seam.drools.qualifiers.config.DefaultConfig; import org.jboss.seam.drools.test.DroolsModuleFilter; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.weld.extensions.resources.ResourceProvider; +import org.jboss.weld.extensions.resourceLoader.ResourceProvider; import org.junit.Test; import org.junit.runner.RunWith; @@ -67,7 +68,7 @@ // cannot yet move to test method arguments (ARQ-120) @Inject @Default @DefaultConfig @Query("number of adults") QueryResults adultsQuery; @Inject @Default @DefaultConfig @Query("number of minors") QueryResults minorsQuery; - @Inject @Default @DefaultConfig ExecutionResults executionResults; + @Inject @Default @Stateless @DefaultConfig ExecutionResults executionResults; @Test public void testQuery() { Modified: modules/drools/trunk/pom.xml =================================================================== --- modules/drools/trunk/pom.xml 2010-05-06 16:06:11 UTC (rev 12686) +++ modules/drools/trunk/pom.xml 2010-05-06 22:04:23 UTC (rev 12687) @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>seam-parent</artifactId> - <groupId>org.jboss.seam</groupId> - <version>3.0.0-SNAPSHOT</version> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>9</version> </parent> <groupId>org.jboss.seam.drools</groupId> @@ -107,6 +107,11 @@ <version>5.1.0.M1</version> </dependency> <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-transformer-xstream</artifactId> + <version>5.1.0.M1</version> + </dependency> + <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-extensions</artifactId> <version>1.0.0.Alpha1</version>