Author: jbonofre
Date: Sat Feb 18 21:43:44 2012
New Revision: 1290887
URL: http://svn.apache.org/viewvc?rev=1290887&view=rev
Log:
Fix several missing OSGi statements
Modified:
servicemix/smx4/bundles/trunk/ant-1.8.1/pom.xml
servicemix/smx4/bundles/trunk/ant-1.8.2/pom.xml
servicemix/smx4/bundles/trunk/avro-1.5.3/pom.xml
servicemix/smx4/bundles/trunk/avro-1.6.1/pom.xml
servicemix/smx4/bundles/trunk/avro-ipc-1.5.3/pom.xml
servicemix/smx4/bundles/trunk/avro-ipc-1.6.1/pom.xml
servicemix/smx4/bundles/trunk/jdiff-1.0.9/pom.xml
servicemix/smx4/bundles/trunk/jets3t-0.6.1/pom.xml
servicemix/smx4/bundles/trunk/jets3t-0.7.1/pom.xml
servicemix/smx4/bundles/trunk/jets3t-0.7.4/pom.xml
servicemix/smx4/bundles/trunk/jets3t-0.8.1/pom.xml
servicemix/smx4/bundles/trunk/kfs-0.3/pom.xml
servicemix/smx4/bundles/trunk/protobuf-2.4.0a/pom.xml
servicemix/smx4/bundles/trunk/xmlenc-0.52/pom.xml
Modified: servicemix/smx4/bundles/trunk/ant-1.8.1/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ant-1.8.1/pom.xml?rev=1290887&r1=1290886&r2=1290887&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ant-1.8.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ant-1.8.1/pom.xml Sat Feb 18 21:43:44 2012
@@ -46,8 +46,8 @@
!org.apache.env*,
!sun.rmi*,
!sun.tools.javac*,
- !kaffe.util*,
- !weblogic*,
+ !kaffe.util*,
+ !weblogic*,
*
</servicemix.osgi.import.pkg>
<servicemix.osgi.failok>true</servicemix.osgi.failok>
Modified: servicemix/smx4/bundles/trunk/ant-1.8.2/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/ant-1.8.2/pom.xml?rev=1290887&r1=1290886&r2=1290887&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/ant-1.8.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/ant-1.8.2/pom.xml Sat Feb 18 21:43:44 2012
@@ -46,8 +46,8 @@
!org.apache.env*,
!sun.rmi*,
!sun.tools.javac*,
- !kaffe.util*,
- !weblogic*,
+ !kaffe.util*,
+ !weblogic*,
*
</servicemix.osgi.import.pkg>
<servicemix.osgi.failok>true</servicemix.osgi.failok>
Modified: servicemix/smx4/bundles/trunk/avro-1.5.3/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/avro-1.5.3/pom.xml?rev=1290887&r1=1290886&r2=1290887&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/avro-1.5.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/avro-1.5.3/pom.xml Sat Feb 18 21:43:44 2012
@@ -39,11 +39,12 @@
<pkgGroupId>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro</pkgArtifactId>
<pkgVersion>1.5.3</pkgVersion>
- <servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
!org.apache.avro.ipc;version="${project.version}",
org.apache.avro*;version="${project.version}";-noimport:=true
- </servicemix.osgi.export.pkg>
+ </servicemix.osgi.export>
<servicemix.osgi.import.pkg>
+ !org.apache.avro*,
com.thoughtworks.paranamer;version="[2.3,3)",
org.codehaus.jackson;version="[1.7,2)",
org.xerial.snappy;version="[1.0,2)",
Modified: servicemix/smx4/bundles/trunk/avro-1.6.1/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/avro-1.6.1/pom.xml?rev=1290887&r1=1290886&r2=1290887&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/avro-1.6.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/avro-1.6.1/pom.xml Sat Feb 18 21:43:44 2012
@@ -39,11 +39,12 @@
<pkgGroupId>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro</pkgArtifactId>
<pkgVersion>1.6.1</pkgVersion>
- <servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
!org.apache.avro.ipc;version="${project.version}",
org.apache.avro*;version="${project.version}";-noimport:=true
- </servicemix.osgi.export.pkg>
+ </servicemix.osgi.export>
<servicemix.osgi.import.pkg>
+ !org.apache.avro*,
com.thoughtworks.paranamer;version="[2.3,3)",
org.codehaus.jackson;version="[1.8,2)",
org.xerial.snappy;version="[1.0,2)",
Modified: servicemix/smx4/bundles/trunk/avro-ipc-1.5.3/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/avro-ipc-1.5.3/pom.xml?rev=1290887&r1=1290886&r2=1290887&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/avro-ipc-1.5.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/avro-ipc-1.5.3/pom.xml Sat Feb 18 21:43:44
2012
@@ -39,10 +39,11 @@
<pkgGroupId>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro-ipc</pkgArtifactId>
<pkgVersion>1.5.3</pkgVersion>
- <servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
org.apache.avro.ipc*;version="${project.version}";-noimport:=true
- </servicemix.osgi.export.pkg>
+ </servicemix.osgi.export>
<servicemix.osgi.import.pkg>
+ !org.apache.avro.ipc*,
javax.security*,
javax.servlet*;resolution:=optional,
org.apache.avro*;version="[1.5,2)",
Modified: servicemix/smx4/bundles/trunk/avro-ipc-1.6.1/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/avro-ipc-1.6.1/pom.xml?rev=1290887&r1=1290886&r2=1290887&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/avro-ipc-1.6.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/avro-ipc-1.6.1/pom.xml Sat Feb 18 21:43:44
2012
@@ -39,10 +39,11 @@
<pkgGroupId>org.apache.avro</pkgGroupId>
<pkgArtifactId>avro-ipc</pkgArtifactId>
<pkgVersion>1.6.1</pkgVersion>
- <servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
org.apache.avro.ipc*;version="${project.version}";-noimport:=true
- </servicemix.osgi.export.pkg>
+ </servicemix.osgi.export>
<servicemix.osgi.import.pkg>
+ !org.apache.avro.ipc*,
javax.security*,
javax.servlet*;resolution:=optional,
org.apache.avro*;version="[1.6,2)",
Modified: servicemix/smx4/bundles/trunk/jdiff-1.0.9/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jdiff-1.0.9/pom.xml?rev=1290887&r1=1290886&r2=1290887&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jdiff-1.0.9/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jdiff-1.0.9/pom.xml Sat Feb 18 21:43:44 2012
@@ -43,8 +43,9 @@
jdiff
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- com.sun.javadoc;resolution:=optional,
- org.xml*
+ !jdiff*,
+ com.sun.javadoc;resolution:=optional,
+ org.xml*
</servicemix.osgi.import.pkg>
</properties>
Modified: servicemix/smx4/bundles/trunk/jets3t-0.6.1/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jets3t-0.6.1/pom.xml?rev=1290887&r1=1290886&r2=1290887&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jets3t-0.6.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jets3t-0.6.1/pom.xml Sat Feb 18 21:43:44 2012
@@ -39,11 +39,26 @@
<pkgGroupId>net.java.dev.jets3t</pkgGroupId>
<pkgArtifactId>jets3t</pkgArtifactId>
<pkgVersion>0.6.1</pkgVersion>
- <servicemix.osgi.export.pkg>
- org.jets3t
- </servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
+ org.jets3t*;version=${project.version};-split-package:=merge-first,
+
org.apache.commons.httpclient.contrib.proxy;version=${project.version};-split-package:=merge-first
+ </servicemix.osgi.export>
<servicemix.osgi.import.pkg>
-
+ !org.jets3t*,
+ org.apache.commons.codec*;version="[1.3,2)",
+ org.apache.commons.httpclient*;version="[3.1,4)",
+ com.sun.java.browser.net;resolution:=optional,
+ org.apache.axis*;resolution:=optional,
+ org.apache.commons.logging;resolution:=optional,
+ org.bouncycastle.jce.provider;resolution:=optional,
+ javax.xml.rpc*;resolution:=optional,
+ javax.swing*;resolution:=optional,
+ sun.plugin.protocol;resolution:=optional,
+ javax.crypto*,
+ javax.activation,
+ javax.xml.namespace,
+ javax.xml.transform*,
+ org.xml.sax*
</servicemix.osgi.import.pkg>
</properties>
@@ -99,4 +114,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/bundles/trunk/jets3t-0.7.1/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jets3t-0.7.1/pom.xml?rev=1290887&r1=1290886&r2=1290887&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jets3t-0.7.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jets3t-0.7.1/pom.xml Sat Feb 18 21:43:44 2012
@@ -39,11 +39,29 @@
<pkgGroupId>net.java.dev.jets3t</pkgGroupId>
<pkgArtifactId>jets3t</pkgArtifactId>
<pkgVersion>0.7.1</pkgVersion>
- <servicemix.osgi.export.pkg>
- org.jets3t
- </servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
+ org.jets3t*;version=${project.version};-split-package:=merge-first,
+
org.apache.commons.httpclient.contrib.proxy;version=${project.version};-split-package:=merge-first,
+ contribs.mx;version=${project.version};-split-package:=merge-first
+ </servicemix.osgi.export>
<servicemix.osgi.import.pkg>
-
+ !org.jets3t*,
+ org.apache.commons.codec*;version="[1.3,2)",
+ org.apache.commons.httpclient*;version="[3.1,4)",
+ com.jamesmurty.utils;resolution:=optional,
+ com.sun.java.browser.net;resolution:=optional,
+ org.apache.axis*;resolution:=optional,
+ org.apache.commons.logging;resolution:=optional,
+ org.bouncycastle.jce.provider;resolution:=optional,
+ javax.xml.rpc*;resolution:=optional,
+ javax.swing*;resolution:=optional,
+ sun.plugin.protocol;resolution:=optional,
+ javax.crypto*,
+ javax.activation,
+ javax.xml.namespace,
+ javax.xml.transform*,
+ javax.management,
+ org.xml.sax*
</servicemix.osgi.import.pkg>
</properties>
Modified: servicemix/smx4/bundles/trunk/jets3t-0.7.4/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jets3t-0.7.4/pom.xml?rev=1290887&r1=1290886&r2=1290887&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jets3t-0.7.4/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jets3t-0.7.4/pom.xml Sat Feb 18 21:43:44 2012
@@ -39,11 +39,30 @@
<pkgGroupId>net.java.dev.jets3t</pkgGroupId>
<pkgArtifactId>jets3t</pkgArtifactId>
<pkgVersion>0.7.4</pkgVersion>
- <servicemix.osgi.export.pkg>
- org.jets3t
- </servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
+ org.jets3t*;version=${project.version};-split-package:=merge-first,
+
org.apache.commons.httpclient.contrib.proxy;version=${project.version};-split-package:=merge-first,
+ contribs.mx;version=${project.version};-split-package:=merge-first
+ </servicemix.osgi.export>
<servicemix.osgi.import.pkg>
-
+ !org.jets3t*,
+ org.apache.commons.codec*;version="[1.3,2)",
+ org.apache.commons.httpclient*;version="[3.1,4)",
+ com.jamesmurty.utils;resolution:=optional,
+ com.sun.java.browser.net;resolution:=optional,
+ org.apache.axis*;resolution:=optional,
+ org.apache.commons.logging;resolution:=optional,
+ org.bouncycastle.jce.provider;resolution:=optional,
+ javax.xml.rpc*;resolution:=optional,
+ javax.swing*;resolution:=optional,
+ sun.plugin.protocol;resolution:=optional,
+ javax.crypto*,
+ javax.activation,
+ javax.xml.namespace,
+ javax.xml.transform*,
+ javax.xml.parsers,
+ javax.management,
+ org.xml.sax*
</servicemix.osgi.import.pkg>
</properties>
Modified: servicemix/smx4/bundles/trunk/jets3t-0.8.1/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/jets3t-0.8.1/pom.xml?rev=1290887&r1=1290886&r2=1290887&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/jets3t-0.8.1/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/jets3t-0.8.1/pom.xml Sat Feb 18 21:43:44 2012
@@ -39,11 +39,30 @@
<pkgGroupId>net.java.dev.jets3t</pkgGroupId>
<pkgArtifactId>jets3t</pkgArtifactId>
<pkgVersion>0.8.1</pkgVersion>
- <servicemix.osgi.export.pkg>
- org.jets3t
- </servicemix.osgi.export.pkg>
+ <servicemix.osgi.export>
+ org.jets3t*;version=${project.version};-split-package:=merge-first,
+
org.apache.commons.httpclient.contrib.proxy;version=${project.version};-split-package:=merge-first,
+ contribs.mx;version=${project.version};-split-package:=merge-first
+ </servicemix.osgi.export>
<servicemix.osgi.import.pkg>
-
+ !org.jets3t*,
+ org.apache.commons.codec*;version="[1.3,2)",
+ org.apache.commons.httpclient*;version="[3.1,4)",
+ com.jamesmurty.utils;resolution:=optional,
+ com.sun.java.browser.net;resolution:=optional,
+ org.apache.axis*;resolution:=optional,
+ org.apache.commons.logging;resolution:=optional,
+ org.bouncycastle.jce.provider;resolution:=optional,
+ javax.xml.rpc*;resolution:=optional,
+ javax.swing*;resolution:=optional,
+ sun.plugin.protocol;resolution:=optional,
+ javax.crypto*,
+ javax.activation,
+ javax.xml.namespace,
+ javax.xml.transform*,
+ javax.xml.parsers,
+ javax.management,
+ org.xml.sax*
</servicemix.osgi.import.pkg>
</properties>
Modified: servicemix/smx4/bundles/trunk/kfs-0.3/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/kfs-0.3/pom.xml?rev=1290887&r1=1290886&r2=1290887&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/kfs-0.3/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/kfs-0.3/pom.xml Sat Feb 18 21:43:44 2012
@@ -43,7 +43,7 @@
org.kosmix.kosmosfs
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
-
+ !org.kosmix.kosmosfs*
</servicemix.osgi.import.pkg>
</properties>
Modified: servicemix/smx4/bundles/trunk/protobuf-2.4.0a/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/protobuf-2.4.0a/pom.xml?rev=1290887&r1=1290886&r2=1290887&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/protobuf-2.4.0a/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/protobuf-2.4.0a/pom.xml Sat Feb 18 21:43:44
2012
@@ -43,7 +43,7 @@
com.google.protobuf
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
- *
+ !com.google.protobuf*
</servicemix.osgi.import.pkg>
</properties>
Modified: servicemix/smx4/bundles/trunk/xmlenc-0.52/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/xmlenc-0.52/pom.xml?rev=1290887&r1=1290886&r2=1290887&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/xmlenc-0.52/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/xmlenc-0.52/pom.xml Sat Feb 18 21:43:44 2012
@@ -43,7 +43,8 @@
org.znerd.xmlenc
</servicemix.osgi.export.pkg>
<servicemix.osgi.import.pkg>
-
+ !org.znerd.xmlenc*,
+ org.xml.sax
</servicemix.osgi.import.pkg>
</properties>
