sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onougu...@apache.org
Subject svn commit: r1694694 - in /sis/branches/JDK8: core/sis-metadata/pom.xml core/sis-referencing/pom.xml core/sis-utility/pom.xml pom.xml profiles/sis-french-profile/pom.xml storage/sis-netcdf/pom.xml storage/sis-storage/pom.xml
Date Fri, 07 Aug 2015 14:32:26 GMT
Author: onouguier
Date: Fri Aug  7 14:32:26 2015
New Revision: 1694694

URL: http://svn.apache.org/r1694694
Log:
OSGi metadata (SPI FLY)

Modified:
    sis/branches/JDK8/core/sis-metadata/pom.xml
    sis/branches/JDK8/core/sis-referencing/pom.xml
    sis/branches/JDK8/core/sis-utility/pom.xml
    sis/branches/JDK8/pom.xml
    sis/branches/JDK8/profiles/sis-french-profile/pom.xml
    sis/branches/JDK8/storage/sis-netcdf/pom.xml
    sis/branches/JDK8/storage/sis-storage/pom.xml

Modified: sis/branches/JDK8/core/sis-metadata/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/pom.xml?rev=1694694&r1=1694693&r2=1694694&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/pom.xml (original)
+++ sis/branches/JDK8/core/sis-metadata/pom.xml Fri Aug  7 14:32:26 2015
@@ -116,6 +116,11 @@ Implementations of metadata derived from
         <configuration>
           <instructions>
             <Bundle-SymbolicName>org.apache.sis.metadata</Bundle-SymbolicName>
+              <Export-Package>org.apache.sis.internal.jaxb.metadata, *</Export-Package>
+              <Require-Capability>osgi.extender;
+                  filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
+              <Provide-Capability>osgi.serviceloader;
+                  osgi.serviceloader=org.apache.sis.internal.jaxb.TypeRegistration</Provide-Capability>
           </instructions>
         </configuration>
       </plugin>

Modified: sis/branches/JDK8/core/sis-referencing/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/pom.xml?rev=1694694&r1=1694693&r2=1694694&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/pom.xml (original)
+++ sis/branches/JDK8/core/sis-referencing/pom.xml Fri Aug  7 14:32:26 2015
@@ -86,6 +86,11 @@ Implementations of Coordinate Reference
         <configuration>
           <instructions>
             <Bundle-SymbolicName>org.apache.sis.referencing</Bundle-SymbolicName>
+            <Export-Package>org.apache.sis.internal.referencing, *</Export-Package>
+            <Require-Capability>osgi.extender;
+            filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
+            <Provide-Capability>osgi.serviceloader;
+            osgi.serviceloader=org.apache.sis.internal.jaxb.TypeRegistration; osgi.serviceloader=org.apache.sis.internal.jaxb.AdapterReplacement,org.opengis.referencing.operation.MathTransformFactory,org.opengis.referencing.operation.OperationMethod,org.opengis.temporal.TemporalFactory</Provide-Capability>
           </instructions>
         </configuration>
       </plugin>

Modified: sis/branches/JDK8/core/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/pom.xml?rev=1694694&r1=1694693&r2=1694694&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/pom.xml (original)
+++ sis/branches/JDK8/core/sis-utility/pom.xml Fri Aug  7 14:32:26 2015
@@ -136,6 +136,15 @@ Miscellaneous utilities.
           <instructions>
             <Bundle-SymbolicName>org.apache.sis.util</Bundle-SymbolicName>
             <Bundle-Activator>org.apache.sis.internal.system.OSGiActivator</Bundle-Activator>
+            <Export-Package>*</Export-Package>
+            <Require-Capability>
+              osgi.extender;
+              filter:="(osgi.extender=osgi.serviceloader.registrar)",
+              osgi.serviceloader;
+              ;cardinality:=multiple,osgi.extender;
+              filter:="(osgi.extender=osgi.serviceloader.processor)"
+            </Require-Capability>
+            <SPI-Producer>*</SPI-Producer>
           </instructions>
         </configuration>
       </plugin>

Modified: sis/branches/JDK8/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/pom.xml?rev=1694694&r1=1694693&r2=1694694&view=diff
==============================================================================
--- sis/branches/JDK8/pom.xml (original)
+++ sis/branches/JDK8/pom.xml Fri Aug  7 14:32:26 2015
@@ -536,9 +536,10 @@ Apache SIS is a free software, Java lang
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.4.0</version>
+        <version>2.5.0</version>
         <extensions>true</extensions>
         <configuration>
+          <excludeDependencies>true</excludeDependencies>
           <instructions>
             <Bundle-DocURL>${project.url}</Bundle-DocURL>
           </instructions>

Modified: sis/branches/JDK8/profiles/sis-french-profile/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/profiles/sis-french-profile/pom.xml?rev=1694694&r1=1694693&r2=1694694&view=diff
==============================================================================
--- sis/branches/JDK8/profiles/sis-french-profile/pom.xml (original)
+++ sis/branches/JDK8/profiles/sis-french-profile/pom.xml Fri Aug  7 14:32:26 2015
@@ -97,6 +97,7 @@ Extensions to ISO-19115 metadata mandate
         <configuration>
           <instructions>
             <Bundle-SymbolicName>org.apache.sis.metadata.fra</Bundle-SymbolicName>
+            <Export-Package>*</Export-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: sis/branches/JDK8/storage/sis-netcdf/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/pom.xml?rev=1694694&r1=1694693&r2=1694694&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/pom.xml (original)
+++ sis/branches/JDK8/storage/sis-netcdf/pom.xml Fri Aug  7 14:32:26 2015
@@ -96,6 +96,7 @@ Bridge between NetCDF Climate and Foreca
         <configuration>
           <instructions>
             <Bundle-SymbolicName>org.apache.sis.storage.netcdf</Bundle-SymbolicName>
+            <Import-Package>!ucar.*, *</Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: sis/branches/JDK8/storage/sis-storage/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-storage/pom.xml?rev=1694694&r1=1694693&r2=1694694&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-storage/pom.xml (original)
+++ sis/branches/JDK8/storage/sis-storage/pom.xml Fri Aug  7 14:32:26 2015
@@ -109,6 +109,7 @@ Provides the interfaces and base classes
         <configuration>
           <instructions>
             <Bundle-SymbolicName>org.apache.sis.storage</Bundle-SymbolicName>
+            <Export-Package>org.apache.sis.internal.storage; x-friends=org.apache.sis.storage.netcdf,
*</Export-Package>
           </instructions>
         </configuration>
       </plugin>



Mime
View raw message