[jboss-svn-commits] JBL Code SVN: r34274 - in labs/jbossrules/trunk: drools-compiler and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2010-07-29 00:20:12 -0400 (Thu, 29 Jul 2010)
New Revision: 34274

Modified:
   labs/jbossrules/trunk/drools-api/pom.xml
   labs/jbossrules/trunk/drools-compiler/pom.xml
   labs/jbossrules/trunk/drools-core/pom.xml
   labs/jbossrules/trunk/osgi-bundles/org.milyn/org.drools.osgi.wrapper.milyn-smooks-javabean/META-INF/MANIFEST.MF
Log:
JBRULES-2351 OSGi ready
-Added the api, core and compiler patches
-Replaced the require-bundles with the import-packages provided by the new Manifest, although left in exports until further clarification is given on why they aren't needed.

Modified: labs/jbossrules/trunk/drools-api/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-api/pom.xml	2010-07-29 00:56:32 UTC (rev 34273)
+++ labs/jbossrules/trunk/drools-api/pom.xml	2010-07-29 04:20:12 UTC (rev 34274)
@@ -100,7 +100,7 @@
                <instructions>
                   <Bundle-SymbolicName>org.drools.api;singleton:=true</Bundle-SymbolicName>
                   <_removeheaders>Ignore-Package</_removeheaders>
-                  <Import-Package>!org.drools.*,*;resolution:=optional</Import-Package>
+                  <Import-Package>!org.drools.*,*;resolution:=optional,com.sun.tools.xjc;resolution:=optional</Import-Package>                  
                   <Export-Package>org.drools.*</Export-Package>
                   <DynamicImport-Package>*</DynamicImport-Package>
                   <Bundle-Activator>org.drools.osgi.api.Activator</Bundle-Activator>

Modified: labs/jbossrules/trunk/drools-compiler/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/pom.xml	2010-07-29 00:56:32 UTC (rev 34273)
+++ labs/jbossrules/trunk/drools-compiler/pom.xml	2010-07-29 04:20:12 UTC (rev 34274)
@@ -221,8 +221,11 @@
                   <_removeheaders>Ignore-Package</_removeheaders> 
                   <Bundle-SymbolicName>org.drools.compiler;singleton:=true</Bundle-SymbolicName>
                   <Require-Bundle>org.drools.core;bundle-version="${pom.version}"</Require-Bundle>
-                  <Import-Package>!org.drools.*, *</Import-Package>
-                  <Export-Package>!org.drools.commons.*, !org.drools.lang.*, org.drools.builder.impl, 
+                  <Import-Package>!org.drools.*,
+                  <!-- java compilers are optional: only need one at most -->
+                  org.codehaus.janino.*;resolution:=optional,org.eclipse.jdt.*;resolution:=optional,
+                   *</Import-Package>
+                  <Export-Package>org.drools.lang.descr,!org.drools.commons.*, !org.drools.lang.*, org.drools.builder.impl,   
                   <!-- add this one manually as BND seems to miss it out -->
                   org.drools.*</Export-Package>
                   <DynamicImport-Package>*</DynamicImport-Package>

Modified: labs/jbossrules/trunk/drools-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-core/pom.xml	2010-07-29 00:56:32 UTC (rev 34273)
+++ labs/jbossrules/trunk/drools-core/pom.xml	2010-07-29 04:20:12 UTC (rev 34274)
@@ -165,9 +165,8 @@
 					<instructions>
 						<_removeheaders>Ignore-Package</_removeheaders>
 						<Require-Bundle>org.drools.api;visibility:=reexport;bundle-version="${pom.version}"</Require-Bundle>
-						<Import-Package>!org.drools.*, *</Import-Package>
-						<Export-Package>!org.drools.reteoo.*,
-							org.drools.*</Export-Package>
+                	    <Import-Package>!org.drools.*, *,org.osgi.util.tracker</Import-Package>
+                        <Export-Package>!org.drools.visualize,org.drools.reteoo.*, org.drools.*</Export-Package>
 						<DynamicImport-Package>*</DynamicImport-Package>
 						<Bundle-Activator>org.drools.osgi.core.Activator</Bundle-Activator>
 					</instructions>

Modified: labs/jbossrules/trunk/osgi-bundles/org.milyn/org.drools.osgi.wrapper.milyn-smooks-javabean/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.milyn/org.drools.osgi.wrapper.milyn-smooks-javabean/META-INF/MANIFEST.MF	2010-07-29 00:56:32 UTC (rev 34273)
+++ labs/jbossrules/trunk/osgi-bundles/org.milyn/org.drools.osgi.wrapper.milyn-smooks-javabean/META-INF/MANIFEST.MF	2010-07-29 04:20:12 UTC (rev 34274)
@@ -6,14 +6,22 @@
 Bundle-Vendor: JBoss
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
-Require-Bundle: com.springsource.org.apache.log4j;bundle-version="1.2.15",
- com.springsource.org.apache.commons.lang;bundle-version="2.4.0",
- com.springsource.org.apache.commons.logging;bundle-version="1.1.1",
- com.springsource.org.apache.xmlcommons;bundle-version="1.3.4",
- com.springsource.com.thoughtworks.xstream;bundle-version="1.3.1",
- com.springsource.freemarker;bundle-version="2.3.15",
- com.springsource.javassist;bundle-version="3.9.0",
- org.drools.osgi.wrapper.mvel2;bundle-version="2.0.16"
+Import-Package: com.thoughtworks.xstream,
+ com.thoughtworks.xstream.io.xml,
+ com.wutka.dtd;resolution:=optional,
+ freemarker.cache;resolution:=optional,
+ freemarker.template;resolution:=optional,
+ freemarker.template.utility;resolution:=optional,
+ javassist,
+ javax.servlet,
+ org.apache.commons.lang,
+ org.apache.commons.lang.builder,
+ org.apache.commons.logging,
+ org.hsqldb;resolution:=optional,
+ org.mvel2,
+ org.mvel2.integration,
+ org.mvel2.integration.impl,
+ org.mvel2.templates
 Export-Package: org.milyn,
  org.milyn.annotation,
  org.milyn.assertion,