[jboss-svn-commits] JBL Code SVN: r31123 - in labs/jbossrules/trunk/bundle-repository: org.mvel/mvel2 and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Jan 18 12:48:43 EST 2010


Author: mark.proctor at jboss.com
Date: 2010-01-18 12:48:43 -0500 (Mon, 18 Jan 2010)
New Revision: 31123

Modified:
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/build.properties
   labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml
   labs/jbossrules/trunk/bundle-repository/pom.xml
Log:
JBRULES-2351 OSGi Ready
-tweaking the MVEL wrapper jar

Modified: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF	2010-01-18 13:30:21 UTC (rev 31122)
+++ labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/META-INF/MANIFEST.MF	2010-01-18 17:48:43 UTC (rev 31123)
@@ -1,38 +1,80 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: mvel2
-Bundle-SymbolicName: org.drools.osgi.wrapper.mvel2
-Bundle-Version: 2.0.12
-Bundle-Vendor: JBoss
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: 
- .
-Export-Package: 
- org.mvel2,
- org.mvel2.asm,
- org.mvel2.asm.signature,
- org.mvel2.asm.util,
- org.mvel2.ast,
- org.mvel2.compiler,
- org.mvel2.conversion,
- org.mvel2.debug,
- org.mvel2.integration,
- org.mvel2.integration.impl,
- org.mvel2.math,
- org.mvel2.optimizers,
- org.mvel2.optimizers.dynamic,
- org.mvel2.optimizers.impl.asm,
- org.mvel2.optimizers.impl.refl,
- org.mvel2.optimizers.impl.refl.collection,
- org.mvel2.optimizers.impl.refl.nodes,
- org.mvel2.sh,
- org.mvel2.sh.command.basic,
- org.mvel2.sh.command.file,
- org.mvel2.sh.text,
- org.mvel2.templates,
- org.mvel2.templates.res,
- org.mvel2.templates.util,
- org.mvel2.templates.util.io,
- org.mvel2.util
-DynamicImport-Package: *
-
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: 1.5.0_16 (Sun Microsystems Inc.)
+Built-By: mproctor
+Build-Jdk: 1.5.0_16
+Package: org.mvel2
+Main-Class: org.mvel2.sh.Main
+Bundle-Name: mvel2
+Import-Package: org.mvel2;version="2.0",org.mvel2.asm;version="2.0",or
+ g.mvel2.asm.signature;version="2.0",org.mvel2.asm.util;version="2.0",
+ org.mvel2.ast;version="2.0",org.mvel2.compiler;version="2.0",org.mvel
+ 2.conversion;version="2.0",org.mvel2.debug;version="2.0",org.mvel2.in
+ tegration;version="2.0",org.mvel2.integration.impl;version="2.0",org.
+ mvel2.math;version="2.0",org.mvel2.optimizers;version="2.0",org.mvel2
+ .optimizers.dynamic;version="2.0",org.mvel2.optimizers.impl.asm;versi
+ on="2.0",org.mvel2.optimizers.impl.refl;version="2.0",org.mvel2.optim
+ izers.impl.refl.collection;version="2.0",org.mvel2.optimizers.impl.re
+ fl.nodes;version="2.0",org.mvel2.sh;version="2.0",org.mvel2.sh.comman
+ d.basic;version="2.0",org.mvel2.sh.command.file;version="2.0",org.mve
+ l2.sh.text;version="2.0",org.mvel2.templates;version="2.0",org.mvel2.
+ templates.res;version="2.0",org.mvel2.templates.util;version="2.0",or
+ g.mvel2.templates.util.io;version="2.0",org.mvel2.util;version="2.0",
+ sun.misc
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.mvel2
+Tool: Bnd-0.0.357
+Bnd-LastModified: 1263804487520
+Export-Package: org.mvel2;uses:="org.mvel2.util,org.mvel2.conversion,o
+ rg.mvel2.optimizers.impl.refl.nodes,org.mvel2.compiler,org.mvel2.inte
+ gration,org.mvel2.integration.impl,org.mvel2.ast,org.mvel2.debug";ver
+ sion="2.0.12",org.mvel2.asm;version="2.0.12",org.mvel2.asm.signature;
+ version="2.0.12",org.mvel2.asm.util;uses:="org.mvel2.asm,org.mvel2.as
+ m.signature";version="2.0.12",org.mvel2.ast;uses:="org.mvel2,org.mvel
+ 2.integration,org.mvel2.compiler,org.mvel2.debug,org.mvel2.util,org.m
+ vel2.optimizers,org.mvel2.math,org.mvel2.integration.impl";version="2
+ .0.12",org.mvel2.compiler;uses:="org.mvel2,org.mvel2.ast,org.mvel2.in
+ tegration,org.mvel2.util,org.mvel2.optimizers,org.mvel2.integration.i
+ mpl,org.mvel2.optimizers.impl.refl.nodes";version="2.0.12",org.mvel2.
+ conversion;uses:="org.mvel2,org.mvel2.util,org.mvel2.compiler";versio
+ n="2.0.12",org.mvel2.debug;uses:="org.mvel2.ast,org.mvel2.compiler,or
+ g.mvel2.integration,org.mvel2.util,org.mvel2";version="2.0.12",org.mv
+ el2.integration;uses:="org.mvel2.ast";version="2.0.12",org.mvel2.inte
+ gration.impl;uses:="org.mvel2,org.mvel2.integration,org.mvel2.ast,org
+ .mvel2.util";version="2.0.12",org.mvel2.math;uses:="org.mvel2,org.mve
+ l2.debug,org.mvel2.util";version="2.0.12",org.mvel2.optimizers;uses:=
+ "org.mvel2,org.mvel2.compiler,org.mvel2.util,org.mvel2.integration,or
+ g.mvel2.optimizers.impl.asm,org.mvel2.optimizers.dynamic,org.mvel2.op
+ timizers.impl.refl";version="2.0.12",org.mvel2.optimizers.dynamic;use
+ s:="org.mvel2.compiler,sun.misc,org.mvel2.util,org.mvel2,org.mvel2.in
+ tegration,org.mvel2.optimizers,org.mvel2.optimizers.impl.asm";version
+ ="2.0.12",org.mvel2.optimizers.impl.asm;uses:="org.mvel2.asm,org.mvel
+ 2.compiler,org.mvel2.integration,org.mvel2.util,org.mvel2.optimizers,
+ org.mvel2,org.mvel2.ast,org.mvel2.optimizers.impl.refl.nodes";version
+ ="2.0.12",org.mvel2.optimizers.impl.refl;uses:="org.mvel2.compiler,or
+ g.mvel2.integration,org.mvel2.optimizers.impl.refl.collection,org.mve
+ l2.util,org.mvel2.optimizers,org.mvel2,org.mvel2.ast,org.mvel2.optimi
+ zers.impl.refl.nodes";version="2.0.12",org.mvel2.optimizers.impl.refl
+ .collection;uses:="org.mvel2.integration,org.mvel2.compiler,org.mvel2
+ ,org.mvel2.util";version="2.0.12",org.mvel2.optimizers.impl.refl.node
+ s;uses:="org.mvel2.integration,org.mvel2.compiler,org.mvel2,org.mvel2
+ .util,org.mvel2.ast,org.mvel2.optimizers";version="2.0.12",org.mvel2.
+ sh;uses:="org.mvel2,org.mvel2.templates,org.mvel2.integration,org.mve
+ l2.util,org.mvel2.sh.command.basic,org.mvel2.integration.impl,org.mve
+ l2.sh.command.file";version="2.0.12",org.mvel2.sh.command.basic;uses:
+ ="org.mvel2.sh,org.mvel2.sh.text,org.mvel2.util,org.mvel2";version="2
+ .0.12",org.mvel2.sh.command.file;uses:="org.mvel2.sh";version="2.0.12
+ ",org.mvel2.sh.text;uses:="org.mvel2.util";version="2.0.12",org.mvel2
+ .templates;uses:="org.mvel2.templates.res,org.mvel2,org.mvel2.templat
+ es.util,org.mvel2.util,org.mvel2.templates.util.io,org.mvel2.integrat
+ ion,org.mvel2.integration.impl";version="2.0.12",org.mvel2.templates.
+ res;uses:="org.mvel2,org.mvel2.integration,org.mvel2.templates.util,o
+ rg.mvel2.util,org.mvel2.templates,org.mvel2.integration.impl";version
+ ="2.0.12",org.mvel2.templates.util;uses:="org.mvel2.util,org.mvel2.te
+ mplates.res,org.mvel2.templates";version="2.0.12",org.mvel2.templates
+ .util.io;uses:="org.mvel2.templates.util,org.mvel2.util";version="2.0
+ .12",org.mvel2.util;uses:="org.mvel2.ast,org.mvel2.integration,org.mv
+ el2,org.mvel2.compiler,org.mvel2.integration.impl,org.mvel2.math,sun.
+ misc";version="2.0.12"
+Bundle-Version: 2.0.12
+

Modified: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/build.properties
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/build.properties	2010-01-18 13:30:21 UTC (rev 31122)
+++ labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/build.properties	2010-01-18 17:48:43 UTC (rev 31123)
@@ -1,17 +1,11 @@
 src.includes = .,\
                build.properties,\
-               lib/,\
                META-INF/,\
                src/,\
                pom.xml
 bin.includes = .,\
-               lib/,\
                META-INF/,\
-               lib/,\
-               lib/commons-jexl.jar,\
-               lib/jxls-reader.jar,\
                build.properties,\
-               lib/mvel2.jar
 source.. = src/main/java/,\
            src/main/resources/
 output.. = target/classes/     

Modified: labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml	2010-01-18 13:30:21 UTC (rev 31122)
+++ labs/jbossrules/trunk/bundle-repository/org.mvel/mvel2/pom.xml	2010-01-18 17:48:43 UTC (rev 31123)
@@ -8,6 +8,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
+  <groupId>org.mvel</groupId>
   <artifactId>org.drools.osgi.wrapper.mvel2</artifactId>
   <version>2.0.12</version>
   <packaging>jar</packaging>
@@ -53,7 +54,13 @@
                 <resource>
                   <targetPath>META-INF</targetPath>                
                   <directory>META-INF</directory>
-                </resource>                       
+                </resource>  
+                <resource>
+                    <directory>.</directory>
+                    <includes>
+                        <include>build.properties</include>                
+                    </includes>                        
+                </resource>                
               </resources>       
   </build>
 

Modified: labs/jbossrules/trunk/bundle-repository/pom.xml
===================================================================
--- labs/jbossrules/trunk/bundle-repository/pom.xml	2010-01-18 13:30:21 UTC (rev 31122)
+++ labs/jbossrules/trunk/bundle-repository/pom.xml	2010-01-18 17:48:43 UTC (rev 31123)
@@ -109,15 +109,15 @@
       </dependency>    
 
       <dependency>  
-          <groupId>org.drools</groupId>  
+          <groupId>org.mvel</groupId>  
           <artifactId>org.drools.osgi.wrapper.mvel2</artifactId>  
-          <version>2.0.12</version>
+          <version>2.0.12</version> 
           <exclusions>
              <exclusion>
                 <groupId>org.mvel</groupId>
                 <artifactId>mvel2</artifactId> 
              </exclusion>           
-           </exclusions>          
+           </exclusions>           
       </dependency>      
 
       <!-- from springsource -->      



More information about the jboss-svn-commits mailing list