diff --git a/drools-osgi-bundles/drools-osgi-bundles-distribution/pom.xml b/drools-osgi-bundles/drools-osgi-bundles-distribution/pom.xml index 1c78bd0..36fd774 100644 --- a/drools-osgi-bundles/drools-osgi-bundles-distribution/pom.xml +++ b/drools-osgi-bundles/drools-osgi-bundles-distribution/pom.xml @@ -68,7 +68,7 @@ - + org.objectweb.asm com.springsource.org.objectweb.asm 1.5.3 @@ -158,7 +158,7 @@ org.springframework org.springframework.expression - 3.0.0.RELEASE + ${spring.maven.artifact.version} diff --git a/drools-osgi-bundles/org.drools.osgi.test/pom.xml b/drools-osgi-bundles/org.drools.osgi.test/pom.xml index a18e2d1..8951879 100644 --- a/drools-osgi-bundles/org.drools.osgi.test/pom.xml +++ b/drools-osgi-bundles/org.drools.osgi.test/pom.xml @@ -20,8 +20,97 @@ org.apache.maven.plugins maven-surefire-plugin - + + + + + org.osgi.framework.system.packages.extra + + org.apache.cxf; + org.apache.cxf.attachment; + org.apache.cxf.binding; + org.apache.cxf.binding.soap; + org.apache.cxf.binding.soap.interceptor; + org.apache.cxf.binding.soap.model; + org.apache.cxf.bus.spring; + org.apache.cxf.common.classloader; + org.apache.cxf.common.i18n; + org.apache.cxf.common.injection; + org.apache.cxf.common.logging; + org.apache.cxf.common.util; + org.apache.cxf.configuration; + org.apache.cxf.configuration.blueprint; + org.apache.cxf.configuration.spring; + org.apache.cxf.continuations; + org.apache.cxf.databinding; + org.apache.cxf.databinding.source; + org.apache.cxf.endpoint; + org.apache.cxf.feature; + org.apache.cxf.frontend; + org.apache.cxf.headers; + org.apache.cxf.helpers; + org.apache.cxf.interceptor; + org.apache.cxf.io; + org.apache.cxf.jaxb; + org.apache.cxf.jaxrs; + org.apache.cxf.jaxrs.client; + org.apache.cxf.jaxrs.impl; + org.apache.cxf.jaxrs.model; + org.apache.cxf.jaxrs.utils; + org.apache.cxf.jaxws; + org.apache.cxf.jaxws.context; + org.apache.cxf.jaxws.handler; + org.apache.cxf.jaxws.support; + org.apache.cxf.message; + org.apache.cxf.phase; + org.apache.cxf.resource; + org.apache.cxf.security; + org.apache.cxf.service; + org.apache.cxf.service.factory; + org.apache.cxf.service.invoker; + org.apache.cxf.service.model; + org.apache.cxf.staxutils; + org.apache.cxf.transport; + org.apache.cxf.version; + org.apache.cxf.ws.addressing; + org.apache.cxf.wsdl; + org.apache.cxf.wsdl11;version="2.4.4", + javax.wsdl, + javax.wsdl.extensions, + javax.wsdl.extensions.http, + javax.wsdl.extensions.mime, + javax.wsdl.extensions.schema, + javax.wsdl.extensions.soap, + javax.wsdl.extensions.soap12, + javax.wsdl.factory, + javax.wsdl.xml, + javax.xml.ws, + javax.xml.ws.handler, + javax.xml.ws.handler.soap, + javax.xml.ws.http, + javax.xml.ws.soap, + javax.xml.ws.spi, + javax.xml.ws.spi.http, + javax.xml.ws.wsaddressing, + org.apache.ws.commons.schema;version=2.0, + org.apache.ws.commons.schema.constants;version=2.0, + org.apache.ws.commons.schema.extensions;version=2.0, + org.apache.ws.commons.schema.resolver;version=2.0, + org.apache.ws.commons.schema.utils;version=2.0, + com.sun.mirror.apt, + com.sun.mirror.declaration, + com.sun.mirror.type, + com.sun.mirror.util,com.sun.tools.xjc, + com.sun.tools.xjc.outline, + com.sun.tools.xjc.model, + com.sun.tools.xjc.Options, + com.sun.codemodel, + javax.mail,javax.mail.internet, + org.jbpm.persistence, + org.springframework.orm.jpa;version="2.5.0", + org.antlr.runtime;org.antlr.runtime.tree;version="3.4.0" + + propertyValue ${project.build.directory} @@ -72,18 +161,30 @@ org.drools + drools-spring + + + org.drools + drools-camel + + + org.drools drools-decisiontables - + + org.drools + drools-persistence-jpa + org.jbpm jbpm-flow org.jbpm + jbpm-persistence-jpa + + + org.jbpm jbpm-bpmn2 @@ -106,6 +207,24 @@ + javax.xml.bind + jaxb-api + 2.2.2 + + + + org.apache.neethi + neethi + 3.0.1 + + + + org.apache.ws.commons.schema + XmlSchema + 1.4.7 + + + org.junit com.springsource.org.junit 4.8.1 @@ -120,6 +239,27 @@ + org.springframework + spring-orm + ${spring.maven.artifact.version} + test + + + + org.springframework + spring-jdbc + ${spring.maven.artifact.version} + test + + + + org.springframework + spring-tx + ${spring.maven.artifact.version} + test + + + org.springframework.osgi org.springframework.osgi.test ${spring.osgi.version} @@ -152,6 +292,63 @@ 2.2.3 test + + + asm + asm + 2.2.3 + test + + + + javax.ws.rs + jsr311-api + 1.1 + test + + + + org.fusesource.commonman + commons-management + 1.0 + test + + + + org.apache.camel + camel-core + ${camel.ver} + test + + + + org.apache.camel + camel-cxf + ${camel.ver} + test + + + + org.apache.camel + camel-spring + ${camel.ver} + test + + + + org.apache.cxf + cxf-bundle + 2.4.4 + test + + + + wsdl4j + wsdl4j + 1.6.2 + test + + - + diff --git a/drools-osgi-bundles/org.drools.osgi.test/src/test/filtered-resources/boot-bundles.properties b/drools-osgi-bundles/org.drools.osgi.test/src/test/filtered-resources/boot-bundles.properties index e59cc71..c792ee1 100644 --- a/drools-osgi-bundles/org.drools.osgi.test/src/test/filtered-resources/boot-bundles.properties +++ b/drools-osgi-bundles/org.drools.osgi.test/src/test/filtered-resources/boot-bundles.properties @@ -11,7 +11,7 @@ # elements that have to be ignored should star with # ignore -# Note: inner placeholders are not supported. +# Note: inner placeholders are not supported. # # common properties @@ -27,6 +27,7 @@ ignore.junit.version=4.8.1 ignore.spring.version=3.0.0.RELEASE ignore.spring.osgi.version=1.2.1 ignore.asm.version=2.2.3 +ignore.camel.version=2.4.0 # groupIds ignore.spring.groupId=org.springframework @@ -117,7 +118,7 @@ com.sun.xml,com.springsource.com.sun.xml.bind.jaxb1,2.1.7 com.sun.msv,com.springsource.com.sun.msv.datatype,0.0.0.20060615 org.relaxng,com.springsource.org.relaxng.datatype,1.0.0 net.sourceforge.iso-relax,com.springsource.org.iso_relax.verifier,0.0.0.20041111 -com.sun.xml,com.springsource.com.sun.tools.xjc,2.1.7 +#com.sun.xml,com.springsource.com.sun.tools.xjc,2.1.7 com.sun.xml,com.springsource.com.sun.xml.fastinfoset,1.2.2 org.jvnet.staxex,com.springsource.org.jvnet.staxex,1.0.0 @@ -126,8 +127,10 @@ edu.oswego.cs.concurrent,com.springsource.edu.oswego.cs.dl.util.concurrent,1.3.4 # aop alliance org.aopalliance,com.springsource.org.aopalliance,1.0.0 # asm +#org.objectweb.asm,com.springsource.org.objectweb.asm,3.1.0 org.objectweb.asm,com.springsource.org.objectweb.asm,2.2.3 -org.objectweb.asm,com.springsource.org.objectweb.asm,1.5.3 +#org.springframework,spring-asm,${ignore.spring.version} +#org.objectweb.asm,com.springsource.org.objectweb.asm,1.5.3 org.springframework,org.springframework.asm,${ignore.spring.version} org.apache.ant,com.springsource.org.apache.tools.ant,1.8.1 @@ -171,10 +174,10 @@ ${ignore.spring.groupId},org.springframework.context,${ignore.spring.version} ${ignore.spring.groupId},org.springframework.context.support,${ignore.spring.version} ${ignore.spring.groupId},org.springframework.core,${ignore.spring.version} ${ignore.spring.groupId},org.springframework.expression,${ignore.spring.version} -#${ignore.spring.groupId},org.springframework.jdbc,${ignore.spring.version} -#${ignore.spring.groupId},org.springframework.orm,${ignore.spring.version} +${ignore.spring.groupId},spring-jdbc,${ignore.spring.version} +${ignore.spring.groupId},spring-orm,${ignore.spring.version} ${ignore.spring.groupId},org.springframework.test,${ignore.spring.version} -#${ignore.spring.groupId},org.springframework.transaction,${ignore.spring.version} +${ignore.spring.groupId},spring-tx,${ignore.spring.version} #${ignore.spring.groupId},org.springframework.web,${ignore.spring.version} #Security @@ -193,6 +196,15 @@ ${ignore.spring.osgi.groupId},org.springframework.osgi.test,${ignore.spring.osgi com.h2database,com.springsource.org.h2,1.0.71 +org.apache.neethi,neethi,3.0.1 +javax.ws.rs,jsr311-api,1.1 +javax.xml.bind,jaxb-api,2.2.2 +org.fusesource.commonman,commons-management,1.0 +org.apache.camel,camel-core,${ignore.camel.version} +org.apache.camel,camel-cxf,${ignore.camel.version} +org.apache.camel,camel-spring,${ignore.camel.version} + +org.jbpm,jbpm-persistence-jpa,${ignore.jbpm.version} org.drools,knowledge-api,${ignore.drools.version} org.drools,knowledge-internal-api,${ignore.drools.version} org.drools,drools-core,${ignore.drools.version} @@ -201,7 +213,7 @@ org.drools,drools-compiler,${ignore.drools.version} org.jbpm,jbpm-flow-builder,${ignore.jbpm.version} org.drools,drools-templates,${ignore.drools.version} org.drools,drools-decisiontables,${ignore.drools.version} +org.drools,drools-spring,${ignore.drools.version} +org.drools,drools-camel,${ignore.drools.version} org.jbpm,jbpm-bpmn2,${ignore.jbpm.version} -#org.drools,drools-persistence-jpa,${ignore.drools.version} - - +org.drools,drools-persistence-jpa,${ignore.drools.version} diff --git a/drools-osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java b/drools-osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java index 18176ea..01c5138 100644 --- a/drools-osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java +++ b/drools-osgi-bundles/org.drools.osgi.test/src/test/java/org/drools/osgi/integrationtests/SimpleOsgiTest.java @@ -17,7 +17,9 @@ package org.drools.osgi.integrationtests; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.drools.KnowledgeBase; import org.drools.KnowledgeBaseConfiguration; @@ -52,7 +54,7 @@ public class SimpleOsgiTest extends AbstractDroolsSpringDMTest { } protected void onTearDown() throws Exception { - + } @Test @@ -66,11 +68,15 @@ public class SimpleOsgiTest extends AbstractDroolsSpringDMTest { public void testOsgiEnvironment() throws Exception { Bundle[] bundles = bundleContext.getBundles(); System.out.println( "bundles: " ); + Set bundleNames = new HashSet(); for ( int i = 0; i < bundles.length; i++ ) { System.out.print( bundles[i].getSymbolicName() + ":" + bundles[i].getState() ); System.out.print( ", " ); + bundleNames.add(bundles[i].getSymbolicName()); } System.out.println(); + assertTrue(bundleNames.contains("org.drools.spring")); + assertTrue(bundleNames.contains("org.drools.camel")); } @Test @@ -79,7 +85,7 @@ public class SimpleOsgiTest extends AbstractDroolsSpringDMTest { ServiceRegistry registry = (ServiceRegistry) bundleContext.getService( serviceRef ); KnowledgeBuilderFactoryService knowledgeBuilderFactoryService = registry.get( KnowledgeBuilderFactoryService.class ); - + KnowledgeBaseFactoryService knowledgeBaseFactoryService = registry.get( KnowledgeBaseFactoryService.class ); ResourceFactoryService resourceFactoryService = registry.get( ResourceFactoryService.class ); @@ -107,7 +113,7 @@ public class SimpleOsgiTest extends AbstractDroolsSpringDMTest { throw new RuntimeException( kbuilder.getErrors().toString() ); } - KnowledgeBaseConfiguration kbaseConf = knowledgeBaseFactoryService.newKnowledgeBaseConfiguration( null, + KnowledgeBaseConfiguration kbaseConf = knowledgeBaseFactoryService.newKnowledgeBaseConfiguration( null, getClass().getClassLoader() ); KnowledgeBase kbase = knowledgeBaseFactoryService.newKnowledgeBase( kbaseConf ); @@ -119,7 +125,7 @@ public class SimpleOsgiTest extends AbstractDroolsSpringDMTest { ksession.insert( new Person( "name", 34 ) ); - + ksession.fireAllRules(); ksession.dispose(); diff --git a/drools-osgi-bundles/pom.xml b/drools-osgi-bundles/pom.xml index e45163f..0c0b26c 100644 --- a/drools-osgi-bundles/pom.xml +++ b/drools-osgi-bundles/pom.xml @@ -14,11 +14,11 @@ Drools OSGi bundles multiproject Produces OSGi enabled Drools Expert and Fusions jars. - + - - com.springsource.repository.bundles.release - SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases + + com.springsource.repository.bundles.release + SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases http://repository.springsource.com/maven/bundles/release true @@ -30,7 +30,7 @@ com.springsource.repository.bundles.external - SpringSource Enterprise Bundle Repository - External Bundle Releases + SpringSource Enterprise Bundle Repository - External Bundle Releases http://repository.springsource.com/maven/bundles/external true @@ -39,13 +39,14 @@ false - + - + 3.0.0.RELEASE 1.2.1 3.5.1 + 2.4.0