[jboss-svn-commits] JBL Code SVN: r31082 - in labs/jbossrules/trunk: drools-api/META-INF and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jan 14 04:57:53 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-01-14 04:57:53 -0500 (Thu, 14 Jan 2010)
New Revision: 31082
Modified:
labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-api/pom.xml
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/osgi/api/Activator.java
labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-core/pom.xml
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/Activator.java
labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
Log:
JBRULES-2351 OSGi Ready
-fidling around with service tracker
Modified: labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF 2010-01-14 09:38:38 UTC (rev 31081)
+++ labs/jbossrules/trunk/drools-api/META-INF/MANIFEST.MF 2010-01-14 09:57:53 UTC (rev 31082)
@@ -1,122 +1,57 @@
Manifest-Version: 1.0
+Bundle-Activator: org.drools.osgi.api.Activator
Created-By: 1.5.0_16 (Sun Microsystems Inc.)
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: com.sun.tools.xjc;version="2.1";resolution:=optional,
- com.thoughtworks.xstream;version="1.3";resolution:=optional,
- javax.management;resolution:=optional,
- javax.xml.bind;version="2.1";resolution:=optional,
- net.sf.jxls.reader;resolution:=optional,
- org.drools;version="5.1",
- org.drools.agent;version="5.1",
- org.drools.builder;version="5.1",
- org.drools.builder.conf;version="5.1",
- org.drools.builder.help;version="5.1",
- org.drools.command;version="5.1",
- org.drools.command.impl;version="5.1",
- org.drools.conf;version="5.1",
- org.drools.definition;version="5.1",
- org.drools.definition.process;version="5.1",
- org.drools.definition.rule;version="5.1",
- org.drools.definition.type;version="5.1",
- org.drools.event;version="5.1",
- org.drools.event.io;version="5.1",
- org.drools.event.knowledgebase;version="5.1",
- org.drools.event.process;version="5.1",
- org.drools.event.rule;version="5.1",
- org.drools.io;version="5.1",
- org.drools.logger;version="5.1",
- org.drools.management;version="5.1",
- org.drools.marshalling;version="5.1",
- org.drools.osgi.api;version="5.1",
- org.drools.persistence.jpa;version="5.1",
- org.drools.runtime;version="5.1",
- org.drools.runtime.conf;version="5.1",
- org.drools.runtime.help;version="5.1",
- org.drools.runtime.pipeline;version="5.1",
- org.drools.runtime.process;version="5.1",
- org.drools.runtime.rule;version="5.1",
- org.drools.task.service;version="5.1",
- org.drools.time;version="5.1",
- org.drools.util;version="5.1",
- org.drools.vsm;version="5.1",
- org.milyn;resolution:=optional,
- org.osgi.framework;version="1.5";resolution:=optional,
- org.osgi.util.tracker;version="1.4";resolution:=optional,
- org.quartz;version="1.6";resolution:=optional
-Bnd-LastModified: 1263459104455
-Export-Package: org.drools;version="5.1.0.SNAPSHOT";
- uses:="org.drools.io,
- org.drools.event.knowledgebase,
- org.drools.runtime,
- org.drools.definition,
- org.drools.definition.type,
- org.drools.definition.rule,
- org.drools.definition.process,
- org.drools.conf,
- org.drools.util.internal",
- org.drools.agent;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime,org.drools,org.drools.io",
- org.drools.builder;version="5.1.0.SNAPSHOT";
- uses:="org.drools.io,
- org.drools.definition,
- org.drools,
- org.drools.builder.conf,
- org.drools.util.internal",
- org.drools.builder.conf;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime.rule,org.drools.conf",
- org.drools.builder.help;version="5.1.0.SNAPSHOT";
- uses:="com.sun.tools.xjc,
- org.drools.builder,
- org.drools.io,
- org.drools,
- javax.xml.bind",
- org.drools.command;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime,org.drools.runtime.rule",
- org.drools.command.impl;version="5.1.0.SNAPSHOT";uses:="org.drools.command",
- org.drools.conf;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime.rule",
- org.drools.definition;version="5.1.0.SNAPSHOT";uses:="org.drools.definition.rule,org.drools.definition.process",
- org.drools.definition.process;version="5.1.0.SNAPSHOT";uses:="org.drools.definition",
- org.drools.definition.rule;version="5.1.0.SNAPSHOT";uses:="org.drools.definition",
- org.drools.definition.type;version="5.1.0.SNAPSHOT",
- org.drools.event;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime,org.drools.event.rule,org.drools.event.process",
- org.drools.event.io;version="5.1.0.SNAPSHOT";uses:="org.drools",
- org.drools.event.knowledgebase;version="5.1.0.SNAPSHOT";uses:="org.drools.definition.rule,org.drools.definition,org.drools",
- org.drools.event.process;version="5.1.0.SNAPSHOT";uses:="org.drools.event,org.drools.runtime.process",
- org.drools.event.rule;version="5.1.0.SNAPSHOT";uses:="org.drools.event,org.drools.runtime.rule",
- org.drools.io;version="5.1.0.SNAPSHOT";uses:="org.drools,org.drools.event.io,org.drools.util.internal",
- org.drools.logger;version="5.1.0.SNAPSHOT";uses:="org.drools.event",
- org.drools.management;version="5.1.0.SNAPSHOT";uses:="javax.management",
- org.drools.marshalling;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime,org.drools",
- org.drools.osgi.api;version="5.1.0.SNAPSHOT";
- uses:="org.drools,
- org.osgi.framework,
- org.osgi.util.tracker,
- org.drools.util.internal",
- org.drools.persistence.jpa;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime,org.drools",
- org.drools.runtime;version="5.1.0.SNAPSHOT";
- uses:="org.drools.command,
- org.drools.time,
- org.drools.event,
- org.drools,
- org.drools.runtime.process,
- org.drools.runtime.rule,
- org.drools.runtime.conf",
- org.drools.runtime.conf;version="5.1.0.SNAPSHOT";uses:="org.drools.conf",
- org.drools.runtime.help;version="5.1.0.SNAPSHOT";uses:="com.thoughtworks.xstream,org.drools.time,org.quartz",
- org.drools.runtime.pipeline;version="5.1.0.SNAPSHOT";
- uses:="org.drools.runtime,
- javax.xml.bind,
- net.sf.jxls.reader,
- org.milyn,
- com.thoughtworks.xstream",
- org.drools.runtime.process;version="5.1.0.SNAPSHOT";uses:="org.drools.runtime",
- org.drools.runtime.rule;version="5.1.0.SNAPSHOT";uses:="org.drools.definition.rule,org.drools.runtime",
- org.drools.task.service;version="5.1.0.SNAPSHOT",
- org.drools.time;version="5.1.0.SNAPSHOT",
- org.drools.vsm;version="5.1.0.SNAPSHOT";
- uses:="org.drools.command,
- org.drools.runtime,
- org.drools.persistence.jpa,
- org.drools.builder,
- org.drools,
- org.drools.agent"
+Bnd-LastModified: 1263462703475
+Export-Package: org.drools.logger;uses:="org.drools.event";version="5.
+ 1.0.SNAPSHOT",org.drools.runtime;uses:="org.drools.command,org.drools
+ .time,org.drools.event,org.drools,org.drools.runtime.process,org.droo
+ ls.runtime.rule,org.drools.runtime.conf";version="5.1.0.SNAPSHOT",org
+ .drools.task.service;version="5.1.0.SNAPSHOT",org.drools.marshalling;
+ uses:="org.drools.runtime,org.drools";version="5.1.0.SNAPSHOT",org.dr
+ ools.runtime.rule;uses:="org.drools.definition.rule,org.drools.runtim
+ e";version="5.1.0.SNAPSHOT",org.drools.command;uses:="org.drools.runt
+ ime,org.drools.runtime.rule";version="5.1.0.SNAPSHOT",org.drools.time
+ ;version="5.1.0.SNAPSHOT",org.drools.management;uses:="javax.manageme
+ nt";version="5.1.0.SNAPSHOT",org.drools.event.process;uses:="org.droo
+ ls.event,org.drools.runtime.process";version="5.1.0.SNAPSHOT",org.dro
+ ols.event.io;uses:="org.drools";version="5.1.0.SNAPSHOT",org.drools.c
+ onf;uses:="org.drools.runtime.rule";version="5.1.0.SNAPSHOT",org.droo
+ ls.osgi.api;uses:="org.drools,org.drools.util,org.osgi.framework,org.
+ osgi.util.tracker";version="5.1.0.SNAPSHOT",org.drools;uses:="org.dro
+ ols.io,org.drools.event.knowledgebase,org.drools.runtime,org.drools.d
+ efinition,org.drools.definition.type,org.drools.definition.rule,org.d
+ rools.definition.process,org.drools.conf,org.drools.util";version="5.
+ 1.0.SNAPSHOT",org.drools.runtime.conf;uses:="org.drools.conf";version
+ ="5.1.0.SNAPSHOT",org.drools.runtime.process;uses:="org.drools.runtim
+ e";version="5.1.0.SNAPSHOT",org.drools.event.rule;uses:="org.drools.e
+ vent,org.drools.runtime.rule";version="5.1.0.SNAPSHOT",org.drools.bui
+ lder.help;uses:="com.sun.tools.xjc,org.drools.builder,org.drools.io,o
+ rg.drools,javax.xml.bind";version="5.1.0.SNAPSHOT",org.drools.vsm;use
+ s:="org.drools.command,org.drools.runtime,org.drools.persistence.jpa,
+ org.drools.builder,org.drools,org.drools.agent";version="5.1.0.SNAPSH
+ OT",org.drools.builder.conf;uses:="org.drools.runtime.rule,org.drools
+ .conf";version="5.1.0.SNAPSHOT",org.drools.definition;uses:="org.droo
+ ls.definition.rule,org.drools.definition.process";version="5.1.0.SNAP
+ SHOT",org.drools.definition.rule;uses:="org.drools.definition";versio
+ n="5.1.0.SNAPSHOT",org.drools.runtime.pipeline;uses:="org.drools.runt
+ ime,javax.xml.bind,net.sf.jxls.reader,org.milyn,com.thoughtworks.xstr
+ eam";version="5.1.0.SNAPSHOT",org.drools.runtime.help;uses:="com.thou
+ ghtworks.xstream,org.drools.time,org.quartz";version="5.1.0.SNAPSHOT"
+ ,org.drools.event.knowledgebase;uses:="org.drools.definition.rule,org
+ .drools.definition,org.drools";version="5.1.0.SNAPSHOT",org.drools.ev
+ ent;uses:="org.drools.runtime,org.drools.event.rule,org.drools.event.
+ process";version="5.1.0.SNAPSHOT",org.drools.persistence.jpa;uses:="o
+ rg.drools.runtime,org.drools";version="5.1.0.SNAPSHOT",org.drools.bui
+ lder;uses:="org.drools.io,org.drools.definition,org.drools,org.drools
+ .builder.conf,org.drools.util";version="5.1.0.SNAPSHOT",org.drools.io
+ ;uses:="org.drools,org.drools.event.io,org.drools.util";version="5.1.
+ 0.SNAPSHOT",org.drools.util;uses:="org.drools.builder,org.drools.io,o
+ rg.drools";version="5.1.0.SNAPSHOT",org.drools.command.impl;uses:="or
+ g.drools.command";version="5.1.0.SNAPSHOT",org.drools.definition.type
+ ;version="5.1.0.SNAPSHOT",org.drools.definition.process;uses:="org.dr
+ ools.definition";version="5.1.0.SNAPSHOT",org.drools.agent;uses:="org
+ .drools.runtime,org.drools,org.drools.io";version="5.1.0.SNAPSHOT"
Bundle-Version: 5.1.0.SNAPSHOT
Bundle-Name: Drools :: API
Bundle-Description: A rule production system
@@ -125,5 +60,4 @@
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.drools.api
Tool: Bnd-0.0.357
-Bundle-Activator: org.drools.osgi.api.Activator
-
+DynamicImport-Package: *
Modified: labs/jbossrules/trunk/drools-api/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-api/pom.xml 2010-01-14 09:38:38 UTC (rev 31081)
+++ labs/jbossrules/trunk/drools-api/pom.xml 2010-01-14 09:57:53 UTC (rev 31082)
@@ -97,9 +97,10 @@
<configuration>
<manifestLocation>META-INF</manifestLocation>
<instructions>
- <Import-Package>org.drools.*,*;resolution:=optional</Import-Package>
- <Export-Package>org.drools.*</Export-Package>
- <Bundle-Activator>org.drools.osgi.core.Activator</Bundle-Activator>
+ <Import-Package>!org.drools.*,*;resolution:=optional</Import-Package>
+ <Export-Package>org.drools.*</Export-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ <Bundle-Activator>org.drools.osgi.api.Activator</Bundle-Activator>
</instructions>
</configuration>
</plugin>
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/osgi/api/Activator.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/osgi/api/Activator.java 2010-01-14 09:38:38 UTC (rev 31081)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/osgi/api/Activator.java 2010-01-14 09:57:53 UTC (rev 31082)
@@ -54,6 +54,7 @@
public Object addingService(ServiceReference ref) {
Service service = (Service) bc.getService( ref );
+ System.out.println( "registering" + service );
ServiceRegistryImpl.getInstance().registerLocator( service.getClass().getInterfaces()[0], new ReturnInstance( service ) );
Modified: labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF 2010-01-14 09:38:38 UTC (rev 31081)
+++ labs/jbossrules/trunk/drools-compiler/META-INF/MANIFEST.MF 2010-01-14 09:57:53 UTC (rev 31082)
@@ -17,7 +17,7 @@
rg.mvel2.integration,org.mvel2.integration.impl,org.mvel2.optimizers,
org.mvel2.templates,org.mvel2.util,org.osgi.framework;version="1.5",o
rg.w3c.dom,org.xml.sax
-Bnd-LastModified: 1263459155537
+Bnd-LastModified: 1263462737582
Export-Package: org.drools.builder.impl;uses:="org.drools.compiler";ve
rsion="5.1.0.SNAPSHOT",org.drools.rule.builder;uses:="org.drools.comp
iler,org.mvel2.compiler,org.mvel2,org.drools.rule.builder.dialect.mve
Modified: labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF 2010-01-14 09:38:38 UTC (rev 31081)
+++ labs/jbossrules/trunk/drools-core/META-INF/MANIFEST.MF 2010-01-14 09:57:53 UTC (rev 31082)
@@ -12,7 +12,7 @@
ler,org.mvel2.debug,org.mvel2.integration,org.mvel2.integration.impl,
org.mvel2.optimizers,org.mvel2.templates,org.mvel2.util,org.osgi.fram
ework;version="1.5",org.w3c.dom,org.xml.sax,org.xml.sax.helpers
-Bnd-LastModified: 1263459132386
+Bnd-LastModified: 1263462717947
Export-Package: org.drools.process.instance.context.swimlane;uses:="or
g.drools.process.core.context.swimlane,org.drools.process.core,org.dr
ools.process.instance.context";version="5.1.0.SNAPSHOT",org.drools.pr
@@ -284,5 +284,5 @@
Tool: Bnd-0.0.357
Require-Bundle: org.drools.api;visibility:=reexport;bundle-version="5.
1.0.SNAPSHOT"
-DynamicImport-Package: org.drools.*
+DynamicImport-Package: *
Modified: labs/jbossrules/trunk/drools-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-core/pom.xml 2010-01-14 09:38:38 UTC (rev 31081)
+++ labs/jbossrules/trunk/drools-core/pom.xml 2010-01-14 09:57:53 UTC (rev 31082)
@@ -81,7 +81,7 @@
<Import-Package>!org.drools.*, *</Import-Package>
<Export-Package>!org.drools.reteoo.*,
org.drools.*</Export-Package>
- <DynamicImport-Package>org.drools.*</DynamicImport-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
<Bundle-Activator>org.drools.osgi.core.Activator</Bundle-Activator>
</instructions>
</configuration>
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/Activator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/Activator.java 2010-01-14 09:38:38 UTC (rev 31081)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/osgi/core/Activator.java 2010-01-14 09:57:53 UTC (rev 31082)
@@ -18,18 +18,18 @@
public void start(BundleContext bc) throws Exception {
System.out.println( "registering core services" );
-// this.resourceReg = bc.registerService( ResourceProvider.class.getName(),
-// new ResourceProviderImpl(),
-// new Hashtable() );
-// this.kbaseReg = bc.registerService( KnowledgeBaseProvider.class.getName(),
-// new KnowledgeBaseProviderImpl(),
-// new Hashtable() );
+ this.resourceReg = bc.registerService( ResourceProvider.class.getName(),
+ new ResourceProviderImpl(),
+ new Hashtable() );
+ this.kbaseReg = bc.registerService( KnowledgeBaseProvider.class.getName(),
+ new KnowledgeBaseProviderImpl(),
+ new Hashtable() );
System.out.println( "core services registered" );
}
public void stop(BundleContext bc) throws Exception {
-// this.resourceReg.unregister();
-// this.kbaseReg.unregister();
+ this.resourceReg.unregister();
+ this.kbaseReg.unregister();
}
}
Modified: labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF 2010-01-14 09:38:38 UTC (rev 31081)
+++ labs/jbossrules/trunk/drools-decisiontables/META-INF/MANIFEST.MF 2010-01-14 09:57:53 UTC (rev 31082)
@@ -4,7 +4,7 @@
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Import-Package: jxl;version="2.6",jxl.read.biff;version="2.6",org.osgi
.framework;version="1.5"
-Bnd-LastModified: 1263459169507
+Bnd-LastModified: 1263462751296
Export-Package: org.drools.decisiontable;uses:="org.drools.decisiontab
le.parser.csv,org.drools.decisiontable.parser,org.drools.decisiontabl
e.parser.xls";version="5.1.0.SNAPSHOT",org.drools.decisiontable.parse
Modified: labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF 2010-01-14 09:38:38 UTC (rev 31081)
+++ labs/jbossrules/trunk/drools-templates/META-INF/MANIFEST.MF 2010-01-14 09:57:53 UTC (rev 31082)
@@ -2,7 +2,7 @@
Created-By: 1.5.0_16 (Sun Microsystems Inc.)
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Import-Package: org.mvel2.templates
-Bnd-LastModified: 1263459166743
+Bnd-LastModified: 1263462749205
Export-Package: org.drools.template.jdbc;uses:="org.drools.template.pa
rser";version="5.1.0.SNAPSHOT",org.drools.template;uses:="org.drools.
template.parser,org.drools.template.objects";version="5.1.0.SNAPSHOT"
More information about the jboss-svn-commits
mailing list