svn commit: r1630917 - in /aries/trunk/transaction: transaction-blueprint/pom.xml transaction-jdbc/pom.xml transaction-jms/pom.xml transaction-manager/pom.xml

[gnodet]

Author: gnodet
Date: Fri Oct 10 14:43:16 2014
New Revision: 1630917

URL: http://svn.apache.org/r1630917
Log:
[ARIES-1262] Use generic capabilities and requirements for services

Modified:
    aries/trunk/transaction/transaction-blueprint/pom.xml
    aries/trunk/transaction/transaction-jdbc/pom.xml
    aries/trunk/transaction/transaction-jms/pom.xml
    aries/trunk/transaction/transaction-manager/pom.xml

Modified: aries/trunk/transaction/transaction-blueprint/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-blueprint/pom.xml?rev=1630917&r1=1630916&r2=1630917&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-blueprint/pom.xml (original)
+++ aries/trunk/transaction/transaction-blueprint/pom.xml Fri Oct 10 14:43:16 
2014
@@ -113,6 +113,38 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.5.3</version>
+                <extensions>true</extensions>
+                <inherited>true</inherited>
+                <configuration>
+                    
<excludeDependencies>${aries.osgi.exclude.dependencies}</excludeDependencies>
+                    <instructions>
+                        <Bundle-Name>${project.name}</Bundle-Name>
+                        
<Bundle-SymbolicName>${aries.osgi.symbolic.name}</Bundle-SymbolicName>
+                        
<Bundle-Activator>${aries.osgi.activator}</Bundle-Activator>
+                        <Export-Package>${aries.osgi.export}</Export-Package>
+                        <Import-Package>${aries.osgi.import}</Import-Package>
+                        
<DynamicImport-Package>${aries.osgi.dynamic}</DynamicImport-Package>
+                        
<Private-Package>${aries.osgi.private.pkg}</Private-Package>
+                        <Implementation-Title>Apache 
Aries</Implementation-Title>
+                        
<Implementation-Version>${project.version}</Implementation-Version>
+                        <Bundle-Vendor>The Apache Software 
Foundation</Bundle-Vendor>
+                        
<Include-Resource>${aries.osgi.include.resource}</Include-Resource>
+                        
<_removeheaders>${aries.osgi.remove.headers}}</_removeheaders>
+                        <_failok>${aries.osgi.failok}</_failok>
+                        
<_consumer-policy>${aries.osgi.import.default.version}</_consumer-policy>
+                        
<_provider-policy>$&lt;range;[==,=+)&gt;</_provider-policy>
+                        
<Export-Service>${aries.osgi.export.service}</Export-Service>
+                        
<Import-Service>${aries.osgi.import.service}</Import-Service>
+                        
<Provide-Capability>${aries.osgi.provide.capability}</Provide-Capability>
+                        
<Require-Capability>${aries.osgi.require.capability}</Require-Capability>
+                        <service_mode>generic</service_mode>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

Modified: aries/trunk/transaction/transaction-jdbc/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jdbc/pom.xml?rev=1630917&r1=1630916&r2=1630917&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jdbc/pom.xml (original)
+++ aries/trunk/transaction/transaction-jdbc/pom.xml Fri Oct 10 14:43:16 2014
@@ -54,6 +54,13 @@
             org.apache.aries.transaction.jdbc.internal,
             org.tranql*,
         </aries.osgi.private.pkg>
+        <aries.osgi.require.capability>
+            osgi.service; effective:=active; resolution:=optional; 
filter:="(objectClass=org.apache.aries.transaction.AriesTransactionManager)"
+        </aries.osgi.require.capability>
+        <aries.osgi.provide.capability>
+            osg.service; effective:=active; 
objectClass=org.apache.aries.blueprint.NamespaceHandler; 
osgi.service.blueprint.namespace="http://aries.apache.org/xmlns/transaction-jdbc/2.0";,
+            osg.service; effective:=active; 
objectClass=org.apache.aries.blueprint.NamespaceHandler; 
osgi.service.blueprint.namespace="http://aries.apache.org/xmlns/transaction-jdbc/2.1";
+        </aries.osgi.provide.capability>
         <aries.osgi.activator>
             org.apache.aries.transaction.jdbc.internal.Activator
         </aries.osgi.activator>
@@ -176,6 +183,38 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.5.3</version>
+                <extensions>true</extensions>
+                <inherited>true</inherited>
+                <configuration>
+                    
<excludeDependencies>${aries.osgi.exclude.dependencies}</excludeDependencies>
+                    <instructions>
+                        <Bundle-Name>${project.name}</Bundle-Name>
+                        
<Bundle-SymbolicName>${aries.osgi.symbolic.name}</Bundle-SymbolicName>
+                        
<Bundle-Activator>${aries.osgi.activator}</Bundle-Activator>
+                        <Export-Package>${aries.osgi.export}</Export-Package>
+                        <Import-Package>${aries.osgi.import}</Import-Package>
+                        
<DynamicImport-Package>${aries.osgi.dynamic}</DynamicImport-Package>
+                        
<Private-Package>${aries.osgi.private.pkg}</Private-Package>
+                        <Implementation-Title>Apache 
Aries</Implementation-Title>
+                        
<Implementation-Version>${project.version}</Implementation-Version>
+                        <Bundle-Vendor>The Apache Software 
Foundation</Bundle-Vendor>
+                        
<Include-Resource>${aries.osgi.include.resource}</Include-Resource>
+                        
<_removeheaders>${aries.osgi.remove.headers}}</_removeheaders>
+                        <_failok>${aries.osgi.failok}</_failok>
+                        
<_consumer-policy>${aries.osgi.import.default.version}</_consumer-policy>
+                        
<_provider-policy>$&lt;range;[==,=+)&gt;</_provider-policy>
+                        
<Export-Service>${aries.osgi.export.service}</Export-Service>
+                        
<Import-Service>${aries.osgi.import.service}</Import-Service>
+                        
<Provide-Capability>${aries.osgi.provide.capability}</Provide-Capability>
+                        
<Require-Capability>${aries.osgi.require.capability}</Require-Capability>
+                        <service_mode>generic</service_mode>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

Modified: aries/trunk/transaction/transaction-jms/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-jms/pom.xml?rev=1630917&r1=1630916&r2=1630917&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-jms/pom.xml (original)
+++ aries/trunk/transaction/transaction-jms/pom.xml Fri Oct 10 14:43:16 2014
@@ -50,6 +50,12 @@
         <aries.osgi.private.pkg>
             org.apache.aries.transaction.jms.internal
         </aries.osgi.private.pkg>
+        <aries.osgi.require.capability>
+            osgi.service; effective:=active; 
filter:="(objectClass=org.apache.aries.transaction.AriesTransactionManager)"
+        </aries.osgi.require.capability>
+        <aries.osgi.provide.capability>
+            osg.service; effective:=active; 
objectClass=org.apache.aries.blueprint.NamespaceHandler; 
osgi.service.blueprint.namespace="http://aries.apache.org/xmlns/transaction-jms/2.0";
+        </aries.osgi.provide.capability>
         <aries.osgi.activator>
             org.apache.aries.transaction.jms.internal.Activator
         </aries.osgi.activator>
@@ -136,6 +142,38 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.5.3</version>
+                <extensions>true</extensions>
+                <inherited>true</inherited>
+                <configuration>
+                    
<excludeDependencies>${aries.osgi.exclude.dependencies}</excludeDependencies>
+                    <instructions>
+                        <Bundle-Name>${project.name}</Bundle-Name>
+                        
<Bundle-SymbolicName>${aries.osgi.symbolic.name}</Bundle-SymbolicName>
+                        
<Bundle-Activator>${aries.osgi.activator}</Bundle-Activator>
+                        <Export-Package>${aries.osgi.export}</Export-Package>
+                        <Import-Package>${aries.osgi.import}</Import-Package>
+                        
<DynamicImport-Package>${aries.osgi.dynamic}</DynamicImport-Package>
+                        
<Private-Package>${aries.osgi.private.pkg}</Private-Package>
+                        <Implementation-Title>Apache 
Aries</Implementation-Title>
+                        
<Implementation-Version>${project.version}</Implementation-Version>
+                        <Bundle-Vendor>The Apache Software 
Foundation</Bundle-Vendor>
+                        
<Include-Resource>${aries.osgi.include.resource}</Include-Resource>
+                        
<_removeheaders>${aries.osgi.remove.headers}}</_removeheaders>
+                        <_failok>${aries.osgi.failok}</_failok>
+                        
<_consumer-policy>${aries.osgi.import.default.version}</_consumer-policy>
+                        
<_provider-policy>$&lt;range;[==,=+)&gt;</_provider-policy>
+                        
<Export-Service>${aries.osgi.export.service}</Export-Service>
+                        
<Import-Service>${aries.osgi.import.service}</Import-Service>
+                        
<Provide-Capability>${aries.osgi.provide.capability}</Provide-Capability>
+                        
<Require-Capability>${aries.osgi.require.capability}</Require-Capability>
+                        <service_mode>generic</service_mode>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

Modified: aries/trunk/transaction/transaction-manager/pom.xml
URL: 
http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/pom.xml?rev=1630917&r1=1630916&r2=1630917&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ aries/trunk/transaction/transaction-manager/pom.xml Fri Oct 10 14:43:16 2014
@@ -62,14 +62,9 @@
         <aries.osgi.activator>
             org.apache.aries.transaction.internal.Activator
         </aries.osgi.activator>
-        <aries.osgi.export.service>
-            org.apache.aries.transaction.AriesTransactionManager,
-            javax.transaction.TransactionManager,
-            javax.transaction.TransactionSynchronizationRegistry,
-            javax.transaction.UserTransaction,
-            
org.apache.geronimo.transaction.manager.RecoverableTransactionManager,
-            org.springframework.transaction.PlatformTransactionManager
-        </aries.osgi.export.service>
+        <aries.osgi.provide.capability>
+            osgi.service; effective:=active; 
objectClass:List&lt;String>="org.apache.aries.transaction.AriesTransactionManager,javax.transaction.TransactionManager,javax.transaction.TransactionSynchronizationRegistry,javax.transaction.UserTransaction,org.apache.geronimo.transaction.manager.RecoverableTransactionManager,org.springframework.transaction.PlatformTransactionManager"
+        </aries.osgi.provide.capability>
         <aries.osgi.include.resource>
             {maven-resources},
             
javax/resource/spi/XATerminator.class=target/classes/javax/resource/spi/XATerminator.class
@@ -263,6 +258,38 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.5.3</version>
+                <extensions>true</extensions>
+                <inherited>true</inherited>
+                <configuration>
+                    
<excludeDependencies>${aries.osgi.exclude.dependencies}</excludeDependencies>
+                    <instructions>
+                        <Bundle-Name>${project.name}</Bundle-Name>
+                        
<Bundle-SymbolicName>${aries.osgi.symbolic.name}</Bundle-SymbolicName>
+                        
<Bundle-Activator>${aries.osgi.activator}</Bundle-Activator>
+                        <Export-Package>${aries.osgi.export}</Export-Package>
+                        <Import-Package>${aries.osgi.import}</Import-Package>
+                        
<DynamicImport-Package>${aries.osgi.dynamic}</DynamicImport-Package>
+                        
<Private-Package>${aries.osgi.private.pkg}</Private-Package>
+                        <Implementation-Title>Apache 
Aries</Implementation-Title>
+                        
<Implementation-Version>${project.version}</Implementation-Version>
+                        <Bundle-Vendor>The Apache Software 
Foundation</Bundle-Vendor>
+                        
<Include-Resource>${aries.osgi.include.resource}</Include-Resource>
+                        
<_removeheaders>${aries.osgi.remove.headers}}</_removeheaders>
+                        <_failok>${aries.osgi.failok}</_failok>
+                        
<_consumer-policy>${aries.osgi.import.default.version}</_consumer-policy>
+                        
<_provider-policy>$&lt;range;[==,=+)&gt;</_provider-policy>
+                        
<Export-Service>${aries.osgi.export.service}</Export-Service>
+                        
<Import-Service>${aries.osgi.import.service}</Import-Service>
+                        
<Provide-Capability>${aries.osgi.provide.capability}</Provide-Capability>
+                        
<Require-Capability>${aries.osgi.require.capability}</Require-Capability>
+                        <service_mode>generic</service_mode>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>