You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2010/02/20 02:39:51 UTC
svn commit: r912059 - in /incubator/aries/trunk:
application/application-management/ application/application-obr-resolver/
application/application-runtime/ application/application-utils/
blueprint/blueprint-bundle/ jpa/jpa-container-context/ transactio...
Author: gnodet
Date: Sat Feb 20 01:39:50 2010
New Revision: 912059
URL: http://svn.apache.org/viewvc?rev=912059&view=rev
Log:
ARIES-197: Fix Import/Export-Service headers
Modified:
incubator/aries/trunk/application/application-management/pom.xml
incubator/aries/trunk/application/application-obr-resolver/pom.xml
incubator/aries/trunk/application/application-runtime/pom.xml
incubator/aries/trunk/application/application-utils/pom.xml
incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml
incubator/aries/trunk/jpa/jpa-container-context/pom.xml
incubator/aries/trunk/transaction/transaction-blueprint/pom.xml
incubator/aries/trunk/transaction/transaction-manager/pom.xml
incubator/aries/trunk/web/web-urlhandler/pom.xml
Modified: incubator/aries/trunk/application/application-management/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/pom.xml?rev=912059&r1=912058&r2=912059&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/pom.xml (original)
+++ incubator/aries/trunk/application/application-management/pom.xml Sat Feb 20 01:39:50 2010
@@ -78,6 +78,16 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Import-Service>
+ org.apache.aries.application.ApplicationMetadataFactory,
+ org.apache.aries.application.DeploymentMetadataFactory,
+ org.apache.aries.application.management.AriesApplicationResolver,
+ org.apache.aries.application.management.LocalPlatform,
+ org.apache.aries.application.management.ApplicationContextManager
+ </Import-Service>
+ <Export-Service>
+ org.apache.aries.application.management.AriesApplicationManager
+ </Export-Service>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
</instructions>
Modified: incubator/aries/trunk/application/application-obr-resolver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-obr-resolver/pom.xml?rev=912059&r1=912058&r2=912059&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-obr-resolver/pom.xml (original)
+++ incubator/aries/trunk/application/application-obr-resolver/pom.xml Sat Feb 20 01:39:50 2010
@@ -57,6 +57,12 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Import-Service>
+ org.osgi.service.obr.RepositoryAdmin
+ </Import-Service>
+ <Export-Service>
+ org.apache.aries.application.management.AriesApplicationResolver
+ </Export-Service>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
</instructions>
Modified: incubator/aries/trunk/application/application-runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime/pom.xml?rev=912059&r1=912058&r2=912059&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime/pom.xml (original)
+++ incubator/aries/trunk/application/application-runtime/pom.xml Sat Feb 20 01:39:50 2010
@@ -78,6 +78,11 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Service>
+ org.apache.aries.application.management.ApplicationContextManager,
+ org.apache.aries.application.management.LocalPlatform,
+ org.apache.aries.application.management.AriesApplicationResolver
+ </Export-Service>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
</instructions>
Modified: incubator/aries/trunk/application/application-utils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/pom.xml?rev=912059&r1=912058&r2=912059&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/pom.xml (original)
+++ incubator/aries/trunk/application/application-utils/pom.xml Sat Feb 20 01:39:50 2010
@@ -94,6 +94,10 @@
org.apache.aries.application.utils.filesystem;version="${pom.version}",
org.apache.aries.application.utils.manifest;version="${pom.version}"
</Export-Package>
+ <Export-Service>
+ org.apache.aries.application.ApplicationMetadataFactory,
+ org.apache.aries.application.DeploymentMetadataFactory
+ </Export-Service>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
</instructions>
Modified: incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=912059&r1=912058&r2=912059&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ incubator/aries/trunk/blueprint/blueprint-bundle/pom.xml Sat Feb 20 01:39:50 2010
@@ -102,6 +102,11 @@
org.apache.aries.util.tracker,
OSGI-INF*
</Private-Package>
+ <Export-Service>
+ org.apache.aries.blueprint.ParserService,
+ org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace=http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0,
+ org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace=http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0
+ </Export-Service>
<!-- include the right NOTICE with attribution to the OSGi alliance -->
<Include-Resource>{maven-resources},META-INF/NOTICE=../NOTICE</Include-Resource>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
Modified: incubator/aries/trunk/jpa/jpa-container-context/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container-context/pom.xml?rev=912059&r1=912058&r2=912059&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container-context/pom.xml (original)
+++ incubator/aries/trunk/jpa/jpa-container-context/pom.xml Sat Feb 20 01:39:50 2010
@@ -117,6 +117,9 @@
javax.persistence.metamodel;version="[1.1.0,2.1.0)";resolution:=optional,
*
</Import-Package>
+ <Export-Service>
+ org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace=http://aries.apache.org/xmlns/jpa/v1.0.0
+ </Export-Service>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
</instructions>
Modified: incubator/aries/trunk/transaction/transaction-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=912059&r1=912058&r2=912059&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-blueprint/pom.xml (original)
+++ incubator/aries/trunk/transaction/transaction-blueprint/pom.xml Sat Feb 20 01:39:50 2010
@@ -106,7 +106,13 @@
org.apache.aries.transaction.parsing
</Private-Package>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Export-Service></Export-Service>
+ <Import-Service>
+ javax.transaction.TransactionManager
+ </Import-Service>
+ <Export-Service>
+ org.apache.aries.blueprint.Interceptor,
+ org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace=http://aries.apache.org/xmlns/transactions/v1.0.0
+ </Export-Service>
</instructions>
</configuration>
</plugin>
Modified: incubator/aries/trunk/transaction/transaction-manager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/transaction/transaction-manager/pom.xml?rev=912059&r1=912058&r2=912059&view=diff
==============================================================================
--- incubator/aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ incubator/aries/trunk/transaction/transaction-manager/pom.xml Sat Feb 20 01:39:50 2010
@@ -111,7 +111,12 @@
</Private-Package>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Activator>org.apache.aries.transaction.Activator</Bundle-Activator>
- <Export-Service>javax.transaction.TransactionManager,javax.transaction.TransactionSynchronizationRegistry,javax.transaction.UserTransaction,org.apache.geronimo.transaction.manager.RecoverableTransactionManager</Export-Service>
+ <Export-Service>
+ javax.transaction.TransactionManager,
+ javax.transaction.TransactionSynchronizationRegistry,
+ javax.transaction.UserTransaction,
+ org.apache.geronimo.transaction.manager.RecoverableTransactionManager
+ </Export-Service>
<Include-Resource>
{maven-resources},
javax/resource/spi/XATerminator.class=target/classes/javax/resource/spi/XATerminator.class
Modified: incubator/aries/trunk/web/web-urlhandler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/web-urlhandler/pom.xml?rev=912059&r1=912058&r2=912059&view=diff
==============================================================================
--- incubator/aries/trunk/web/web-urlhandler/pom.xml (original)
+++ incubator/aries/trunk/web/web-urlhandler/pom.xml Sat Feb 20 01:39:50 2010
@@ -62,6 +62,10 @@
<Export-Package>
org.apache.aries.web.converter;version="${pom.version}",
</Export-Package>
+ <Export-Service>
+ org.apache.aries.web.converter.WarToWabConverter,
+ org.osgi.service.url.URLStreamHandlerService;url.handler.protocol=webbundle
+ </Export-Service>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
</instructions>