[jboss-svn-commits] JBL Code SVN: r30995 - in labs/jbossrules/trunk/drools-container/drools-osgi: org.drools.osgi.api and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jan 9 00:19:16 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-01-09 00:19:13 -0500 (Sat, 09 Jan 2010)
New Revision: 30995
Added:
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/src/main/java/org/
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/src/main/java/org/drools/
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/src/main/java/org/drools/osgi/
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/src/main/java/org/drools/osgi/impl/
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/src/main/java/org/drools/osgi/impl/Activator.java
Modified:
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/.classpath
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/.project
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/build.properties
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/pom.xml
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/.classpath
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/.project
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/build.properties
labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/pom.xml
labs/jbossrules/trunk/drools-container/drools-osgi/pom.xml
Log:
JBRULES-2351 OSGi Ready
-refactor of dir structures, plus first service registrations
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/.classpath 2010-01-09 04:35:29 UTC (rev 30994)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/.classpath 2010-01-09 05:19:13 UTC (rev 30995)
@@ -4,11 +4,7 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="src" path="src/test/resources"/>
- <classpathentry exported="true" kind="lib" path="lib/antlr-runtime.jar"/>
<classpathentry exported="true" kind="lib" path="lib/drools-api.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/joda-time.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jxl.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/mvel2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes"/>
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/.project
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/.project 2010-01-09 04:35:29 UTC (rev 30994)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/.project 2010-01-09 05:19:13 UTC (rev 30995)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.drools.osgi</name>
+ <name>org.drools.osgi.api</name>
<comment></comment>
<projects>
</projects>
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/META-INF/MANIFEST.MF 2010-01-09 04:35:29 UTC (rev 30994)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/META-INF/MANIFEST.MF 2010-01-09 05:19:13 UTC (rev 30995)
@@ -1,24 +1,15 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Drools Runtime Plug-in
-Bundle-SymbolicName: org.drools.osgi;singleton:=true
+Bundle-Name: Drools Api plugin
+Bundle-SymbolicName: org.drools.osgi.api;singleton:=true
Bundle-Version: 5.1.0.SNAPSHOT
-Bundle-Activator: org.drools.Activator
+Bundle-Activator: org.drools.osgi.api.Activator
Bundle-Vendor: JBoss, a division of Red Hat
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jdt.core,
- org.eclipse.osgi;bundle-version="3.5.1"
-Eclipse-BuddyPolicy: registered
+Require-Bundle: org.eclipse.jdt.core
Bundle-ClassPath: .,
- lib/antlr-runtime.jar,
- lib/drools-api.jar,
- lib/joda-time.jar,
- lib/jxl.jar,
- lib/mvel2.jar
+ lib/drools-api.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Eclipse-ExtensibleAPI: true
-Export-Package: org.drools,
- org.drools.agent,
+Export-Package: org.drools.agent,
org.drools.builder,
org.drools.builder.conf,
org.drools.builder.help,
@@ -49,6 +40,6 @@
org.drools.time,
org.drools.util,
org.drools.vsm
-Import-Package: org.eclipse.core.runtime
+Import-Package: org.osgi.framework
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/build.properties 2010-01-09 04:35:29 UTC (rev 30994)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/build.properties 2010-01-09 05:19:13 UTC (rev 30995)
@@ -1,17 +1,15 @@
+src.includes = .,\
+ build.properties,\
+ lib/,\
+ META-INF/,\
+ src/,\
+ pom.xml
bin.includes = .,\
- src/main/resources/META-INF/,\
- plugin.xml,\
lib/,\
- lib/antlr-runtime.jar,\
- lib/drools-api.jar,\
- lib/joda-time.jar,\
- lib/jxl.jar,\
- lib/mvel2.jar
-src.includes = src/main/resources/META-INF/,\
- plugin.xml,\
- lib/,\
- .project,\
- .classpath
-jars.compile.order = .
+ META-INF/,\
+ build.properties,\
+ lib/drools-api.jar
source.. = src/main/java/,\
src/main/resources/
+output.. = target/classes/
+jars.compile.order = .
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/pom.xml 2010-01-09 04:35:29 UTC (rev 30994)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.api/pom.xml 2010-01-09 05:19:13 UTC (rev 30995)
@@ -8,10 +8,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>org.drools.osgi</artifactId>
+ <artifactId>org.drools.osgi.api</artifactId>
<packaging>jar</packaging>
- <name>Drools :: Container :: OSGi :: Runtime Plugin</name>
+ <name>Drools :: Container :: OSGi :: Api</name>
<build>
<plugins>
@@ -106,7 +106,7 @@
</exclusions>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.drools</groupId>
<artifactId>drools-bpmn2</artifactId>
<exclusions>
@@ -120,7 +120,7 @@
<artifactId>janino</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency-->
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/.classpath 2010-01-09 04:35:29 UTC (rev 30994)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/.classpath 2010-01-09 05:19:13 UTC (rev 30995)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/drools-bpmn2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/drools-compiler.jar"/>
<classpathentry exported="true" kind="lib" path="lib/drools-core.jar"/>
<classpathentry exported="true" kind="lib" path="lib/drools-decisiontables.jar"/>
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/.project
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/.project 2010-01-09 04:35:29 UTC (rev 30994)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/.project 2010-01-09 05:19:13 UTC (rev 30995)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.drools.osgi.fragment</name>
+ <name>org.drools.osgi.impl</name>
<comment></comment>
<projects>
</projects>
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/META-INF/MANIFEST.MF 2010-01-09 04:35:29 UTC (rev 30994)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/META-INF/MANIFEST.MF 2010-01-09 05:19:13 UTC (rev 30995)
@@ -1,13 +1,14 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Drools Runtime Fragment
-Bundle-SymbolicName: org.drools.osgi.fragment
+Bundle-Name: Drools Impl Plugin
+Bundle-SymbolicName: org.drools.osgi.impl
Bundle-Version: 5.1.0.SNAPSHOT
-Fragment-Host: org.drools.osgi;bundle-version="5.1.0.SNAPSHOT"
+Require-Bundle: org.drools.osgi.api
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: lib/drools-bpmn2.jar,
- lib/drools-compiler.jar,
+Bundle-ClassPath: lib/drools-compiler.jar,
lib/drools-core.jar,
lib/drools-decisiontables.jar,
lib/drools-templates.jar
Bundle-Vendor: JBoss, a division of Red Hat
+Import-Package: org.osgi.framework;version="1.5.0"
+Bundle-Activator: org.drools.osgi.impl.Activator
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/build.properties 2010-01-09 04:35:29 UTC (rev 30994)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/build.properties 2010-01-09 05:19:13 UTC (rev 30995)
@@ -1,11 +1,15 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
+src.includes = .,\
+ build.properties,\
lib/,\
- lib/drools-bpmn2.jar,\
- lib/drools-compiler.jar,\
- lib/drools-core.jar,\
- lib/drools-decisiontables.jar,\
- lib/drools-templates.jar
-src.includes = lib/
+ META-INF/,\
+ src/,\
+ pom.xml
+bin.includes = .,\
+ lib/,\
+ META-INF/,\
+ build.properties,\
+ lib/drools-api.jar
+source.. = src/main/java/,\
+ src/main/resources/
+output.. = target/classes/
+jars.compile.order = .
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/pom.xml 2010-01-09 04:35:29 UTC (rev 30994)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/pom.xml 2010-01-09 05:19:13 UTC (rev 30995)
@@ -8,10 +8,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>org.drools.osgi.fragment</artifactId>
+ <artifactId>org.drools.osgi.impl</artifactId>
<packaging>jar</packaging>
- <name>Drools :: Container :: OSGi :: Runtime Fragment</name>
+ <name>Drools :: Container :: OSGi :: Impl</name>
<build>
<plugins>
@@ -95,7 +95,7 @@
</exclusions>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.drools</groupId>
<artifactId>drools-bpmn2</artifactId>
<exclusions>
@@ -109,23 +109,7 @@
<artifactId>janino</artifactId>
</exclusion>
</exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-bpmn2</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>janino</groupId>
- <artifactId>janino</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ </dependency-->
</dependencies>
</project>
Added: labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/src/main/java/org/drools/osgi/impl/Activator.java
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/src/main/java/org/drools/osgi/impl/Activator.java (rev 0)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/org.drools.osgi.impl/src/main/java/org/drools/osgi/impl/Activator.java 2010-01-09 05:19:13 UTC (rev 30995)
@@ -0,0 +1,30 @@
+package org.drools.osgi.impl;
+
+import java.util.Hashtable;
+
+import org.drools.builder.KnowledgeBuilderProvider;
+import org.drools.builder.impl.KnowledgeBuilderProviderImpl;
+import org.drools.io.ResourceProvider;
+import org.drools.io.impl.ResourceProviderImpl;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
+
+public class Activator {
+ private ServiceRegistration kbuilderReg;
+ private ServiceRegistration resourceReg;
+
+ public void start(BundleContext bc) throws Exception {
+ this.kbuilderReg = bc.registerService( KnowledgeBuilderProvider.class.getName(),
+ new KnowledgeBuilderProviderImpl(),
+ new Hashtable() );
+ this.resourceReg = bc.registerService( ResourceProvider.class.getName(),
+ new ResourceProviderImpl(),
+ new Hashtable() );
+ System.out.println( "registered" );
+ }
+
+ public void stop(BundleContext bc) throws Exception {
+ this.kbuilderReg.unregister();
+ this.resourceReg.unregister();
+ }
+}
Modified: labs/jbossrules/trunk/drools-container/drools-osgi/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-osgi/pom.xml 2010-01-09 04:35:29 UTC (rev 30994)
+++ labs/jbossrules/trunk/drools-container/drools-osgi/pom.xml 2010-01-09 05:19:13 UTC (rev 30995)
@@ -13,8 +13,8 @@
<name>Drools :: Container :: OSGi</name>
<modules>
- <module>org.drools.osgi</module>
- <module>org.drools.osgi.fragment</module>
+ <module>org.drools.osgi.api</module>
+ <module>org.drools.osgi.impl</module>
</modules>
</project>
More information about the jboss-svn-commits
mailing list