[jboss-svn-commits] JBL Code SVN: r31855 - in labs/jbossrules/trunk/osgi-bundles: jxls/org.drools.osgi.wrapper.jxls-reader and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Feb 27 00:05:26 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-02-27 00:05:25 -0500 (Sat, 27 Feb 2010)
New Revision: 31855
Modified:
labs/jbossrules/trunk/osgi-bundles/jxls/org.drools.osgi.wrapper.jxls-reader/pom.xml
labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/BPMN2OsgiTest.java
labs/jbossrules/trunk/osgi-bundles/org.milyn/org.drools.osgi.wrapper.milyn-smooks-javabean/pom.xml
labs/jbossrules/trunk/osgi-bundles/org.mvel/org.drools.osgi.wrapper.mvel2/pom.xml
labs/jbossrules/trunk/osgi-bundles/pom.xml
Log:
JBRULES-2351 OSGi Ready
-deploy no longer installed wrapper jars
-reverted BPMN2 tests from using the BPMN2 ResourceType as it's not configured correctly for OSGi environments.
Modified: labs/jbossrules/trunk/osgi-bundles/jxls/org.drools.osgi.wrapper.jxls-reader/pom.xml
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/jxls/org.drools.osgi.wrapper.jxls-reader/pom.xml 2010-02-27 03:55:06 UTC (rev 31854)
+++ labs/jbossrules/trunk/osgi-bundles/jxls/org.drools.osgi.wrapper.jxls-reader/pom.xml 2010-02-27 05:05:25 UTC (rev 31855)
@@ -90,7 +90,15 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
<resources>
Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/BPMN2OsgiTest.java
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/BPMN2OsgiTest.java 2010-02-27 03:55:06 UTC (rev 31854)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/BPMN2OsgiTest.java 2010-02-27 05:05:25 UTC (rev 31855)
@@ -1,54 +1,80 @@
package org.drools.osgi.integrationtests;
-import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.StringReader;
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactoryService;
+import org.drools.bpmn2.xml.BPMN2SemanticModule;
+import org.drools.bpmn2.xml.BPMNDISemanticModule;
+import org.drools.bpmn2.xml.BPMNSemanticModule;
+import org.drools.bpmn2.xml.XmlBPMNProcessDumper;
+import org.drools.bpmn2.xpath.XPathDialectConfiguration;
import org.drools.builder.KnowledgeBuilder;
+import org.drools.builder.KnowledgeBuilderConfiguration;
import org.drools.builder.KnowledgeBuilderError;
import org.drools.builder.KnowledgeBuilderFactoryService;
import org.drools.builder.ResourceType;
+import org.drools.compiler.PackageBuilderConfiguration;
+import org.drools.compiler.xml.XmlProcessReader;
import org.drools.io.ResourceFactoryService;
import org.drools.osgi.test.AbstractDroolsSpringDMTest;
+import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.process.ProcessInstance;
import org.drools.util.ServiceRegistry;
-import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
public class BPMN2OsgiTest extends AbstractDroolsSpringDMTest {
protected void onSetUp() throws Exception {
+
}
protected void onTearDown() throws Exception {
+
}
- public void testMinimalProcess() throws Exception {
- KnowledgeBase kbase = createKnowledgeBase("BPMN2-MinimalProcess.xml");
- StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
- ProcessInstance processInstance = ksession.startProcess("Minimal");
- assertTrue(processInstance.getState() == ProcessInstance.STATE_COMPLETED);
- }
-
- private KnowledgeBase createKnowledgeBase(String process) throws Exception {
+ public void testMinimalProcess() throws Exception {
+ KnowledgeBase kbase = createKnowledgeBase("BPMN2-MinimalProcess.xml");
+ StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
+ ProcessInstance processInstance = ksession.startProcess("Minimal");
+ assertTrue(processInstance.getState() == ProcessInstance.STATE_COMPLETED);
+ }
+
+ private KnowledgeBase createKnowledgeBase(String process) throws Exception {
+
ServiceReference serviceRef = bundleContext.getServiceReference( ServiceRegistry.class.getName() );
ServiceRegistry registry = (ServiceRegistry) bundleContext.getService( serviceRef );
+
KnowledgeBuilderFactoryService knowledgeBuilderFactoryService = registry.get( KnowledgeBuilderFactoryService.class );
KnowledgeBaseFactoryService knowledgeBaseFactoryService = registry.get( KnowledgeBaseFactoryService.class );
ResourceFactoryService resourceFactoryService = registry.get( ResourceFactoryService.class );
- KnowledgeBuilder kbuilder = knowledgeBuilderFactoryService.newKnowledgeBuilder();
- kbuilder.add(resourceFactoryService.newClassPathResource(process, BPMN2OsgiTest.class), ResourceType.BPMN2);
- if (!kbuilder.getErrors().isEmpty()) {
- for (KnowledgeBuilderError error: kbuilder.getErrors()) {
- System.err.println(error);
- }
- throw new IllegalArgumentException("Errors while parsing knowledge base");
- }
- KnowledgeBase kbase = knowledgeBaseFactoryService.newKnowledgeBase();
- kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
- return kbase;
- }
+ KnowledgeBuilderConfiguration conf = knowledgeBuilderFactoryService.newKnowledgeBuilderConfiguration();
+ ((PackageBuilderConfiguration) conf).initSemanticModules();
+ ((PackageBuilderConfiguration) conf).addSemanticModule(new BPMNSemanticModule());
+ ((PackageBuilderConfiguration) conf).addSemanticModule(new BPMN2SemanticModule());
+ ((PackageBuilderConfiguration) conf).addSemanticModule(new BPMNDISemanticModule());
+ ((PackageBuilderConfiguration) conf).addDialect("XPath", new XPathDialectConfiguration());
+
+ XmlProcessReader processReader = new XmlProcessReader(
+ ((PackageBuilderConfiguration) conf).getSemanticModules());
+ RuleFlowProcess p = (RuleFlowProcess)
+ processReader.read(BPMN2OsgiTest.class.getResourceAsStream(process));
+
+ KnowledgeBuilder kbuilder = knowledgeBuilderFactoryService.newKnowledgeBuilder(conf);
+
+ kbuilder.add(resourceFactoryService.newReaderResource(
+ new StringReader(XmlBPMNProcessDumper.INSTANCE.dump(p))), ResourceType.DRF);
+ if (!kbuilder.getErrors().isEmpty()) {
+ for (KnowledgeBuilderError error: kbuilder.getErrors()) {
+ System.err.println(error);
+ }
+ throw new IllegalArgumentException("Errors while parsing knowledge base");
+ }
+ KnowledgeBase kbase = knowledgeBaseFactoryService.newKnowledgeBase();
+ kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
+ return kbase;
+ }
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/osgi-bundles/org.milyn/org.drools.osgi.wrapper.milyn-smooks-javabean/pom.xml
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.milyn/org.drools.osgi.wrapper.milyn-smooks-javabean/pom.xml 2010-02-27 03:55:06 UTC (rev 31854)
+++ labs/jbossrules/trunk/osgi-bundles/org.milyn/org.drools.osgi.wrapper.milyn-smooks-javabean/pom.xml 2010-02-27 05:05:25 UTC (rev 31855)
@@ -47,6 +47,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
<resources>
Modified: labs/jbossrules/trunk/osgi-bundles/org.mvel/org.drools.osgi.wrapper.mvel2/pom.xml
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.mvel/org.drools.osgi.wrapper.mvel2/pom.xml 2010-02-27 03:55:06 UTC (rev 31854)
+++ labs/jbossrules/trunk/osgi-bundles/org.mvel/org.drools.osgi.wrapper.mvel2/pom.xml 2010-02-27 05:05:25 UTC (rev 31855)
@@ -49,6 +49,14 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
<resources>
Modified: labs/jbossrules/trunk/osgi-bundles/pom.xml
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/pom.xml 2010-02-27 03:55:06 UTC (rev 31854)
+++ labs/jbossrules/trunk/osgi-bundles/pom.xml 2010-02-27 05:05:25 UTC (rev 31855)
@@ -111,6 +111,13 @@
</execution-->
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
More information about the jboss-svn-commits
mailing list