servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1042937 - in /servicemix/smx4/specs/trunk: java-persistence-api-1.1.1/pom.xml java-persistence-api-2.0/pom.xml jaxb-api-2.2/src/main/java/javax/xml/bind/ContextFinder.java
Date Tue, 07 Dec 2010 08:42:36 GMT
Author: ffang
Date: Tue Dec  7 08:42:35 2010
New Revision: 1042937

URL: http://svn.apache.org/viewvc?rev=1042937&view=rev
Log:
[SMX4-697]java-persistence-api spec bundle wrongly import javax.persistence package

Modified:
    servicemix/smx4/specs/trunk/java-persistence-api-1.1.1/pom.xml
    servicemix/smx4/specs/trunk/java-persistence-api-2.0/pom.xml
    servicemix/smx4/specs/trunk/jaxb-api-2.2/src/main/java/javax/xml/bind/ContextFinder.java

Modified: servicemix/smx4/specs/trunk/java-persistence-api-1.1.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/java-persistence-api-1.1.1/pom.xml?rev=1042937&r1=1042936&r2=1042937&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/java-persistence-api-1.1.1/pom.xml (original)
+++ servicemix/smx4/specs/trunk/java-persistence-api-1.1.1/pom.xml Tue Dec  7 08:42:35 2010
@@ -55,7 +55,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.persistence*;version=1.1.1;-split-package:=merge-first</Export-Package>
-                        <Import-Package>*</Import-Package>
+                        <Import-Package>!javax.persistence*,*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
                         <Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
                         <Implementation-Title>Apache ServiceMix</Implementation-Title>

Modified: servicemix/smx4/specs/trunk/java-persistence-api-2.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/java-persistence-api-2.0/pom.xml?rev=1042937&r1=1042936&r2=1042937&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/java-persistence-api-2.0/pom.xml (original)
+++ servicemix/smx4/specs/trunk/java-persistence-api-2.0/pom.xml Tue Dec  7 08:42:35 2010
@@ -55,7 +55,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.persistence*;version=2.0;-split-package:=merge-first</Export-Package>
-                        <Import-Package>*</Import-Package>
+                        <Import-Package>!javax.persistence*,*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
                         <Bundle-Activator>org.apache.servicemix.specs.locator.Activator</Bundle-Activator>
                         <Implementation-Title>Apache ServiceMix</Implementation-Title>
@@ -173,4 +173,4 @@
         </profile>
     </profiles>
 
-</project>
\ No newline at end of file
+</project>

Modified: servicemix/smx4/specs/trunk/jaxb-api-2.2/src/main/java/javax/xml/bind/ContextFinder.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/jaxb-api-2.2/src/main/java/javax/xml/bind/ContextFinder.java?rev=1042937&r1=1042936&r2=1042937&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/jaxb-api-2.2/src/main/java/javax/xml/bind/ContextFinder.java
(original)
+++ servicemix/smx4/specs/trunk/jaxb-api-2.2/src/main/java/javax/xml/bind/ContextFinder.java
Tue Dec  7 08:42:35 2010
@@ -30,7 +30,7 @@ class ContextFinder {
     private static final String JAXB_CONTEXT_PROPERTY = JAXBContext.class.getName();
     private static final String JAXB_CONTEXT_FACTORY = JAXBContext.JAXB_CONTEXT_FACTORY;
 
-    public static JAXBContext find(String contextPath, ClassLoader classLoader, Map properties)
throws JAXBException {
+    public static JAXBContext find(String factoryId, String contextPath, ClassLoader classLoader,
Map properties) throws JAXBException {
         String className = null;
         // Patch for bug https://issues.apache.org/activemq/browse/SMX4-329
         if (contextPath == null || contextPath.length() == 0) {



Mime
View raw message