You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2010/07/06 00:04:16 UTC
svn commit: r960718 - in /servicemix/smx4/nmr/trunk: branding/ document/
jbi/cluster/config/ jbi/cluster/engine/ jbi/cluster/requestor/
jbi/commands/ jbi/deployer/ jbi/runtime/ nmr/api/ nmr/audit/ nmr/commands/
nmr/core/ nmr/management/ nmr/osgi/ nmr/s...
Author: gnodet
Date: Mon Jul 5 22:04:15 2010
New Revision: 960718
URL: http://svn.apache.org/viewvc?rev=960718&view=rev
Log:
Clean up osgi packages
Modified:
servicemix/smx4/nmr/trunk/branding/pom.xml
servicemix/smx4/nmr/trunk/document/pom.xml
servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml
servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml
servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml
servicemix/smx4/nmr/trunk/nmr/api/pom.xml
servicemix/smx4/nmr/trunk/nmr/audit/pom.xml
servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
servicemix/smx4/nmr/trunk/nmr/core/pom.xml
servicemix/smx4/nmr/trunk/nmr/management/pom.xml
servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
Modified: servicemix/smx4/nmr/trunk/branding/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/branding/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/branding/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/branding/pom.xml Mon Jul 5 22:04:15 2010
@@ -54,7 +54,6 @@
<Export-Package>
org.apache.karaf.branding
</Export-Package>
- <Spring-Context>*;publish-context:=false</Spring-Context>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/document/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/document/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/document/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/document/pom.xml Mon Jul 5 22:04:15 2010
@@ -93,11 +93,10 @@
org.springframework.*;resolution:=optional,
*
</Import-Package>
- <Export-Package>
- ${project.artifactId},${project.artifactId}.factory;-noimport:=true
- </Export-Package>
<Private-Package>${project.artifactId}.impl</Private-Package>
<Bundle-Activator>org.apache.servicemix.document.impl.Activator</Bundle-Activator>
+ <Export-Package>${project.artifactId}*;version=${project.version};-noimport:=true</Export-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/config/pom.xml Mon Jul 5 22:04:15 2010
@@ -59,6 +59,7 @@
<DynamicImport-Package>
*
</DynamicImport-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/engine/pom.xml Mon Jul 5 22:04:15 2010
@@ -127,6 +127,8 @@
org.springframework.osgi*;resolution:=optional,
*
</Import-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version};-noimport:=true</Export-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/cluster/requestor/pom.xml Mon Jul 5 22:04:15 2010
@@ -77,6 +77,8 @@
org.apache.activemq*;resolution:=optional,
*
</Import-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version};-noimport:=true</Export-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/pom.xml Mon Jul 5 22:04:15 2010
@@ -57,7 +57,8 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version};-noimport:=true</Export-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Mon Jul 5 22:04:15 2010
@@ -138,6 +138,7 @@
org.apache.geronimo.transaction.manager;resolution:=optional,
org.springframework.transaction;resolution:=optional,
org.apache.servicemix.jbi.runtime.impl,
+ org.apache.tools.ant*;resolution:=optional,
*
</Import-Package>
<Include-Resource>
@@ -146,7 +147,10 @@
org/apache/xbean/classloader/NamedClassLoader.class=target/classes/org/apache/xbean/classloader/NamedClassLoader.class,
org/apache/xbean/classloader/DestroyableClassLoader.class=target/classes/org/apache/xbean/classloader/DestroyableClassLoader.class
</Include-Resource>
- <Export-Package>org.apache.servicemix.jbi.deployer*</Export-Package>
+ <Export-Package>
+ ${project.artifactId}*;version="${project.version}";-noimport:=true
+ </Export-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml Mon Jul 5 22:04:15 2010
@@ -96,7 +96,10 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Export-Package>${project.artifactId}*</Export-Package>
+ <Export-Package>
+ ${project.artifactId}*;version="${project.version}";-noimport:=true
+ </Export-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/nmr/api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/api/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/api/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/api/pom.xml Mon Jul 5 22:04:15 2010
@@ -53,9 +53,8 @@
<instructions>
<Bundle-Name>${project.name}</Bundle-Name>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Export-Package>
- ${project.artifactId},${project.artifactId}.service,${project.artifactId}.event,${project.artifactId}.internal,${project.artifactId}.security
- </Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version};-noimport:=true</Export-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/nmr/audit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/audit/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/audit/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/audit/pom.xml Mon Jul 5 22:04:15 2010
@@ -86,7 +86,8 @@
org.apache.servicemix.nmr.core,
*
</Import-Package>
- <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version};-noimport:=true</Export-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/pom.xml Mon Jul 5 22:04:15 2010
@@ -57,7 +57,8 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version};-noimport:=true</Export-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/nmr/core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/core/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/core/pom.xml Mon Jul 5 22:04:15 2010
@@ -109,11 +109,12 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Export-Package>${project.artifactId}*</Export-Package>
<Import-Package>
org.apache.camel.*;resolution:=optional,
*
</Import-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version};-noimport:=true</Export-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/nmr/management/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/management/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/management/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/management/pom.xml Mon Jul 5 22:04:15 2010
@@ -104,7 +104,8 @@
javax.management.loading,
*
</Import-Package>
- <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version};-noimport:=true</Export-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml Mon Jul 5 22:04:15 2010
@@ -99,6 +99,7 @@
org.fusesource.commons.management,
*
</Import-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/spring/pom.xml?rev=960718&r1=960717&r2=960718&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/spring/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/spring/pom.xml Mon Jul 5 22:04:15 2010
@@ -65,7 +65,8 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Export-Package>${project.artifactId}</Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version};-noimport:=true</Export-Package>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>