Author: jbonofre
Date: Thu Feb 25 13:01:35 2010
New Revision: 916275

URL: http://svn.apache.org/viewvc?rev=916275&view=rev
Log:
Cleanup import/export package statements in several bundles.

Modified:
    servicemix/smx4/bundles/trunk/abdera-0.4.0-incubating/pom.xml
    servicemix/smx4/bundles/trunk/antlr-2.7.7/pom.xml
    servicemix/smx4/bundles/trunk/antlr-runtime-3.0.1/pom.xml
    servicemix/smx4/bundles/trunk/commons-codec-1.2/pom.xml
    servicemix/smx4/bundles/trunk/commons-codec-1.3/pom.xml
    servicemix/smx4/bundles/trunk/commons-csv-1.0/pom.xml
    servicemix/smx4/bundles/trunk/commons-httpclient-3.1/pom.xml
    servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml
    servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml
    servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml
    servicemix/smx4/bundles/trunk/commons-lang-2.4/pom.xml
    servicemix/smx4/bundles/trunk/commons-net-1.4.1/pom.xml
    servicemix/smx4/bundles/trunk/commons-pool-1.4/pom.xml
    servicemix/smx4/bundles/trunk/commons-pool-1.5.4/pom.xml
    servicemix/smx4/bundles/trunk/commons-vfs-1.0/pom.xml
    servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml
    servicemix/smx4/bundles/trunk/dozer-5.2.0/pom.xml
    servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml
    servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml
    servicemix/smx4/bundles/trunk/hamcrest-1.2/pom.xml
    servicemix/smx4/bundles/trunk/hapi-0.5.1/pom.xml
    servicemix/smx4/bundles/trunk/ibatis-sqlmap-2.3.4.726/pom.xml
    servicemix/smx4/bundles/trunk/irclib-1.10/pom.xml
    servicemix/smx4/bundles/trunk/isorelax-20050913/pom.xml
    servicemix/smx4/bundles/trunk/javassist-3.7.ga/pom.xml
    servicemix/smx4/bundles/trunk/jaxb-impl-2.1.12/pom.xml
    servicemix/smx4/bundles/trunk/jcr-api-1.0/pom.xml
    servicemix/smx4/bundles/trunk/jdom-1.1/pom.xml
    servicemix/smx4/bundles/trunk/jdt-core-3.2.3/pom.xml
    servicemix/smx4/bundles/trunk/jettison-1.0.1/pom.xml
    servicemix/smx4/bundles/trunk/jetty-bundle-6.1.14/pom.xml
    servicemix/smx4/bundles/trunk/jetty-bundle-6.1.19/pom.xml
    servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml
    servicemix/smx4/bundles/trunk/jing-20030619/pom.xml
    servicemix/smx4/bundles/trunk/joda-time-1.5.2/pom.xml
    servicemix/smx4/bundles/trunk/josql-1.5/pom.xml
    servicemix/smx4/bundles/trunk/jsch-0.1.31/pom.xml
    servicemix/smx4/bundles/trunk/jsmpp-2.0/pom.xml
    servicemix/smx4/bundles/trunk/juel-2.1.0/pom.xml
    servicemix/smx4/bundles/trunk/juel-2.1.2/pom.xml
    servicemix/smx4/bundles/trunk/lucene-3.0.0/pom.xml
    servicemix/smx4/bundles/trunk/neethi-2.0.4/pom.xml
    servicemix/smx4/bundles/trunk/ognl-2.7.3/pom.xml
    servicemix/smx4/bundles/trunk/opensaml-1.1/pom.xml
    servicemix/smx4/bundles/trunk/oro-2.0.8/pom.xml
    servicemix/smx4/bundles/trunk/oscache-2.4/pom.xml
    servicemix/smx4/bundles/trunk/oscore-2.2.4/pom.xml
    servicemix/smx4/bundles/trunk/osworkflow-2.7.0/pom.xml
    servicemix/smx4/bundles/trunk/protobuf-2.2.0/pom.xml
    servicemix/smx4/bundles/trunk/qpid-0.5.0/pom.xml
    servicemix/smx4/bundles/trunk/quartz-1.6.1/pom.xml
    servicemix/smx4/bundles/trunk/quartz-1.6.6/pom.xml
    servicemix/smx4/bundles/trunk/rhino-1.7-R1/pom.xml
    servicemix/smx4/bundles/trunk/serp-1.13.1/pom.xml
    servicemix/smx4/bundles/trunk/smack-3.0.4/pom.xml
    servicemix/smx4/bundles/trunk/smack-3.1.0/pom.xml
    servicemix/smx4/bundles/trunk/twitter4j-2.0.9/pom.xml
    servicemix/smx4/bundles/trunk/velocity-1.6.2/pom.xml
    servicemix/smx4/bundles/trunk/werken-xpath-0.9.4/pom.xml
    servicemix/smx4/bundles/trunk/wss4j-1.5.4/pom.xml
    servicemix/smx4/bundles/trunk/xalan-serializer-2.7.1/pom.xml

Modified: servicemix/smx4/bundles/trunk/abdera-0.4.0-incubating/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/abdera-0.4.0-incubating/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/abdera-0.4.0-incubating/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/abdera-0.4.0-incubating/pom.xml Thu Feb 25 
13:01:35 2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>abdera</pkgArtifactId>
         <pkgVersion>0.4.0-incubating</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.abdera*
+            org.apache.abdera
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.abdera*,

Modified: servicemix/smx4/bundles/trunk/antlr-2.7.7/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/antlr-2.7.7/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/antlr-2.7.7/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/antlr-2.7.7/pom.xml Thu Feb 25 13:01:35 2010
@@ -44,9 +44,9 @@
             javax.swing*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.export>
-            antlr*;version=${pkgVersion};-split-package:=merge-first,
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            antlr
+        </servicemix.osgi.export.pkg>
     </properties>
 
     <dependencies>

Modified: servicemix/smx4/bundles/trunk/antlr-runtime-3.0.1/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/antlr-runtime-3.0.1/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/antlr-runtime-3.0.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/antlr-runtime-3.0.1/pom.xml Thu Feb 25 
13:01:35 2010
@@ -46,9 +46,9 @@
             org.antlr.stringtemplate*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.export>
-            
org.antlr.runtime*;version=${pkgVersion};-split-package:=merge-first
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            org.antlr.runtime
+        </servicemix.osgi.export.pkg>
     </properties>
     
     <dependencies>

Modified: servicemix/smx4/bundles/trunk/commons-codec-1.2/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-codec-1.2/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-codec-1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-codec-1.2/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>commons-codec</pkgArtifactId>
         <pkgVersion>1.2</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.commons.codec*
+            org.apache.commons.codec
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.commons.codec*

Modified: servicemix/smx4/bundles/trunk/commons-codec-1.3/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-codec-1.3/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-codec-1.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-codec-1.3/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>commons-codec</pkgArtifactId>
         <pkgVersion>1.3</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.commons.codec*
+            org.apache.commons.codec
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.commons.codec*,

Modified: servicemix/smx4/bundles/trunk/commons-csv-1.0/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-csv-1.0/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-csv-1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-csv-1.0/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>commons-csv</pkgArtifactId>
         <pkgVersion>1.0-r706899</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.commons.csv*
+            org.apache.commons.csv
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.commons.csv*,

Modified: servicemix/smx4/bundles/trunk/commons-httpclient-3.1/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-httpclient-3.1/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-httpclient-3.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-httpclient-3.1/pom.xml Thu Feb 25 
13:01:35 2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>commons-httpclient</pkgArtifactId>
         <pkgVersion>3.1</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.commons.httpclient*
+            org.apache.commons.httpclient
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.commons.httpclient*,

Modified: servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-io-1.3.2/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>commons-io</pkgArtifactId>
         <pkgVersion>1.3.2</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.commons.io*
+            org.apache.commons.io
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.commons.io*,

Modified: servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-jexl-1.1/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>commons-jexl</pkgArtifactId>
         <pkgVersion>1.1</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.commons.jexl*
+            org.apache.commons.jexl
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.commons.jexl*,

Modified: servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-jxpath-1.2/pom.xml Thu Feb 25 
13:01:35 2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>commons-jxpath</pkgArtifactId>
         <pkgVersion>1.2</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.commons.jxpath*
+            org.apache.commons.jxpath
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.commons.jxpath*,

Modified: servicemix/smx4/bundles/trunk/commons-lang-2.4/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-lang-2.4/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-lang-2.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-lang-2.4/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>commons-lang</pkgArtifactId>
         <pkgVersion>2.4</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.commons.lang*
+            org.apache.commons.lang
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.commons.lang*,

Modified: servicemix/smx4/bundles/trunk/commons-net-1.4.1/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-net-1.4.1/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-net-1.4.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-net-1.4.1/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>commons-net</pkgArtifactId>
         <pkgVersion>1.4.1</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.commons.net*
+            org.apache.commons.net
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.commons.net*,

Modified: servicemix/smx4/bundles/trunk/commons-pool-1.4/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-pool-1.4/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-pool-1.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-pool-1.4/pom.xml Thu Feb 25 13:01:35 
2010
@@ -41,7 +41,7 @@
         <pkgArtifactId>commons-pool</pkgArtifactId>
         <pkgVersion>1.4</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.commons.pool*
+            org.apache.commons.pool
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.commons.pool*,

Modified: servicemix/smx4/bundles/trunk/commons-pool-1.5.4/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-pool-1.5.4/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-pool-1.5.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-pool-1.5.4/pom.xml Thu Feb 25 
13:01:35 2010
@@ -41,7 +41,7 @@
         <pkgArtifactId>commons-pool</pkgArtifactId>
         <pkgVersion>1.5.4</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.commons.pool*
+            org.apache.commons.pool
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.commons.pool*,

Modified: servicemix/smx4/bundles/trunk/commons-vfs-1.0/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/commons-vfs-1.0/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/commons-vfs-1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/commons-vfs-1.0/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>commons-vfs</pkgArtifactId>
         <pkgVersion>1.0</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.commons.vfs*
+            org.apache.commons.vfs
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.commons.vfs*,

Modified: servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/dom4j-1.6.1/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>dom4j</pkgArtifactId>
         <pkgVersion>1.6.1</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.dom4j*
+            org.dom4j
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.dom4j*,

Modified: servicemix/smx4/bundles/trunk/dozer-5.2.0/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/dozer-5.2.0/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/dozer-5.2.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/dozer-5.2.0/pom.xml Thu Feb 25 13:01:35 2010
@@ -44,7 +44,7 @@
         org.dozer
     </servicemix.osgi.export.pkg>
     <servicemix.osgi.import.pkg>
-        !org.dozer,       
+        !org.dozer*,       
         javax.management,
         javax.xml.datatype,
         javax.xml.parsers,

Modified: servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/drools-4.0.7/pom.xml Thu Feb 25 13:01:35 2010
@@ -57,7 +57,7 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export.pkg>
-            org.drools*
+            org.drools
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.embed.dependency>
             *;inline=META-INF/drools.*

Modified: servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/flatpack-3.1.1/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>flatpack</pkgArtifactId>
         <pkgVersion>3.1.1</pkgVersion>
         <servicemix.osgi.export.pkg>
-            net.sf.flatpack*
+            net.sf.flatpack
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !net.sf.flatpack*,

Modified: servicemix/smx4/bundles/trunk/hamcrest-1.2/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/hamcrest-1.2/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/hamcrest-1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/hamcrest-1.2/pom.xml Thu Feb 25 13:01:35 2010
@@ -55,9 +55,10 @@
         <pkgArtifactId>hamcrest-all</pkgArtifactId>
         <pkgVersion>1.2-dev1</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.hamcrest*
+            org.hamcrest
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
+            !org.hamcrest*,
             org.easymock;resolution:=optional,
             org.jmock.core;resolution:=optional,
             *

Modified: servicemix/smx4/bundles/trunk/hapi-0.5.1/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/hapi-0.5.1/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/hapi-0.5.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/hapi-0.5.1/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,13 +40,14 @@
         <pkgArtifactId>hapi</pkgArtifactId>
         <pkgVersion>0.5.1</pkgVersion>
         <servicemix.osgi.import.pkg>
+            !ca.uhn*,
             sun.jdbc.odbc;resolution:=optional,
             org.apache.commons.cli;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.export>
-            ca.uhn*
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            ca.uhn
+        </servicemix.osgi.export.pkg>
     </properties>
 
     <repositories>

Modified: servicemix/smx4/bundles/trunk/ibatis-sqlmap-2.3.4.726/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ibatis-sqlmap-2.3.4.726/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ibatis-sqlmap-2.3.4.726/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ibatis-sqlmap-2.3.4.726/pom.xml Thu Feb 25 
13:01:35 2010
@@ -40,8 +40,12 @@
         <pkgArtifactId>ibatis-sqlmap</pkgArtifactId>
         <pkgVersion>2.3.4.726</pkgVersion>
         <servicemix.osgi.export.pkg>
-            com.ibatis*
+            com.ibatis
         </servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+            !com.ibatis*,
+            *
+        </servicemix.osgi.import.pkg>
     </properties>
 
     <dependencies>

Modified: servicemix/smx4/bundles/trunk/irclib-1.10/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/irclib-1.10/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/irclib-1.10/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/irclib-1.10/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,9 +40,10 @@
         <pkgArtifactId>irclib</pkgArtifactId>
         <pkgVersion>1.10</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.schwering.irc*
+            org.schwering.irc
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
+            !org.schwering.irc*,
             com.sun.net.ssl*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>

Modified: servicemix/smx4/bundles/trunk/isorelax-20050913/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/isorelax-20050913/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/isorelax-20050913/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/isorelax-20050913/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,6 +40,8 @@
         <pkgArtifactId>isorelax</pkgArtifactId>
         <pkgVersion>20050913</pkgVersion>
         <servicemix.osgi.import.pkg>
+            !org.iso_relax*,
+            !jp.gr.xml.relax*,
             jp.co.swiftinc.relax*;resolution:=optional,
             org.apache.xerces.parsers;resolution:=optional,
             *

Modified: servicemix/smx4/bundles/trunk/javassist-3.7.ga/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/javassist-3.7.ga/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/javassist-3.7.ga/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/javassist-3.7.ga/pom.xml Thu Feb 25 13:01:35 
2010
@@ -41,7 +41,7 @@
         <pkgArtifactId>javassist</pkgArtifactId>
         <pkgVersion>3.7.ga</pkgVersion>
         <servicemix.osgi.export.pkg>
-            javassist*
+            javassist
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !javassist*,

Modified: servicemix/smx4/bundles/trunk/jaxb-impl-2.1.12/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jaxb-impl-2.1.12/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jaxb-impl-2.1.12/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jaxb-impl-2.1.12/pom.xml Thu Feb 25 13:01:35 
2010
@@ -45,6 +45,9 @@
             com.sun.xml.txw2*;-split-package:=merge-first
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
+            !com.sun.xml.bind*,
+            !com.sun.istack*,
+            !com.sun.xml.txw2*,
             com.sun.xml.fastinfoset*;resolution:=optional,
             javax.xml.stream*;resolution:=optional,
             org.jvnet.fastinfoset*;resolution:=optional,

Modified: servicemix/smx4/bundles/trunk/jcr-api-1.0/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jcr-api-1.0/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jcr-api-1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jcr-api-1.0/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,8 +40,12 @@
         <pkgArtifactId>jcr</pkgArtifactId>
         <pkgVersion>1.0</pkgVersion>
         <servicemix.osgi.export.pkg>
-            javax.jcr*
+            javax.jcr
         </servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+            !javax.jcr*,
+            *
+        </servicemix.osgi.import.pkg>
     </properties>
 
     <dependencies>

Modified: servicemix/smx4/bundles/trunk/jdom-1.1/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jdom-1.1/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jdom-1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jdom-1.1/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>jdom</pkgArtifactId>
         <pkgVersion>1.1</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.jdom*
+            org.jdom
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
            javax.xml.parsers,

Modified: servicemix/smx4/bundles/trunk/jdt-core-3.2.3/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jdt-core-3.2.3/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jdt-core-3.2.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jdt-core-3.2.3/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,6 +40,7 @@
         <pkgArtifactId>core</pkgArtifactId>
         <pkgVersion>3.2.3.v_686_R32x</pkgVersion>
         <servicemix.osgi.import.pkg>
+            !org.eclipse.jdt*,
             org.eclipse.core*;resolution:=optional,
             org.eclipse.jface*;resolution:=optional,
             org.eclipse.osgi.util*;resolution:=optional,

Modified: servicemix/smx4/bundles/trunk/jettison-1.0.1/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jettison-1.0.1/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jettison-1.0.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jettison-1.0.1/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,11 +40,12 @@
         <pkgArtifactId>jettison</pkgArtifactId>
         <pkgVersion>1.0.1</pkgVersion>
         <servicemix.osgi.import.pkg>
+            !org.codehaus.jettison*,
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.export>
-            org.codehaus.jettison*
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            org.codehaus.jettison
+        </servicemix.osgi.export.pkg>
     </properties>
 
     <dependencies>

Modified: servicemix/smx4/bundles/trunk/jetty-bundle-6.1.14/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-bundle-6.1.14/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-bundle-6.1.14/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-bundle-6.1.14/pom.xml Thu Feb 25 
13:01:35 2010
@@ -42,6 +42,7 @@
         <artifactVersion>6.1.14</artifactVersion>
         <servicemix.osgi.export.pkg>org.mortbay</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
+            !org.mortbay*,
             *
         </servicemix.osgi.import.pkg>
     </properties>

Modified: servicemix/smx4/bundles/trunk/jetty-bundle-6.1.19/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-bundle-6.1.19/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-bundle-6.1.19/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-bundle-6.1.19/pom.xml Thu Feb 25 
13:01:35 2010
@@ -42,6 +42,7 @@
         <artifactVersion>6.1.19</artifactVersion>
         <servicemix.osgi.export.pkg>org.mortbay</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
+            !org.mortbay*,
             *
         </servicemix.osgi.import.pkg>
     </properties>

Modified: servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jetty-bundle-6.1.22/pom.xml Thu Feb 25 
13:01:35 2010
@@ -42,6 +42,7 @@
         <artifactVersion>6.1.22</artifactVersion>
         <servicemix.osgi.export.pkg>org.mortbay</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
+            !org.mortbay*,
             *
         </servicemix.osgi.import.pkg>
     </properties>

Modified: servicemix/smx4/bundles/trunk/jing-20030619/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jing-20030619/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jing-20030619/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jing-20030619/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,9 +40,10 @@
         <pkgArtifactId>jing</pkgArtifactId>
         <pkgVersion>20030619</pkgVersion>
         <servicemix.osgi.export.pkg>
-            com.thaiopensource*
+            com.thaiopensource
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
+            !com.thaiopensource*,
             com.icl.saxon;resolution:=optional,
             org.apache.xalan*;resolution:=optional,
             org.apache.xerces*;resolution:=optional,

Modified: servicemix/smx4/bundles/trunk/joda-time-1.5.2/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/joda-time-1.5.2/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/joda-time-1.5.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/joda-time-1.5.2/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,8 +40,12 @@
         <pkgArtifactId>joda-time</pkgArtifactId>
         <pkgVersion>1.5.2</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.joda.time*
+            org.joda.time
         </servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+            !org.joda.time*,
+            *
+        </servicemix.osgi.import.pkg>
     </properties>
 
     <dependencies>

Modified: servicemix/smx4/bundles/trunk/josql-1.5/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/josql-1.5/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/josql-1.5/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/josql-1.5/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>josql</pkgArtifactId>
         <pkgVersion>1.5</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.josql*
+            org.josql
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.josql*,

Modified: servicemix/smx4/bundles/trunk/jsch-0.1.31/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jsch-0.1.31/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jsch-0.1.31/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jsch-0.1.31/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>jsch</pkgArtifactId>
         <pkgVersion>0.1.31</pkgVersion>
         <servicemix.osgi.export.pkg>
-           com.jcraft.jsch*
+           com.jcraft.jsch
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
            !com.jcraft.jsch*,

Modified: servicemix/smx4/bundles/trunk/jsmpp-2.0/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jsmpp-2.0/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jsmpp-2.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jsmpp-2.0/pom.xml Thu Feb 25 13:01:35 2010
@@ -39,10 +39,11 @@
         <pkgGroupId>com.google.code</pkgGroupId>
         <pkgArtifactId>jsmpp</pkgArtifactId>
         <pkgVersion>2.0</pkgVersion>
-        <servicemix.osgi.export>
-            org.jsmpp*;version=${pkgVersion};-split-package:=merge-first,
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            org.jsmpp
+        </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
+            !org.jsmpp*,
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>

Modified: servicemix/smx4/bundles/trunk/juel-2.1.0/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/juel-2.1.0/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/juel-2.1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/juel-2.1.0/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,8 +40,12 @@
         <pkgArtifactId>juel</pkgArtifactId>
         <pkgVersion>2.1.0</pkgVersion>
         <servicemix.osgi.export.pkg>
-            de.odysseus.el*
+            de.odysseus.el
         </servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+            !de.odysseus.el*,
+            *
+        </servicemix.osgi.import.pkg>
     </properties>
 
     <dependencies>

Modified: servicemix/smx4/bundles/trunk/juel-2.1.2/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/juel-2.1.2/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/juel-2.1.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/juel-2.1.2/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>juel</pkgArtifactId>
         <pkgVersion>2.1.2</pkgVersion>
         <servicemix.osgi.export.pkg>
-            de.odysseus.el*
+            de.odysseus.el
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !de.odysseus.el*,

Modified: servicemix/smx4/bundles/trunk/lucene-3.0.0/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/lucene-3.0.0/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/lucene-3.0.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/lucene-3.0.0/pom.xml Thu Feb 25 13:01:35 2010
@@ -39,7 +39,10 @@
         <pkgGroupId>org.apache.lucene</pkgGroupId>
         <pkgArtifactId>lucene-core</pkgArtifactId>
         <pkgVersion>3.0.0</pkgVersion>
-        <servicemix.osgi.import.pkg/>
+        <servicemix.osgi.import.pkg>
+            !org.apache.lucene*,
+            *
+        </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
             org.apache.lucene*;version="${pkgVersion}"
         </servicemix.osgi.export>

Modified: servicemix/smx4/bundles/trunk/neethi-2.0.4/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/neethi-2.0.4/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/neethi-2.0.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/neethi-2.0.4/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,6 +40,7 @@
         <pkgArtifactId>neethi</pkgArtifactId>
         <pkgVersion>2.0.4</pkgVersion>
         <servicemix.osgi.import.pkg>
+            !org.apache.neethi*,
             org.apache.axiom*;resolution:=optional,
             sun.misc*;resolution:=optional,
             *

Modified: servicemix/smx4/bundles/trunk/ognl-2.7.3/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ognl-2.7.3/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ognl-2.7.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ognl-2.7.3/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>ognl</pkgArtifactId>
         <pkgVersion>2.7.3</pkgVersion>
         <servicemix.osgi.export.pkg>
-            ognl*
+            ognl
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !ognl*,

Modified: servicemix/smx4/bundles/trunk/opensaml-1.1/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/opensaml-1.1/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/opensaml-1.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/opensaml-1.1/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>opensaml</pkgArtifactId>
         <pkgVersion>1.1</pkgVersion>
         <servicemix.osgi.export.pkg>
-             org.opensaml*
+             org.opensaml
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.opensaml*,

Modified: servicemix/smx4/bundles/trunk/oro-2.0.8/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/oro-2.0.8/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/oro-2.0.8/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/oro-2.0.8/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>oro</pkgArtifactId>
         <pkgVersion>2.0.8</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.oro*
+            org.apache.oro
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.oro*,

Modified: servicemix/smx4/bundles/trunk/oscache-2.4/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/oscache-2.4/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/oscache-2.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/oscache-2.4/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>oscache</pkgArtifactId>
         <pkgVersion>2.4</pkgVersion>
         <servicemix.osgi.export.pkg>
-            com.opensymphony.oscache*
+            com.opensymphony.oscache
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !com.opensymphony.oscache*,

Modified: servicemix/smx4/bundles/trunk/oscore-2.2.4/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/oscore-2.2.4/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/oscore-2.2.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/oscore-2.2.4/pom.xml Thu Feb 25 13:01:35 2010
@@ -53,9 +53,9 @@
             org.apache.xpath*;resolution:=optional;version="[2.4,3)",
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.export>
-            com.opensymphony*;version=${pkgVersion};-split-package:=merge-first
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            com.opensymphony
+        </servicemix.osgi.export.pkg>
     </properties>
 
     <dependencies>

Modified: servicemix/smx4/bundles/trunk/osworkflow-2.7.0/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/osworkflow-2.7.0/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/osworkflow-2.7.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/osworkflow-2.7.0/pom.xml Thu Feb 25 13:01:35 
2010
@@ -63,9 +63,9 @@
             webwork*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.export>
-            
com.opensymphony.workflow*;version=${pkgVersion};-split-package:=merge-first
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            com.opensymphony.workflow
+        </servicemix.osgi.export.pkg>
     </properties>
 
     <dependencies>

Modified: servicemix/smx4/bundles/trunk/protobuf-2.2.0/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/protobuf-2.2.0/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/protobuf-2.2.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/protobuf-2.2.0/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>protobuf-java</pkgArtifactId>
         <pkgVersion>2.2.0</pkgVersion>
         <servicemix.osgi.export.pkg>
-            com.google.protobuf*
+            com.google.protobuf
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !com.google.protobuf*,

Modified: servicemix/smx4/bundles/trunk/qpid-0.5.0/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/qpid-0.5.0/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/qpid-0.5.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/qpid-0.5.0/pom.xml Thu Feb 25 13:01:35 2010
@@ -39,7 +39,7 @@
         <pkgGroupId>org.apache.qpid</pkgGroupId>
         <pkgArtifactId>qpid</pkgArtifactId>
         <pkgVersion>0.5.0</pkgVersion>
-        
<servicemix.osgi.export.pkg>org.apache.qpid*</servicemix.osgi.export.pkg>
+        
<servicemix.osgi.export.pkg>org.apache.qpid</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.qpid*,
             
edu.emory.mathcs.backport.java.util.concurrent*;resolution:=optional,

Modified: servicemix/smx4/bundles/trunk/quartz-1.6.1/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/quartz-1.6.1/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/quartz-1.6.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/quartz-1.6.1/pom.xml Thu Feb 25 13:01:35 2010
@@ -56,9 +56,9 @@
             org.apache.commons.modeler*;resolution:=optional;version="[1.1,2)",
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.export>
-            org.quartz*;version=${pkgVersion};-split-package:=merge-first
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            org.quartz
+        </servicemix.osgi.export.pkg>
     </properties>
 
     <dependencies>

Modified: servicemix/smx4/bundles/trunk/quartz-1.6.6/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/quartz-1.6.6/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/quartz-1.6.6/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/quartz-1.6.6/pom.xml Thu Feb 25 13:01:35 2010
@@ -68,9 +68,9 @@
             org.apache.commons.modeler*;resolution:=optional;version="[1.1,2)",
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.export>
-            org.quartz*;version=${pkgVersion};-split-package:=merge-first
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            org.quartz
+        </servicemix.osgi.export.pkg>
     </properties>
 
     <dependencies>

Modified: servicemix/smx4/bundles/trunk/rhino-1.7-R1/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/rhino-1.7-R1/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/rhino-1.7-R1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/rhino-1.7-R1/pom.xml Thu Feb 25 13:01:35 2010
@@ -40,6 +40,7 @@
         <pkgArtifactId>js</pkgArtifactId>
         <pkgVersion>1.7R1</pkgVersion>
         <servicemix.osgi.import.pkg>
+            !org.mozilla*,
             javax.swing*;resolution:=optional,
             javax.xml*;resolution:=optional,
             org.apache.xmlbeans*;resolution:=optional,
@@ -48,9 +49,9 @@
             org.xml*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
-        <servicemix.osgi.export>
-            org.mozilla*;version=${pkgVersion};-split-package:=merge-first
-        </servicemix.osgi.export>
+        <servicemix.osgi.export.pkg>
+            org.mozilla
+        </servicemix.osgi.export.pkg>
     </properties>
 
     <dependencies>

Modified: servicemix/smx4/bundles/trunk/serp-1.13.1/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/serp-1.13.1/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/serp-1.13.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/serp-1.13.1/pom.xml Thu Feb 25 13:01:35 2010
@@ -59,7 +59,7 @@
     <pkgArtifactId>serp</pkgArtifactId>
     <pkgVersion>1.13.1</pkgVersion>
     <servicemix.osgi.export.pkg>
-      serp*
+      serp
     </servicemix.osgi.export.pkg>
     <servicemix.osgi.import.pkg>
         !serp*,

Modified: servicemix/smx4/bundles/trunk/smack-3.0.4/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/smack-3.0.4/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/smack-3.0.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/smack-3.0.4/pom.xml Thu Feb 25 13:01:35 2010
@@ -43,7 +43,7 @@
             org.jivesoftware
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.jivesoftware,
+            !org.jivesoftware*,
             *
         </servicemix.osgi.import.pkg>
     </properties>

Modified: servicemix/smx4/bundles/trunk/smack-3.1.0/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/smack-3.1.0/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/smack-3.1.0/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/smack-3.1.0/pom.xml Thu Feb 25 13:01:35 2010
@@ -44,7 +44,7 @@
             org.jivesoftware
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
-            !org.jivesoftware,
+            !org.jivesoftware*,
             org.xmlpull*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>

Modified: servicemix/smx4/bundles/trunk/twitter4j-2.0.9/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/twitter4j-2.0.9/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/twitter4j-2.0.9/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/twitter4j-2.0.9/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>twitter4j</pkgArtifactId>
         <pkgVersion>2.0.9</pkgVersion>
         <servicemix.osgi.export.pkg>
-            twitter4j*
+            twitter4j
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !twitter4j*,

Modified: servicemix/smx4/bundles/trunk/velocity-1.6.2/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/velocity-1.6.2/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/velocity-1.6.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/velocity-1.6.2/pom.xml Thu Feb 25 13:01:35 
2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>velocity</pkgArtifactId>
         <pkgVersion>1.6.2</pkgVersion>
         <servicemix.osgi.export.pkg>
-            org.apache.velocity*
+            org.apache.velocity
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !org.apache.velocity*,

Modified: servicemix/smx4/bundles/trunk/werken-xpath-0.9.4/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/werken-xpath-0.9.4/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/werken-xpath-0.9.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/werken-xpath-0.9.4/pom.xml Thu Feb 25 
13:01:35 2010
@@ -40,7 +40,7 @@
         <pkgArtifactId>werken-xpath</pkgArtifactId>
         <pkgVersion>0.9.4</pkgVersion>
         <servicemix.osgi.export.pkg>
-            com.werken.xpath*
+            com.werken.xpath
         </servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
             !com.werken.xpath*,

Modified: servicemix/smx4/bundles/trunk/wss4j-1.5.4/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/wss4j-1.5.4/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/wss4j-1.5.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/wss4j-1.5.4/pom.xml Thu Feb 25 13:01:35 2010
@@ -41,6 +41,7 @@
         <pkgVersion>1.5.4</pkgVersion>
         <servicemix.osgi.export.pkg>org.apache.ws</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
+            !org.apache.ws*,
             javax.xml.rpc*;resolution:=optional,
             javax.xml.soap*;resolution:=optional,
             org.apache.axis*;resolution:=optional,

Modified: servicemix/smx4/bundles/trunk/xalan-serializer-2.7.1/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/xalan-serializer-2.7.1/pom.xml?rev=916275&r1=916274&r2=916275&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/xalan-serializer-2.7.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/xalan-serializer-2.7.1/pom.xml Thu Feb 25 
13:01:35 2010
@@ -40,10 +40,11 @@
         <pkgArtifactId>serializer</pkgArtifactId>
         <pkgVersion>2.7.1</pkgVersion>
         <servicemix.osgi.import.pkg>
+          !org.apache.xml.serializer*,
           *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export.pkg>
-          org.apache.xml.serializer*
+          org.apache.xml.serializer
         </servicemix.osgi.export.pkg>
     </properties>
 


Reply via email to