[jboss-svn-commits] JBL Code SVN: r35047 - in labs/jbossrules/branches/diega_esteban_jpm_integration_r34940: drools-api/src/main/java/org/drools/event/knowledgeagent and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 7 19:17:17 EDT 2010
Author: diegoll
Date: 2010-09-07 19:17:17 -0400 (Tue, 07 Sep 2010)
New Revision: 35047
Modified:
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/KnowledgeBase.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/event/knowledgeagent/ChangeSetProcessingEvent.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/event/knowledgeagent/KnowledgeAgentEventListener.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/osgi/api/Activator.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/runtime/KnowledgeRuntime.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-atom/pom.xml
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-camel/pom.xml
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-camel/src/test/java/org/drools/Cheese.java
Log:
[JBRULES-2616] merged with trunk rev35043
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/KnowledgeBase.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/KnowledgeBase.java 2010-09-07 22:55:53 UTC (rev 35046)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/KnowledgeBase.java 2010-09-07 23:17:17 UTC (rev 35047)
@@ -159,6 +159,8 @@
*/
void removeProcess(String processId);
+ Collection<Process> getProcesses();
+
/**
* Create a new StatefulKnowledgeSession using the given session configuration and/or environment.
* Either one can be null and it will use a default.
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/event/knowledgeagent/ChangeSetProcessingEvent.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/event/knowledgeagent/ChangeSetProcessingEvent.java 2010-09-07 22:55:53 UTC (rev 35046)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/event/knowledgeagent/ChangeSetProcessingEvent.java 2010-09-07 23:17:17 UTC (rev 35047)
@@ -1,5 +1,3 @@
-package org.drools.event.knowledgeagent;
-
/*
* Copyright 2010 JBoss Inc
*
@@ -15,6 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.drools.event.knowledgeagent;
+
import java.util.EventObject;
import org.drools.ChangeSet;
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/event/knowledgeagent/KnowledgeAgentEventListener.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/event/knowledgeagent/KnowledgeAgentEventListener.java 2010-09-07 22:55:53 UTC (rev 35046)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/event/knowledgeagent/KnowledgeAgentEventListener.java 2010-09-07 23:17:17 UTC (rev 35047)
@@ -1,5 +1,3 @@
-package org.drools.event.knowledgeagent;
-
/*
* Copyright 2010 JBoss Inc
*
@@ -15,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.drools.event.knowledgeagent;
import java.util.EventListener;
@@ -41,4 +40,4 @@
void knowledgeBaseUpdated(KnowledgeBaseUpdatedEvent event);
void resourceCompilationFailed(ResourceCompilationFailedEvent event);
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/osgi/api/Activator.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/osgi/api/Activator.java 2010-09-07 22:55:53 UTC (rev 35046)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/osgi/api/Activator.java 2010-09-07 23:17:17 UTC (rev 35047)
@@ -40,7 +40,7 @@
System.out.println( "registering api services" );
this.serviceRegistry = bc.registerService( ServiceRegistry.class.getName(),
- new ServiceRegistryImpl(),
+ ServiceRegistryImpl.getInstance(),
new Hashtable() );
this.registryTracker = new ServiceTracker( bc,
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/runtime/KnowledgeRuntime.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/runtime/KnowledgeRuntime.java 2010-09-07 22:55:53 UTC (rev 35046)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-api/src/main/java/org/drools/runtime/KnowledgeRuntime.java 2010-09-07 23:17:17 UTC (rev 35047)
@@ -78,5 +78,7 @@
void unregisterChannel(String name);
Map< String, Channel> getChannels();
+
+ KnowledgeSessionConfiguration getSessionConfiguration();
}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-atom/pom.xml
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-atom/pom.xml 2010-09-07 22:55:53 UTC (rev 35046)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-atom/pom.xml 2010-09-07 23:17:17 UTC (rev 35047)
@@ -8,7 +8,7 @@
If by chance the slackers who maintain the other projects have left the build slight broken,
you can skip the tests by doing:
- "mvn -Dmaven.test.skip=true install" and it should work.
+ "mvn -DskipTests install" and it should work.
-->
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-camel/pom.xml
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-camel/pom.xml 2010-09-07 22:55:53 UTC (rev 35046)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-camel/pom.xml 2010-09-07 23:17:17 UTC (rev 35047)
@@ -34,6 +34,10 @@
</dependency>
<dependency>
<groupId>org.drools</groupId>
+ <artifactId>drools-flow-compiler</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
<artifactId>drools-spring</artifactId>
</dependency>
<dependency>
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-camel/src/test/java/org/drools/Cheese.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-camel/src/test/java/org/drools/Cheese.java 2010-09-07 22:55:53 UTC (rev 35046)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-camel/src/test/java/org/drools/Cheese.java 2010-09-07 23:17:17 UTC (rev 35047)
@@ -23,22 +23,6 @@
import javax.xml.bind.annotation.XmlRootElement;
-/*
- * Copyright 2005 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
@XmlRootElement
public class Cheese
implements
More information about the jboss-svn-commits
mailing list