[tx-control] Add Provided and Required Service Capabilities to the tx control bundles
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/tx-control@1748434 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tx-control-provider-jdbc-local/pom.xml b/tx-control-provider-jdbc-local/pom.xml
index 2a69d79..2695549 100644
--- a/tx-control-provider-jdbc-local/pom.xml
+++ b/tx-control-provider-jdbc-local/pom.xml
@@ -139,6 +139,17 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+ <instructions>
+ <Provide-Capability>osgi.service;objectClass="org.osgi.service.transaction.control.jdbc.JDBCConnectionProvider";osgi.local.enabled="true";uses:="org.osgi.service.transaction.control.jdbc",osgi.service;objectClass="org.osgi.service.transaction.control.jdbc.JDBCConnectionProviderFactory";osgi.local.enabled="true";uses:="org.osgi.service.transaction.control.jdbc"</Provide-Capability>
+ <Require-Capability>osgi.service;filter:="(objectClass=org.osgi.service.jdbc.DataSourceFactory)";resolution:="optional";effective:="active"</Require-Capability>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/tx-control-provider-jdbc-xa/pom.xml b/tx-control-provider-jdbc-xa/pom.xml
index f210a43..9d87d59 100644
--- a/tx-control-provider-jdbc-xa/pom.xml
+++ b/tx-control-provider-jdbc-xa/pom.xml
@@ -139,6 +139,17 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+ <instructions>
+ <Provide-Capability>osgi.service;objectClass="org.osgi.service.transaction.control.jdbc.JDBCConnectionProvider";osgi.local.enabled="true";osgi.xa.enabled="true";uses:="org.osgi.service.transaction.control.jdbc",osgi.service;objectClass="org.osgi.service.transaction.control.jdbc.JDBCConnectionProviderFactory";osgi.local.enabled="true";osgi.xa.enabled="true";uses:="org.osgi.service.transaction.control.jdbc"</Provide-Capability>
+ <Require-Capability>osgi.service;filter:="(objectClass=org.osgi.service.jdbc.DataSourceFactory)";resolution:="optional";effective:="active"</Require-Capability>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/tx-control-provider-jpa-local/pom.xml b/tx-control-provider-jpa-local/pom.xml
index cd9eb9c..e52fa05 100644
--- a/tx-control-provider-jpa-local/pom.xml
+++ b/tx-control-provider-jpa-local/pom.xml
@@ -171,8 +171,8 @@
<version>3.0.1</version>
<configuration>
<instructions>
- <Provide-Capability>osgi.contract;osgi.contract="JavaJPA";version:List<Version>="1.0,2.0,2.1";uses:="javax.persistence,javax.persistence.criteria,javax.persistence.metamodel,javax.persistence.spi"</Provide-Capability>
- <Require-Capability>osgi.contract;filter:="(&(osgi.contract=JavaJPA)(version=2.1))"</Require-Capability>
+ <Provide-Capability>osgi.contract;osgi.contract="JavaJPA";version:List<Version>="1.0,2.0,2.1";uses:="javax.persistence,javax.persistence.criteria,javax.persistence.metamodel,javax.persistence.spi",osgi.service;objectClass="org.osgi.service.transaction.control.jpa.JPAEntityManagerProvider";osgi.local.enabled="true";uses:="org.osgi.service.transaction.control.jpa",osgi.service;objectClass="org.osgi.service.transaction.control.jpa.JPAEntityManagerProviderFactory";osgi.local.enabled="true";uses:="org.osgi.service.transaction.control.jpa"</Provide-Capability>
+ <Require-Capability>osgi.contract;filter:="(&(osgi.contract=JavaJPA)(version=2.1))",osgi.service;filter:="(objectClass=org.osgi.service.jdbc.DataSourceFactory)";resolution:="optional";effective:="active",osgi.service;filter:="(objectClass=org.osgi.service.jpa.EntityManagerFactoryBuilder)";resolution:="optional";effective:="active"</Require-Capability>
</instructions>
</configuration>
</plugin>
diff --git a/tx-control-provider-jpa-xa/pom.xml b/tx-control-provider-jpa-xa/pom.xml
index 2bbdc6f..dd60063 100644
--- a/tx-control-provider-jpa-xa/pom.xml
+++ b/tx-control-provider-jpa-xa/pom.xml
@@ -208,8 +208,8 @@
<version>3.0.1</version>
<configuration>
<instructions>
- <Provide-Capability>osgi.contract;osgi.contract="JavaJPA";version:List<Version>="1.0,2.0,2.1";uses:="javax.persistence,javax.persistence.criteria,javax.persistence.metamodel,javax.persistence.spi"</Provide-Capability>
- <Require-Capability>osgi.contract;filter:="(&(osgi.contract=JavaJPA)(version=2.1))"</Require-Capability>
+ <Provide-Capability>osgi.contract;osgi.contract="JavaJPA";version:List<Version>="1.0,2.0,2.1";uses:="javax.persistence,javax.persistence.criteria,javax.persistence.metamodel,javax.persistence.spi",osgi.service;objectClass="org.osgi.service.transaction.control.jpa.JPAEntityManagerProvider";osgi.xa.enabled="true";uses:="org.osgi.service.transaction.control.jpa",osgi.service;objectClass="org.osgi.service.transaction.control.jpa.JPAEntityManagerProviderFactory";osgi.xa.enabled="true";uses:="org.osgi.service.transaction.control.jpa"</Provide-Capability>
+ <Require-Capability>osgi.contract;filter:="(&(osgi.contract=JavaJPA)(version=2.1))",osgi.service;filter:="(objectClass=org.osgi.service.jdbc.DataSourceFactory)";resolution:="optional";effective:="active",osgi.service;filter:="(objectClass=org.osgi.service.jpa.EntityManagerFactoryBuilder)";resolution:="optional";effective:="active"</Require-Capability>
</instructions>
</configuration>
</plugin>
diff --git a/tx-control-service-local/pom.xml b/tx-control-service-local/pom.xml
index 33b9e9c..fa00e4f 100644
--- a/tx-control-service-local/pom.xml
+++ b/tx-control-service-local/pom.xml
@@ -110,6 +110,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+ <instructions>
+ <Provide-Capability>osgi.service;objectClass="org.osgi.service.transaction.control.TransactionControl";osgi.local.enabled="true";uses:="org.osgi.service.transaction.control"</Provide-Capability>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git a/tx-control-service-xa/pom.xml b/tx-control-service-xa/pom.xml
index d45da05..0833531 100644
--- a/tx-control-service-xa/pom.xml
+++ b/tx-control-service-xa/pom.xml
@@ -138,6 +138,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+ <instructions>
+ <Provide-Capability>osgi.service;objectClass="org.osgi.service.transaction.control.TransactionControl";osgi.local.enabled="true";osgi.xa.enabled="true";uses:="org.osgi.service.transaction.control"</Provide-Capability>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file