Author: cschneider Date: Fri Oct 21 09:01:07 2016 New Revision: 1765961 URL: http://svn.apache.org/viewvc?rev=1765961&view=rev Log: Use dpendency true instead of an api feature
Modified: aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaNsHandler.java aries/trunk/jpa/jpa-features/src/main/feature/feature.xml aries/trunk/jpa/jpa-repository/pom.xml Modified: aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaNsHandler.java URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaNsHandler.java?rev=1765961&r1=1765960&r2=1765961&view=diff ============================================================================== --- aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaNsHandler.java (original) +++ aries/trunk/jpa/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaNsHandler.java Fri Oct 21 09:01:07 2016 @@ -79,7 +79,7 @@ public class JpaNsHandler implements Nam } else if (NAMESPACE_JPA_20.equals(namespace)) { return this.getClass().getResource("/jpa20.xsd"); } else { - throw new IllegalArgumentException("Unknown namespace for jpa: " + namespace); + return null; } } Modified: aries/trunk/jpa/jpa-features/src/main/feature/feature.xml URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-features/src/main/feature/feature.xml?rev=1765961&r1=1765960&r2=1765961&view=diff ============================================================================== --- aries/trunk/jpa/jpa-features/src/main/feature/feature.xml (original) +++ aries/trunk/jpa/jpa-features/src/main/feature/feature.xml Fri Oct 21 09:01:07 2016 @@ -17,19 +17,14 @@ limitations under the License. --> <features name="aries-jpa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0"> - <feature name="persistence-api" description="Persistence API" version="2.0.0"> - <details>Persistence API</details> - <bundle start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/1.1</bundle> - </feature> - - <feature name="persistence-api" description="Persistence API" version="2.1.0"> - <details>Persistence API</details> - <bundle start-level="30">mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle> - </feature> - + <feature name="jpa" description="OSGi Persistence Container" version="${project.version}"> <details>JPA implementation provided by Apache Aries JPA 2.x. NB: this feature doesn't provide the JPA engine, you have to install one by yourself (OpenJPA for instance)</details> - <feature version="[2.0.0,2.2.0)">persistence-api</feature> + <capability> + osgi.service;effective:=active;objectClass=javax.persistence.spi.PersistenceProvider + </capability> + + <bundle dependency="true">mvn:org.eclipse.persistence/javax.persistence/2.1.0</bundle> <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle> <bundle dependency="true">mvn:org.osgi/org.osgi.service.jdbc/1.0.0</bundle> <bundle dependency="true" start-level="30">mvn:org.apache.felix/org.apache.felix.coordinator/1.0.2</bundle> Modified: aries/trunk/jpa/jpa-repository/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-repository/pom.xml?rev=1765961&r1=1765960&r2=1765961&view=diff ============================================================================== --- aries/trunk/jpa/jpa-repository/pom.xml (original) +++ aries/trunk/jpa/jpa-repository/pom.xml Fri Oct 21 09:01:07 2016 @@ -48,6 +48,7 @@ </properties> </profile> </profiles> + <!-- <build> <plugins> <plugin> @@ -69,6 +70,7 @@ </plugin> </plugins> </build> + --> <dependencies> <dependency> <groupId>org.osgi</groupId>