aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1433505 - in /aries/trunk/jpa/jpa-blueprint-aries: pom.xml src/main/resources/OSGI-INF/blueprint/jpa.xml
Date Tue, 15 Jan 2013 16:41:32 GMT
Author: dkulp
Date: Tue Jan 15 16:41:32 2013
New Revision: 1433505

URL: http://svn.apache.org/viewvc?rev=1433505&view=rev
Log:
Make sure jpa-blueprint-aries exports the namespace handler for both namespaces, not just
the 1.0

Modified:
    aries/trunk/jpa/jpa-blueprint-aries/pom.xml
    aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/OSGI-INF/blueprint/jpa.xml

Modified: aries/trunk/jpa/jpa-blueprint-aries/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-aries/pom.xml?rev=1433505&r1=1433504&r2=1433505&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint-aries/pom.xml (original)
+++ aries/trunk/jpa/jpa-blueprint-aries/pom.xml Tue Jan 15 16:41:32 2013
@@ -45,9 +45,6 @@
             javax.persistence;version="[1.0.0,3.0.0)",
             *
         </aries.osgi.import>
-        <aries.osgi.export.service>
-            org.apache.aries.blueprint.NamespaceHandler;osgi.service.blueprint.namespace=http://aries.apache.org/xmlns/jpa/v1.0.0
-        </aries.osgi.export.service>
     </properties>
 
     <dependencies>

Modified: aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/OSGI-INF/blueprint/jpa.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/OSGI-INF/blueprint/jpa.xml?rev=1433505&r1=1433504&r2=1433505&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/OSGI-INF/blueprint/jpa.xml (original)
+++ aries/trunk/jpa/jpa-blueprint-aries/src/main/resources/OSGI-INF/blueprint/jpa.xml Tue
Jan 15 16:41:32 2013
@@ -20,15 +20,15 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0">
-            
+    
   <service ref="namespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
     <service-properties>
-      <entry key="osgi.service.blueprint.namespace">
-        <array value-type="java.net.URI">
-          <value>http://aries.apache.org/xmlns/jpa/v1.0.0</value>
-          <value>http://aries.apache.org/xmlns/jpa/v1.1.0</value>
-        </array>
-      </entry>
+      <entry key="osgi.service.blueprint.namespace" value="http://aries.apache.org/xmlns/jpa/v1.0.0"/>
+    </service-properties>
+  </service>
+  <service ref="namespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+    <service-properties>
+      <entry key="osgi.service.blueprint.namespace" value="http://aries.apache.org/xmlns/jpa/v1.1.0"/>
     </service-properties>
   </service>
   
@@ -38,7 +38,7 @@
   
   <reference id="persistenceContextProvider" availability="optional"
        interface="org.apache.aries.jpa.container.context.PersistenceContextProvider">
-    <reference-listener ref="namespaceHandler" bind-method="contextAvailable" 
+  <reference-listener ref="namespaceHandler" bind-method="contextAvailable"
             unbind-method="contextUnavailable"/>
   </reference>
 </blueprint>
\ No newline at end of file



Mime
View raw message