sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1676642 [2/2] - in /sis/branches/Android: ./ application/ application/sis-android/ application/sis-console/ application/sis-javafx/ application/sis-webapp/ core/ core/sis-build-helper/ core/sis-feature/ core/sis-metadata/ core/sis-referenc...
Date Tue, 28 Apr 2015 22:34:48 GMT
Modified: sis/branches/Android/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/Android/ide-project/NetBeans/nbproject/project.properties?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/branches/Android/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Tue Apr 28 22:34:46 2015
@@ -1,11 +1,28 @@
 #
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
 # SIS project file for NetBeans.
 # This can used as an alternative to Maven projects for development and testing purpose only.
 #
 application.title    = Spatial Information System (SIS)
 application.vendor   = Apache
 application.homepage = http://sis.apache.org/
-application.desc     = Apache SIS is a toolkit for describing location information, including points, bounding boxes, polygons, and for computing distances on that information.
+application.desc     = Apache SIS is a free software, Java language library for developing geospatial applications.
 
 #
 # Some global configuration.
@@ -14,6 +31,8 @@ includes             = **
 excludes             =
 main.class           =
 manifest.file        = manifest.mf
+project.license      = apache20
+no.dependencies      = true
 source.encoding      = UTF-8
 javac.source         = 1.6
 javac.target         = 1.6
@@ -29,15 +48,24 @@ src.local-src.dir    = ../local-src
 src.android.gen      = ${project.root}/application/sis-android/target/generated-sources/r
 src.android.dir      = ${project.root}/application/sis-android/src/main/java
 src.webapp.dir       = ${project.root}/application/sis-webapp/src/main/java
-src.app.dir          = ${project.root}/application/sis-app/src/main/java
+src.console.dir      = ${project.root}/application/sis-console/src/main/java
+test.console.dir     = ${project.root}/application/sis-console/src/test/java
 src.netcdf.dir       = ${project.root}/storage/sis-netcdf/src/main/java
 test.netcdf.dir      = ${project.root}/storage/sis-netcdf/src/test/java
+src.shapefile.dir    = ${project.root}/storage/sis-shapefile/src/main/java
+test.shapefile.dir   = ${project.root}/storage/sis-shapefile/src/test/java
+src.storage.dir      = ${project.root}/storage/sis-storage/src/main/java
+test.storage.dir     = ${project.root}/storage/sis-storage/src/test/java
+src.feature.dir      = ${project.root}/core/sis-feature/src/main/java
+test.feature.dir     = ${project.root}/core/sis-feature/src/test/java
 src.referencing.dir  = ${project.root}/core/sis-referencing/src/main/java
 test.referencing.dir = ${project.root}/core/sis-referencing/src/test/java
 src.metadata.dir     = ${project.root}/core/sis-metadata/src/main/java
 test.metadata.dir    = ${project.root}/core/sis-metadata/src/test/java
 src.utility.dir      = ${project.root}/core/sis-utility/src/main/java
 test.utility.dir     = ${project.root}/core/sis-utility/src/test/java
+src.fra-profile.dir  = ${project.root}/profiles/sis-french-profile/src/main/java
+test.fra-profile.dir = ${project.root}/profiles/sis-french-profile/src/test/java
 
 #
 # Version numbers for all dependencies.
@@ -48,15 +76,20 @@ android.version      = 4.1.1.4
 geoapi.version       = 3.0.0
 unit-api.version     = 0.6.1
 jsr275.version       = 0.9.3
-vecmath.version      = 1.5.2
+jama.version         = 1.0.3
+geometry.version     = 1.1.1
 georss.version       = 0.9.8
 rome.version         = 0.9
-jdom.version         = 1.0
+jdom1.version        = 1.0
+jdom2.version        = 2.0.4
 jee.version          = 6.0
-jcip.version         = 1.0
 osgi.version         = 5.0.0
-netcdf.version       = 4.3.16
-junit.version        = 4.10
+netcdf.version       = 4.4.2
+joda-time.version    = 2.2
+httpclient.version   = 4.2.6
+slf4j.version        = 1.7.5
+junit.version        = 4.11
+hamcrest.version     = 1.3
 
 #
 # Classpaths for compilation, execution and tests.
@@ -69,20 +102,23 @@ javac.classpath=\
     ${maven.repository}/org/opengis/geoapi/${geoapi.version}/geoapi-${geoapi.version}.jar:\
     ${maven.repository}/org/unitsofmeasurement/unit-api/${unit-api.version}/unit-api-${unit-api.version}.jar:\
     ${maven.repository}/javax/measure/jsr-275/${jsr275.version}/jsr-275-${jsr275.version}.jar:\
-    ${maven.repository}/java3d/vecmath/${vecmath.version}/vecmath-${vecmath.version}.jar:\
+    ${maven.repository}/com/esri/geometry/esri-geometry-api/${geometry.version}/esri-geometry-api-${geometry.version}.jar:\
     ${maven.repository}/org/geonames/georss-rome/${georss.version}/georss-rome-${georss.version}.jar:\
     ${maven.repository}/rome/rome/${rome.version}/rome-${rome.version}.jar:\
-    ${maven.repository}/jdom/jdom/${jdom.version}/jdom-${jdom.version}.jar:\
+    ${maven.repository}/jdom/jdom/${jdom1.version}/jdom-${jdom1.version}.jar:\
     ${maven.repository}/javax/javaee-api/${jee.version}/javaee-api-${jee.version}.jar:\
-    ${maven.repository}/net/jcip/jcip-annotations/${jcip.version}/jcip-annotations-${jcip.version}.jar:\
-    ${maven.repository}/edu/ucar/netcdf/${netcdf.version}/netcdf-${netcdf.version}.jar:\
+    ${maven.repository}/edu/ucar/cdm/${netcdf.version}/cdm-${netcdf.version}.jar:\
     ${maven.repository}/org/osgi/org.osgi.core/${osgi.version}/org.osgi.core-${osgi.version}.jar
 javac.processorpath=\
     ${javac.classpath}
 javac.test.classpath=\
     ${javac.classpath}:\
     ${maven.repository}/junit/junit/${junit.version}/junit-${junit.version}.jar:\
+    ${maven.repository}/org/hamcrest/hamcrest-core/${hamcrest.version}/hamcrest-core-${hamcrest.version}.jar:\
     ${maven.repository}/org/opengis/geoapi-conformance/${geoapi.version}/geoapi-conformance-${geoapi.version}.jar:\
+    ${maven.repository}/gov/nist/math/jama/${jama.version}/jama-${jama.version}.jar:\
+    ${maven.repository}/org/opengis/wrapper/geoapi-netcdf/${geoapi.version}/geoapi-netcdf-${geoapi.version}.jar:\
+    ${maven.repository}/org/opengis/wrapper/geoapi-netcdf/${geoapi.version}/geoapi-netcdf-${geoapi.version}-tests.jar:\
     ${build.classes.dir}
 javac.test.processorpath=\
     ${javac.test.classpath}
@@ -91,7 +127,14 @@ run.classpath=\
     ${build.classes.dir}
 run.test.classpath=\
     ${javac.test.classpath}:\
-    ${build.test.classes.dir}
+    ${build.test.classes.dir}:\
+    ${maven.repository}/org/jdom/jdom2/${jdom2.version}/jdom2-${jdom2.version}.jar:\
+    ${maven.repository}/edu/ucar/udunits/${netcdf.version}/udunits-${netcdf.version}.jar:\
+    ${maven.repository}/edu/ucar/httpservices/${netcdf.version}/httpservices-${netcdf.version}.jar:\
+    ${maven.repository}/joda-time/joda-time/${joda-time.version}/joda-time-${joda-time.version}.jar:\
+    ${maven.repository}/org/apache/httpcomponents/httpclient/${httpclient.version}/httpclient-${httpclient.version}.jar:\
+    ${maven.repository}/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar:\
+    ${maven.repository}/org/slf4j/slf4j-jdk14/${slf4j.version}/slf4j-jdk14-${slf4j.version}.jar
 debug.classpath=\
     ${run.classpath}
 debug.test.classpath=\
@@ -100,7 +143,7 @@ debug.test.classpath=\
 #
 # Build configuration and destination directories.
 #
-javac.compilerargs                       =
+javac.compilerargs                       = -Xdoclint:syntax,html,missing/protected,accessibility/protected
 javac.deprecation                        = true
 javadoc.windowtitle                      = Apache SIS
 javadoc.encoding                         = ${source.encoding}
@@ -142,4 +185,4 @@ build.sysclasspath
 dist.dir                                 = dist
 dist.jar                                 = ${dist.dir}/SIS.jar
 dist.javadoc.dir                         = ${dist.dir}/javadoc
-mkdist.disabled                          = false
+mkdist.disabled                          = true

Modified: sis/branches/Android/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/ide-project/NetBeans/nbproject/project.xml?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/Android/ide-project/NetBeans/nbproject/project.xml Tue Apr 28 22:34:46 2015
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 <project xmlns="http://www.netbeans.org/ns/project/1">
     <type>org.netbeans.modules.java.j2seproject</type>
     <configuration>
@@ -9,29 +27,43 @@
                 <root id="src.android.dir" name="Android application"/>
                 <root id="src.android.gen" name="Android generated resources"/>
                 <root id="src.webapp.dir" name="Web application"/>
-                <root id="src.app.dir" name="Application"/>
+                <root id="src.console.dir" name="Console"/>
                 <root id="src.netcdf.dir" name="NetCDF"/>
+                <root id="src.shapefile.dir" name="Shapefile"/>
+                <root id="src.storage.dir" name="Storage"/>
+                <root id="src.feature.dir" name="Feature"/>
                 <root id="src.referencing.dir" name="Referencing"/>
                 <root id="src.metadata.dir" name="Metadata"/>
                 <root id="src.utility.dir" name="Utility"/>
+                <root id="src.fra-profile.dir" name="French profile"/>
             </source-roots>
             <test-roots>
-                <root id="test.netcdf.dir" name="NetCDF tests"/>
-                <root id="test.referencing.dir" name="Referencing tests"/>
-                <root id="test.metadata.dir" name="Metadata tests"/>
-                <root id="test.utility.dir" name="Utility tests"/>
+                <root id="test.console.dir" name="Test Console"/>
+                <root id="test.netcdf.dir" name="Test NetCDF"/>
+                <root id="test.shapefile.dir" name="Test Shapefile"/>
+                <root id="test.storage.dir" name="Test Storage"/>
+                <root id="test.feature.dir" name="Test Feature"/>
+                <root id="test.referencing.dir" name="Test Referencing"/>
+                <root id="test.metadata.dir" name="Test Metadata"/>
+                <root id="test.utility.dir" name="Test Utility"/>
+                <root id="test.fra-profile.dir" name="Test French profile"/>
             </test-roots>
         </data>
         <spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
+            <word>accessor</word>
             <word>bitmask</word>
             <word>classname</word>
             <word>classnames</word>
             <word>classpath</word>
             <word>deserialization</word>
             <word>deserialized</word>
+            <word>endianness</word>
+            <word>geoidal</word>
+            <word>hectopascals</word>
             <word>initially</word>
             <word>javadoc</word>
             <word>loggings</word>
+            <word>maintainance</word>
             <word>marshallable</word>
             <word>marshalled</word>
             <word>marshaller</word>
@@ -41,12 +73,16 @@
             <word>monospaced</word>
             <word>namespace</word>
             <word>namespaces</word>
+            <word>orthodromic</word>
+            <word>parsable</word>
             <word>timezone</word>
             <word>Unicode</word>
+            <word>uninstall</word>
             <word>unmarshal</word>
             <word>unmarshaller</word>
             <word>unmarshallers</word>
             <word>unmarshalling</word>
+            <word>unparsable</word>
             <word>whitespaces</word>
         </spellchecker-wordlist>
     </configuration>

Modified: sis/branches/Android/ide-project/eclipse/classpath
URL: http://svn.apache.org/viewvc/sis/branches/Android/ide-project/eclipse/classpath?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/ide-project/eclipse/classpath (original)
+++ sis/branches/Android/ide-project/eclipse/classpath Tue Apr 28 22:34:46 2015
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="trunk/application/sis-webapp/src/main/java"/>
 	<classpathentry kind="src" path="trunk/application/sis-webapp/src/main/resources"/>
-	<classpathentry kind="src" path="trunk/application/sis-app/src/main/java"/>
+	<classpathentry kind="src" path="trunk/application/sis-console/src/main/java"/>
 	<classpathentry kind="src" path="trunk/core/sis-build-helper/src/main/java"/>
 	<classpathentry kind="src" path="trunk/core/sis-build-helper/src/main/resources"/>
 	<classpathentry kind="src" path="trunk/core/sis-build-helper/src/main/javadoc"/>
@@ -21,7 +21,6 @@
 	<classpathentry kind="var" path="M2_REPO/org/opengis/geoapi/3.0.0/geoapi-3.0.0.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/opengis/geoapi-conformance/3.0.0/geoapi-conformance-3.0.0.jar"/>
 	<classpathentry kind="var" path="M2_REPO/javax/measure/jsr-275/0.9.3/jsr-275-0.9.3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar"/>
 	<classpathentry kind="var" path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/5.0.0/org.osgi.core-5.0.0.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-core/3.0.4/maven-core-3.0.4.jar"/>

Modified: sis/branches/Android/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/pom.xml?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/pom.xml (original)
+++ sis/branches/Android/pom.xml Tue Apr 28 22:34:46 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>13</version>
+    <version>16</version>
   </parent>
 
 
@@ -39,16 +39,25 @@
        ============================================================== -->
   <groupId>org.apache.sis</groupId>
   <artifactId>parent</artifactId>
-  <version>0.3-android-SNAPSHOT</version>
+  <version>0.6-android-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache SIS</name>
-  <url>http://incubator.apache.org/sis/</url>
+  <url>http://sis.apache.org</url>
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
        The leading space after the first line is necessary for proper formatting. -->
-Apache SIS is a toolkit for describing location information, including points,
- bounding boxes, polygons, and for computing distances on that information.
+Apache SIS is a free software, Java language library for developing geospatial applications.
+ SIS provides data structures for geographic data and associated metadata along with methods
+ to manipulate those data structures. The SIS metadata module forms the base of the library
+ and enables the creation of metadata objects which comply with the ISO 19115 metadata model
+ and which can be read from or written to ISO 19139 compliant XML documents.
+ The SIS referencing module will enable the construction of geodetic data structures for
+ geospatial referencing based on the ISO 19111 model such as axis, projection and coordinate
+ reference system definitions, along with the associated operations which enable the mathematical
+ conversion of coordinates between different systems of reference.
+ The SIS storage modules will provide a common approach to the reading and writing of grid coverages
+ applicable to simple imagery as to many dimensional data structures.
   </description>
   <inceptionYear>2010</inceptionYear>
 
@@ -111,7 +120,7 @@ Apache SIS is a toolkit for describing l
       <name>Adam Estrada</name>
       <id>aestrada</id>
       <roles>
-        <role>lead</role>
+        <role>chair</role>
       </roles>
     </developer>
     <developer>
@@ -122,7 +131,6 @@ Apache SIS is a toolkit for describing l
       <organization>NASA Jet Propulsion Laboratory</organization>
       <organizationUrl>http://www.jpl.nasa.gov</organizationUrl>
       <timezone>-8</timezone>
-      <properties />
       <roles>
         <role>committer</role>
       </roles>
@@ -152,7 +160,6 @@ Apache SIS is a toolkit for describing l
       <organization>AT&amp;T Interactive</organization>
       <organizationUrl>http://www.attinteractive.com</organizationUrl>
       <timezone>-8</timezone>
-      <properties />
       <roles>
         <role>committer</role>
       </roles>
@@ -165,7 +172,6 @@ Apache SIS is a toolkit for describing l
       <organization>NASA Jet Propulsion Laboratory</organization>
       <organizationUrl>http://www.jpl.nasa.gov</organizationUrl>
       <timezone>-8</timezone>
-      <properties />
       <roles>
         <role>committer</role>
       </roles>
@@ -177,19 +183,25 @@ Apache SIS is a toolkit for describing l
       <organization>NASA Jet Propulsion Laboratory</organization>
       <organizationUrl>http://www.jpl.nasa.gov</organizationUrl>
       <timezone>-8</timezone>
-      <properties />
       <roles>
         <role>committer</role>
       </roles>
     </developer>
     <developer>
+      <name>Travis L. Pinney</name>
+      <id>tlpinney</id>
+      <email>travis.pinney@gmail.com</email>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
       <name>Nga Chung</name>
       <id>nchung</id>
       <email>nchung@apache.org</email>
       <organization>NASA Jet Propulsion Laboratory</organization>
       <organizationUrl>http://www.jpl.nasa.gov</organizationUrl>
       <timezone>-8</timezone>
-      <properties />
       <roles>
         <role>committer</role>
       </roles>
@@ -222,6 +234,12 @@ Apache SIS is a toolkit for describing l
       </roles>
     </contributor>
     <contributor>
+      <name>Christina Hough</name>
+      <roles>
+        <role>translator</role>
+      </roles>
+    </contributor>
+    <contributor>
       <name>Gregory D. Reddin</name>
       <!-- id>greddin</id -->
       <roles>
@@ -299,7 +317,7 @@ Apache SIS is a toolkit for describing l
   <dependencyManagement>
     <dependencies>
       <!-- Import all dependency management used by the GeAPI project.
-           This include JUnit, vecmath and units of measurement. -->
+           This include JUnit and units of measurement. -->
       <dependency>
         <groupId>org.opengis</groupId>
         <artifactId>geoapi-parent</artifactId>
@@ -321,20 +339,25 @@ Apache SIS is a toolkit for describing l
 
       <!-- Libraries (language, XML, network) -->
       <dependency>
+        <groupId>com.esri.geometry</groupId>
+        <artifactId>esri-geometry-api</artifactId>
+        <version>1.2</version>
+      </dependency>
+      <dependency>
+        <groupId>gov.nist.math</groupId>
+        <artifactId>jama</artifactId>
+        <version>1.0.3</version>
+      </dependency>
+      <dependency>
         <groupId>javax</groupId>
         <artifactId>javaee-api</artifactId>
         <version>6.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>org.geonames</groupId>
-        <artifactId>georss-rome</artifactId>
-        <version>0.9.8</version>
-      </dependency>
-      <dependency>
-        <groupId>net.jcip</groupId>
-        <artifactId>jcip-annotations</artifactId>
-        <version>1.0</version>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-compress</artifactId>
+        <version>1.9</version>
       </dependency>
 
       <!-- Optional dependencies -->
@@ -346,10 +369,16 @@ Apache SIS is a toolkit for describing l
       </dependency>
       <dependency>
         <groupId>edu.ucar</groupId>
-        <artifactId>netcdf</artifactId>
+        <artifactId>cdm</artifactId>
         <version>${netcdf.version}</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-jdk14</artifactId>
+        <version>1.7.5</version> <!-- Must matches the version used by NetCDF. -->
+        <scope>runtime</scope> <!-- Should never be needed at compile time. -->
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -373,9 +402,7 @@ Apache SIS is a toolkit for describing l
          The last properties in this list depend on the Apache SIS branch.
        =================================================================== -->
   <properties>
-    <geoapi.version>3.0.0</geoapi.version>
-    <netcdf.version>4.3.16</netcdf.version>
-    <findbugs.version>2.5.2</findbugs.version>
+    <netcdf.version>4.4.2</netcdf.version> <!-- Last version compatible with JDK6. -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <website.encoding>UTF-8</website.encoding>
     <website.locale>en</website.locale>
@@ -384,6 +411,7 @@ Apache SIS is a toolkit for describing l
     <maven.compile.source>1.6</maven.compile.source>
     <maven.compile.target>1.6</maven.compile.target>
     <sis.plugin.version>${project.version}</sis.plugin.version>
+    <geoapi.version>3.0.0</geoapi.version>
   </properties>
 
   <profiles>
@@ -394,6 +422,50 @@ Apache SIS is a toolkit for describing l
         <maven.compiler.optimize>true</maven.compiler.optimize>
       </properties>
     </profile>
+    <profile>
+      <id>jdk8</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <additionalparam>
+                -Xdoclint:syntax -Xdoclint:html -Xdoclint:missing -Xdoclint:accessibility
+              </additionalparam>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <activation>
+        <property>
+          <name>bootclasspath</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <compilerArgs>
+                <arg>-bootclasspath</arg>
+                <arg>${bootclasspath}</arg>
+              </compilerArgs>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <bootclasspath>${bootclasspath}</bootclasspath>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
 
@@ -412,6 +484,21 @@ Apache SIS is a toolkit for describing l
           <source>${maven.compile.source}</source>
           <target>${maven.compile.target}</target>
           <encoding>${project.build.sourceEncoding}</encoding>
+          <useIncrementalCompilation>false</useIncrementalCompilation> <!-- https://jira.codehaus.org/browse/MCOMPILER-209 -->
+          <compilerArgs>
+            <arg>-Xlint</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
+
+      <!-- Execute test suites instead of individual test cases. -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/*TestSuite.java</include>
+          </includes>
         </configuration>
       </plugin>
 
@@ -419,16 +506,15 @@ Apache SIS is a toolkit for describing l
            Note: <index> and <addClasspath> are mutually exclusive: when both are enabled,
            the META-INF/INDEX.LIST file has precedence over the "Class-Path" entry in the
            META-INF/MANIFEST.MF file,  thus causing java.lang.NoClassDefFoundError if the
-           INDEX.LIST file is incomplete (which seem to happen in practice).
-      -->
+           INDEX.LIST file is incomplete (which seem to happen in practice). -->
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <addMavenDescriptor>false</addMavenDescriptor>
             <index>false</index>
             <manifest>
               <addClasspath>true</addClasspath>
-              <mainClass>org.apache.sis.util.About</mainClass>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
             <manifestEntries>
@@ -450,112 +536,43 @@ Apache SIS is a toolkit for describing l
         </executions>
       </plugin>
 
-      <!-- Build XHTML pages from the DocBook files
-           See src/main/docbook/README.txt -->
+      <!-- Checkstype configuration
+           Legal note: Checkstyle is under LGPL license, but it is okay to use it only for
+           the build if it is downloaded by Maven (not included in Apache SIS distribution).
+           See http://www.apache.org/legal/resolved.html#prohibited
+      -->
       <plugin>
-        <groupId>com.agilejava.docbkx</groupId>
-        <artifactId>docbkx-maven-plugin</artifactId>
-        <version>2.0.14</version>
-        <inherited>false</inherited>
-        <dependencies>
-          <dependency> <!-- XHTML generation -->
-            <groupId>net.sf.docbook</groupId>
-            <artifactId>docbook-xml</artifactId>
-            <version>5.0-all</version>
-            <classifier>resources</classifier>
-            <type>zip</type>
-            <scope>runtime</scope>
-          </dependency>
-          <dependency> <!-- Syntax highlighting -->
-            <groupId>net.sf.xslthl</groupId>
-            <artifactId>xslthl</artifactId>
-            <version>2.1.0</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
-        <configuration>
-          <sourceDirectory>${basedir}/src/main/docbook</sourceDirectory>
-          <targetDirectory>${basedir}/target/site/book</targetDirectory>
-          <xhtmlCustomization>src/main/docbook/book.xsl</xhtmlCustomization>
-          <xincludeSupported>true</xincludeSupported>
-          <htmlStylesheet>book.css</htmlStylesheet>
-          <highlightSource>true</highlightSource>
-        </configuration>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.13</version>
         <executions>
           <execution>
             <goals>
-              <goal>generate-xhtml</goal>
+              <goal>check</goal>
             </goals>
-            <phase>pre-site</phase>
+            <configuration>
+              <skip>${skipTests}</skip> <!-- When skipping tests, skip also checkstyle verification. -->
+              <encoding>${project.build.sourceEncoding}</encoding>
+              <consoleOutput>true</consoleOutput>
+              <checkstyleRules>
+                <module name="Checker">
+                  <module name="FileTabCharacter"/>     <!-- Checks that there are no tab characters in the file. -->
+<!--              <module name="NewlineAtEndOfFile"/>   <!-  Checks that there is a newline at the end of each file. ->
+                  <module name="TreeWalker">
+                    <module name="RedundantImport"/>    <!- Checks for redundant import statements. ->
+                    <module name="GenericWhitespace"/>  <!- Checks that the whitespace around the Generic tokens follow the typical convention. ->
+                  </module> -->
+                </module>
+              </checkstyleRules>
+            </configuration>
           </execution>
         </executions>
       </plugin>
 
-      <!-- Create web site -->
-      <plugin>
-        <artifactId>maven-site-plugin</artifactId>
-        <configuration>
-          <locales>${website.locale}</locales>
-          <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
-          <outputEncoding>${website.encoding}</outputEncoding>
-        </configuration>
-      </plugin>
-
-      <!-- Dependencies requires for the SIS FindBugs configuration file.
-           This dependency should be declared in the <reporting> section,
-           but Maven 3.0.4 does not support dependency declaration there.
-           Note that the version number is duplicated in the <reporting>
-           section, because <reporting> ignores <pluginManagement>. -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>${findbugs.version}</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.sis</groupId>
-            <artifactId>sis-build-helper</artifactId>
-            <version>${sis.plugin.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-
-    <!-- Following plugins are used only by some specific modules. -->
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.8</version>
-        </plugin>
-        <plugin>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>jetty-maven-plugin</artifactId>
-          <version>8.0.0.M2</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-
-
-  <!-- ==============================================================
-         Reports configuration.
-       ============================================================== -->
-  <reporting>
-    <plugins>
-      <!-- Overwrite the configuration declared in the Apache parent pom.xml
-           in order to use version 2.5.1 instead than 2.5. This is necessary
-           for avoiding a NullPointerException (http://jira.codehaus.org/browse/MPIR-248) -->
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.6</version>
-      </plugin>
-
-      <!-- Produce JavaDoc -->
+      <!-- JavaDoc configuration. -->
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9</version>
+        <version>2.10.1</version>
         <configuration>
           <source>${maven.compile.source}</source>              <!-- Enables javadoc to handle language constructs present in target JDK. -->
           <encoding>${project.build.sourceEncoding}</encoding>  <!-- Encoding of Java source file. -->
@@ -564,13 +581,11 @@ Apache SIS is a toolkit for describing l
           <locale>${website.locale}</locale>                    <!-- Locale for navigation bar, help file contents, etc. -->
           <author>false</author>                                <!-- Excludes the authors text in the generated docs. -->
           <version>false</version>                              <!-- Excludes the version text in the generated docs. -->
-          <nosince>true</nosince>                               <!-- Omits the "Since" sections associated with the since tags. -->
           <noqualifier>all</noqualifier>                        <!-- Omit qualifying package name before class names in output. -->
           <quiet>true</quiet>                                   <!-- Shuts off non-error and non-warning messages. -->
           <keywords>true</keywords>                             <!-- Adds HTML meta keyword tags to the generated files. -->
           <breakiterator>true</breakiterator>                   <!-- Better boundary detection when determining the end of the first sentence. -->
-          <stylesheetfile>src/main/javadoc/stylesheet.css</stylesheetfile>
-          <validateLinks>true</validateLinks>
+          <validateLinks>true</validateLinks>                   <!-- Validates content of package-list resources. -->
           <links>
             <link>http://www.geoapi.org/3.0/javadoc</link>
           </links>
@@ -582,8 +597,20 @@ Apache SIS is a toolkit for describing l
               <packages>org.apache.sis.test*</packages>
             </group>
             <group>
+              <title>Applications</title>
+              <packages>org.apache.sis.console*:org.apache.sis.services*</packages>
+            </group>
+            <group>
+              <title>Data storage</title>
+              <packages>org.apache.sis.storage*:org.apache.sis.index*</packages>
+            </group>
+            <group>
+              <title>Feature and Geometry</title>
+              <packages>org.apache.sis.feature*:org.apache.sis.geometry*</packages>
+            </group>
+            <group>
               <title>Referencing</title>
-              <packages>org.apache.sis.core*:org.apache.sis.distance*:org.apache.sis.referencing*:org.apache.sis.parameter*</packages>
+              <packages>org.apache.sis.referencing*:org.apache.sis.parameter*</packages>
             </group>
             <group>
               <title>Metadata</title>
@@ -591,12 +618,16 @@ Apache SIS is a toolkit for describing l
             </group>
             <group>
               <title>Utilities</title>
-              <packages>org.apache.sis.math*:org.apache.sis.measure*:org.apache.sis.util*:org.apache.sis.io*:org.apache.sis.xml*</packages>
+              <packages>org.apache.sis.math*:org.apache.sis.measure*:org.apache.sis.util*:org.apache.sis.io*:org.apache.sis.xml*:org.apache.sis.setup*</packages>
+            </group>
+            <group>
+              <title>Profiles</title>
+              <packages>org.apache.sis.profile*</packages>
             </group>
           </groups>
 
           <!-- Internal packages to hide from javadoc. -->
-          <excludePackageNames>org.apache.sis.internal:com</excludePackageNames>
+          <excludePackageNames>org.apache.sis.internal:org.apache.sis.util.resources:org.apache.sis.referencing.operation.provider:com:org.opengis</excludePackageNames>
 
           <!-- Custom taglets, some of them implemented in Java. -->
           <tags>
@@ -607,60 +638,74 @@ Apache SIS is a toolkit for describing l
           </tags>
           <taglets>
             <taglet><tagletClass>org.apache.sis.internal.taglet.Module</tagletClass></taglet>
-            <taglet><tagletClass>org.apache.sis.internal.taglet.WebSite</tagletClass></taglet>
-            <taglet><tagletClass>org.apache.sis.internal.taglet.Section</tagletClass></taglet>
-            <taglet><tagletClass>org.apache.sis.internal.taglet.Note</tagletClass></taglet>
+            <taglet><tagletClass>org.apache.sis.internal.taglet.Include</tagletClass></taglet>
             <taglet><tagletClass>org.apache.sis.internal.taglet.Preformat</tagletClass></taglet>
           </taglets>
+          <doclet>org.apache.sis.internal.doclet.Doclet</doclet>
           <tagletArtifact>
-            <groupId>org.apache.sis</groupId>
+            <groupId>org.apache.sis.core</groupId>
             <artifactId>sis-build-helper</artifactId>
             <version>${sis.plugin.version}</version>
           </tagletArtifact>
+          <docletArtifact>
+            <groupId>org.apache.sis.core</groupId>
+            <artifactId>sis-build-helper</artifactId>
+            <version>${sis.plugin.version}</version>
+          </docletArtifact>
         </configuration>
       </plugin>
 
-      <!-- Produce Source cross references -->
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
-      </plugin>
-
-      <!-- Unit tests report -->
-      <plugin>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.12.4</version>
-      </plugin>
-
-      <!-- "Release Audit" report (checks license headers etc.) -->
+      <!-- Create web site. The Maven generated site is not deployed at the URL
+           declared in this pom.xml (namely http://sis.apache.org). Consequently,
+           we disable links relativization for avoiding confusing behavior. -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <locales>${website.locale}</locales>
+          <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
+          <outputEncoding>${website.encoding}</outputEncoding>
+          <relativizeDecorationLinks>false</relativizeDecorationLinks>
+        </configuration>
       </plugin>
 
-      <!-- FindBugs Report. Checkstyle configuration instructions apply also to FindBugs:
-           http://maven.apache.org/plugins/maven-checkstyle-plugin/examples/multi-module-config.html
-      -->
+      <!-- Dependencies requires for the SIS FindBugs configuration file. -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>${findbugs.version}</version> <!-- See also the same plugin in the <build> section. -->
-        <configuration>
-          <threshold>Normal</threshold>
-          <effort>Default</effort>
-          <excludeFilterFile>org/apache/sis/findbugs-exclude.xml</excludeFilterFile>
-       </configuration>
+        <version>2.5.3</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.sis.core</groupId>
+            <artifactId>sis-build-helper</artifactId>
+            <version>${sis.plugin.version}</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
-  </reporting>
+
+    <!-- Following plugins are used only by some specific modules. -->
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.9.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>jetty-maven-plugin</artifactId>
+          <version>8.1.14.v20131031</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 
 
 
   <!-- ==============================================================
          Additional repositories from which to download artifacts.
          The parent pom.xml already declares the apache.snapshots
-         repository for library artefacts. But we also need it for
+         repository for library artifacts. But we also need it for
          Maven plugins in order to download sis-build-helper when
          the user did not built it himself.
        ============================================================== -->
@@ -676,7 +721,6 @@ Apache SIS is a toolkit for describing l
   </pluginRepositories>
 
 
-
   <!-- ==============================================================
          Group of modules to build in approximate dependency order.
        ============================================================== -->
@@ -684,6 +728,7 @@ Apache SIS is a toolkit for describing l
     <module>core</module>
     <module>storage</module>
     <module>application</module>
+    <module>profiles</module>
   </modules>
 
 </project>

Modified: sis/branches/Android/profiles/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/profiles/pom.xml?rev=1676642&r1=1676571&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/profiles/pom.xml (original)
+++ sis/branches/Android/profiles/pom.xml Tue Apr 28 22:34:46 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>parent</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.6-android-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/Android/profiles/sis-french-profile/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/profiles/sis-french-profile/pom.xml?rev=1676642&r1=1676571&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/profiles/sis-french-profile/pom.xml (original)
+++ sis/branches/Android/profiles/sis-french-profile/pom.xml Tue Apr 28 22:34:46 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>profiles</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.6-android-SNAPSHOT</version>
   </parent>
 
 
@@ -37,7 +37,7 @@
        =========================================================== -->
   <groupId>org.apache.sis.profiles</groupId>
   <artifactId>sis-french-profile</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Apache SIS French profiles</name>
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
@@ -87,24 +87,6 @@ Extensions to ISO-19115 metadata mandate
 
 
   <!-- ===========================================================
-           Build configuration
-       =========================================================== -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.sis.metadata.fra</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-
-  <!-- ===========================================================
            Dependencies
        =========================================================== -->
   <dependencies>

Modified: sis/branches/Android/src/main/javadoc/overview.html
URL: http://svn.apache.org/viewvc/sis/branches/Android/src/main/javadoc/overview.html?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/src/main/javadoc/overview.html (original)
+++ sis/branches/Android/src/main/javadoc/overview.html Tue Apr 28 22:34:46 2015
@@ -1,23 +1,35 @@
 <!DOCTYPE html>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
 <html>
   <head>
     <title>API Overview</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   </head>
   <body>
-    Overview of <a href="{@website}">Apache SIS™ (Spatial Information System)</a>.
+    Overview of <a href="http://sis.apache.org">Apache SIS™ (Spatial Information System)</a>.
 
     <h3>Requirements</h3>
     <p>SIS requires Java 6 Standard Edition.</p>
 
-    <h3>Javadoc annotations</h3>
-    <p>SIS uses standard javadoc annotations. The meaning of some tags are refined as below:</p>
-    <ul>
-      <li>{@code @since}   - the SIS version when the annotated element (class, method, <i>etc.</i>) was first introduced.</li>
-      <li>{@code @version} - the last SIS version when the code of the annotated class got a significant change.</li>
-      <li>{@code @author}  - developer names in <var>First name</var> <var>Last name</var> <var>(organization)</var> format.</li>
-    </ul>
-
     <h3>Classes naming</h3>
     <p>Implementations of <a href="http://www.geoapi.org/">GeoAPI interfaces</a> usually (but not always)
     begin with {@code Abstract}, {@code Default}, {@code Simple} or {@code General} prefix.

Modified: sis/branches/Android/src/main/javadoc/stylesheet.css
URL: http://svn.apache.org/viewvc/sis/branches/Android/src/main/javadoc/stylesheet.css?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/src/main/javadoc/stylesheet.css (original)
+++ sis/branches/Android/src/main/javadoc/stylesheet.css Tue Apr 28 22:34:46 2015
@@ -1,36 +1,64 @@
 /*
- * This file is divided in two parts.   The first part is specific to the SIS project
- * and defines the styles used by the developers in the javadoc comments.  The second
- * part is a modified copy of the default stylesheet provided by the Javadoc tools.
- * Note that the second part is totally different between JDK6 and JDK7.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+@import url('standard.css');
 
 /*
+ * This file is divided in two parts. The first part is specific to the SIS project
+ * and defines the styles used by the developers in the javadoc comments. The second
+ * part overwrites some aspects of the default stylesheet provided by the Javadoc tools.
+ */
+
+
+/*
+ * Definition of <table class="sis">
+ *
  * Table without vertical space between rows, a little bit of space between columns,
  * a light background color and a header with a darker background color. The header
  * also have a little bit more space, and a border is drawn around the table.
  */
+table.sis caption {
+  color:          #0086E0;
+  font-weight:    bold;
+  padding-bottom: 4px;
+}
+
 table.sis {
+  margin:           18px 0;
+  width:            auto;
   background-color: #F4F8FF;
-  border-color:     Black;
+  border-color:     darkgray;
   border-style:     solid;
-  border-width:     1pt;
-  border-spacing:   0pt;
-  margin:           12pt 0 12pt 0;
-  padding:          0pt;
-  width:            auto;
+  border-width:     1px;
+  border-spacing:   0;
+  padding:          0;
+  line-height:      1em;
 }
 
 table.sis tr th {
   background-color:    #B9DCFF;
-  border-bottom-color: Black;
+  border-bottom-color: darkgray;
   border-bottom-style: solid;
-  border-bottom-width: 1pt;
-  padding:             3pt;
+  border-bottom-width: 1px;
+  padding:             6px;
+  padding-bottom:      3px;
 }
 
 table.sis tr td {
-  padding:        1.5pt 9pt;
+  padding:        3px 12px;
   vertical-align: text-top;
 }
 
@@ -38,63 +66,104 @@ table.sis tr td {
  * Optionally add a line or column separator.
  */
 table.sis tr th.hsep {
-  border-top-width: 1pt;
+  border-top-width: 1px;
   border-top-style: solid;
+  border-top-color: darkgray;
+}
+
+table.sis tr td.hsep {
+  border-top-width: 1px;
+  border-top-style: solid;
+  border-top-color: darkgray;
 }
 
 table.sis tr th.sep {
-  border-left-width: 1pt;
+  border-left-width: 1px;
   border-left-style: solid;
   border-left-color: #819AB2;
 }
 
 table.sis tr td.sep {
-  border-left-width: 1pt;
+  border-left-width: 1px;
   border-left-style: solid;
   border-left-color: #AAADB2;
 }
 
+
 /*
+ * Definition of <table class="compact">
+ *
  * Table without vertical space between rows and a little bit of space between columns.
- * This table has no border.
+ * This table has no border and text is left-aligned.
  */
 table.compact {
+  margin:         6px 0px;
   width:          auto;
   border:         none;
-  border-spacing: 0pt;
-  padding:        0pt;
+  border-spacing: 0;
+  padding:        0;
+  line-height:    1em;
+  text-align:     left;
 }
 
 table.compact tr td {
-  padding-top:    0pt;
-  padding-bottom: 0pt;
-  padding-right:  3pt;
-  padding-left:   3pt;
+  padding:        0 9px;
+  vertical-align: text-top;
 }
 
-table.compact tr td.onright {
-  padding-right: 1pt;
-  text-align:    right;
-  font-weight:   normal;
+
+/*
+ * Definition of <div class="note">
+ *
+ * Note or examples.
+ */
+div.note {
+  color:     #353833;
+  font-size:   small;
+  margin-left:  40px;
+  margin-right: 40px;
+  margin-top:    9px;
+  margin-bottom: 9px;
 }
 
-table.compact tr td.onleft {
-  padding-left: 1pt;
-  text-align:   left;
-  font-weight:  normal;
+
+/*
+ * The warning box for upcomming API changes. The warning icon is 64 pixels height.
+ * Since we have 30 pixels in top and bottom padding, There is 34 remaining pixels
+ * to set as the minimal height.
+ */
+div.warning {
+  border-width: 2pt;
+  border-style: solid;
+  border-color: darkred;
+  background:   antiquewhite;
+  margin:       12pt 30pt;
+  padding:      15px;
+  min-height:   34px;
+}
+
+div.warning:before {
+  position: relative;
+  float:    left;
+  top:      -15px;
+  left:     -15px;
+  content:  url("warning.png");
 }
 
+
 /*
- * Formatting if the {@section} custom javadoc tag.
+ * Formatting of section headers
  */
-div.block h5 {
-  margin-top:   15pt;
-  margin-bottom: 3pt;
+div.section {
+  font-size:    15px;
+  font-weight:  bold;
+  margin-top:   21px;
+  margin-bottom: 3px;
 }
 
-div.block h6 {
-  margin-top:   15pt;
-  margin-bottom: 3pt;
+div.description div.section {
+  font-size:  18px;
+  margin-top: 30px;
 }
 
 /*
@@ -103,64 +172,91 @@ div.block h6 {
  */
 div.block ul,
 div.block ol {
-  margin-top:    9pt;
-  margin-bottom: 9pt;
+  margin-top:    9px;
+  margin-bottom: 9px;
+  text-align:   left;
 }
 
-div.block li > ul,
-div.block li > ol {
-  margin-top:    0pt;
-  margin-bottom: 6pt;
+div.block ul > li,
+div.block ol > li {
+  margin-top:    0;
+  margin-bottom: 3px;
 }
 
-div.block ul {
-  list-style-type: square;
+div.block ul.verbose > li,
+div.block ol.verbose > li {
+  margin-top:    9px;
+  margin-bottom: 9px;
+  text-align: justify;
 }
 
-ul.verbose li {
-  margin-top:    3pt;
-  margin-bottom: 3pt;
+/*
+ * Reduce the space for sublists.
+ */
+div.block ul > li > ul,
+div.block ol > li > ul {
+  margin-top:    3px;
+  margin-bottom: 6px;
+  text-align:   left;
+}
+
+div.block ul > li > ul > li,
+div.block ol > li > ul > li {
+  margin-top:    0;
+  margin-bottom: 0;
+}
+
+div.block center {
+  margin-top:    18px;
+  margin-bottom: 18px;
 }
 
 /*
- * Code example formatted by the {@preformat} taglet.
- * Overrides the <pre> definition provided by the Javadoc tools.
+ * Miscellaneous.
  */
-div.block pre {
-  font-size: 1em;
+span.deprecated {
+  text-decoration: line-through;
 }
 
+div.block {
+  text-align: justify;
+}
 
 
 
 /* ----------------------------------------------------------------------
- * End of SIS-specific part. The remaining of this file is derived from
- * the Javadoc default stylesheet for the target platform (JDK6 or JDK7).
- *
- * The styles in this file are declared in their approximative usage order,
- * from top to bottom: frame, navigation bar, class description, details...
+ * End of SIS-specific part. The remaining of this file overwrite some
+ * aspects of the Javadoc default stylesheet.
  */
-/* Page background color */
-body { background-color: #FFFFFF; color:#000000 }
+body, div.block {
+  color:       black;
+  font-family: Helvetica, Arial, sans-serif;
+}
+
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+  color:       #353833;
+  font-family: Helvetica, Arial, sans-serif;
+  margin-left: 40px;
+}
+
+pre, div.block pre, code, tt, dt code, table tr td dt code {
+  font-family: Andale Mono, Courier New, monospace;
+}
 
-/* Headings */
-h1 { font-size: 145% }
+div.block pre, code, tt, dt code, table tr td dt code {
+  line-height: 1em;
+  font-size:   1em;
+}
 
-/* Table colors */
-.TableHeadingColor     { background: #CCCCFF; color:#000000 } /* Dark mauve */
-.TableSubHeadingColor  { background: #EEEEFF; color:#000000 } /* Light mauve */
-.TableRowColor         { background: #FFFFFF; color:#000000 } /* White */
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont   { font-size: 100%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
-.FrameHeadingFont { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
-.FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
-
-/* Navigation bar fonts and colors */
-.NavBarCell1    { background-color:#EEEEFF; color:#000000} /* Light mauve */
-.NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */
-.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;}
-.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;}
+h5 {
+  font-size: 110%;
+  margin-bottom: 3pt;
+}
 
-.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000}
-.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000}
+/* Appareance of links in the "Description" column of class and package summaries.
+ * JDK style uses bold characters for the left column, which contains the class and
+ * package names. But we do not want those bold characters to apply to the descriptions.
+ */
+td.colLast div.block a:link {
+  font-weight: normal;
+}

Modified: sis/branches/Android/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/sis/branches/Android/src/site/apt/index.apt?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/src/site/apt/index.apt [UTF-8] (original)
+++ sis/branches/Android/src/site/apt/index.apt [UTF-8] Tue Apr 28 22:34:46 2015
@@ -1,3 +1,22 @@
+~~
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements.  See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership.  The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License.  You may obtain a copy of the License at
+~~
+~~   http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied.  See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+~~
+
                              ------------------------------
                                         Overview
                              ------------------------------
@@ -5,42 +24,23 @@
 
 The Apache SIS™ library
 
-  Apache SIS is a toolkit for describing location information, including points, bounding boxes,
-  polygons, and for computing distances on that information.
+  Apache SIS is a free software, Java language library for developing geospatial applications.
+  The library can be used for desktop or server applications.
+  SIS is an implementation of GeoAPI 3.0 interfaces.
+
+  SIS provides data structures for geographic data and associated metadata along with methods
+  to manipulate those data structures. The SIS metadata module forms the base of the library
+  and enables the creation of metadata objects which comply with the ISO 19115 metadata model
+  and which can be read from or written to ISO 19139 compliant XML documents.
+  The SIS referencing module will enable the construction of geodetic data structures for
+  geospatial referencing based on the ISO 19111 model such as axis, projection and coordinate
+  reference system definitions, along with the associated operations which enable the mathematical
+  conversion of coordinates between different systems of reference.
+  The SIS storage modules will provide a common approach to the reading and writing of grid coverages
+  applicable to simple imagery as to many dimensional data structures.
 
   SIS is a project of the {{{http://www.apache.org}Apache Software Foundation}}.
-
-
-* Using SIS
-
-  SIS requires a Java 6 Runtime Environment.
-  The latest release is <<<0.2-incubating>>>.
-  The version under development is <<<0.3-android-SNAPSHOT>>>.
-
-
-* Documentation
-
-** User documentation
-
-    * {{{./download.html}Downloading binaries}}
-
-    * {{{./apidocs/index.html}Aggregated Javadoc}}
-
-    * Developer Guide (English - translation to be provided later) ({{{./book/fr.xhtml}Français}})
-
-    * {{{http://cwiki.apache.org/confluence/display/SIS}SIS Wiki}}
-
-
-** SIS developer documentation
-
-    * {{{./develop.html}Developing Apache SIS}}
-
-    * {{{./branches.html}Branches (JDK6, JDK7, GeoAPI)}}
-
-    * {{{./code-patterns.html}Recommended code patterns}}
-
-    * {{{./code-format.html}Code and Javadoc formatting}}
-
+  The project home is {{http://sis.apache.org}}.
 
   Apache SIS, Apache, the Apache feather logo, and the Apache SIS project logo are trademarks of
   The Apache Software Foundation.

Modified: sis/branches/Android/src/site/resources/css/site.css
URL: http://svn.apache.org/viewvc/sis/branches/Android/src/site/resources/css/site.css?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/src/site/resources/css/site.css (original)
+++ sis/branches/Android/src/site/resources/css/site.css Tue Apr 28 22:34:46 2015
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-/* Override styles in maven-base.css */
+/* Overwrite styles in maven-base.css */
 #leftColumn {
  width: 190px;
 }
@@ -23,7 +23,7 @@
   margin-left: 210px;
 }
 
-/* Override styles in maven-theme.css */
+/* Overwrite styles in maven-theme.css */
 a {
   color: #387085;
 }

Modified: sis/branches/Android/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/src/site/site.xml?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/src/site/site.xml (original)
+++ sis/branches/Android/src/site/site.xml Tue Apr 28 22:34:46 2015
@@ -19,39 +19,43 @@
   under the License.
 -->
 
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
+<project xmlns="http://maven.apache.org/DECORATION/1.3.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
-                             http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0
+                             http://maven.apache.org/xsd/decoration-1.3.0.xsd">
+
+  <!-- ====================================================
+           Root site descriptor for Apache SIS project
+       ==================================================== -->
   <bannerLeft>
     <name>Apache SIS</name>
+    <src>http://builds.apache.org/job/sis-trunk/site/images/banner.png</src>
     <href>http://builds.apache.org/job/sis-trunk/site/index.html</href>
   </bannerLeft>
 
   <body>
-    <!-- ==================================================== -->
-    <!--     Links to appears just below the right banner     -->
-    <!-- ==================================================== -->
+    <!--
+        Links to appears just below the right banner.
+        Those links will be inherited by all modules.
+    -->
     <links>
-      <item name="Apache" href="http://www.apache.org"/>
+      <item name="Apache Software Foundation (ASF)" href="http://www.apache.org"/>
       <item name="Open Geospatial Consortium (OGC)" href="http://www.opengeospatial.org"/>
       <item name="GeoAPI" href="http://www.geoapi.org"/>
-      <item name="Javadoc" href="http://builds.apache.org/job/sis-trunk/site/apidocs/index.html"/>
-      <!-- Absolute URL in order to point to the aggregated Javadoc instead than module Javadoc. -->
+      <item name="SIS home" href="http://sis.apache.org"/>
     </links>
 
-    <!-- ==================================================== -->
-    <!--     Menus to appears on the left side of home page   -->
-    <!-- ==================================================== -->
-    <menu name="Quick links" inherit="none">
-      <item name="Aggregated Javadoc" href="apidocs/index.html"/>
-      <item name="Mailing list"       href="mail-lists.html"/>
-      <item name="Who we are"         href="team-list.html"/>
-      <item name="License"            href="http://www.apache.org/licenses/"/>
+    <!--
+        Menus to appears on the left side of home page.
+    -->
+    <menu name="Quick links" inherit="top">
+      <item name="Aggregated Javadoc" href="http://builds.apache.org/job/sis-trunk/site/apidocs/index.html"/>
+      <!-- Absolute URL in order to point to the aggregated Javadoc instead than module Javadoc. -->
     </menu>
 
-    <menu ref="modules" inherit="bottom"/> <!-- Replaced by menu for submodules. -->
-    <menu ref="reports" inherit="bottom"/> <!-- Replaced by menus for any configured reports (mailing lists, etc.) -->
+    <menu ref="parent"  inherit="top"/>    <!-- Replaced by a link to the parent. -->
+    <menu ref="modules" inherit="top"/>    <!-- Replaced by menu for submodules. -->
+    <menu ref="reports" inherit="top"/>    <!-- Replaced by menus for any configured reports (mailing lists, etc.) -->
 
   </body>
 </project>

Modified: sis/branches/Android/storage/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/storage/pom.xml?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/storage/pom.xml (original)
+++ sis/branches/Android/storage/pom.xml Tue Apr 28 22:34:46 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>parent</artifactId>
-    <version>0.3-android-SNAPSHOT</version>
+    <version>0.6-android-SNAPSHOT</version>
   </parent>
 
 
@@ -39,8 +39,8 @@
   <packaging>pom</packaging>
   <name>Apache SIS storage</name>
   <description>
-    Group of services for reading and writing data from/to storage.
-    Storage are typically file formats or a database schemas.
+    Group of modules for reading and writing data from/to various storages.
+    Storages are typically file formats or a database schemas.
   </description>
 
 
@@ -75,18 +75,59 @@
 
 
   <!-- ===========================================================
+           Build configuration
+       =========================================================== -->
+  <build>
+    <plugins>
+
+      <!-- Collect JAR files in <root>/target/binaries directory. -->
+      <plugin>
+        <groupId>org.apache.sis.core</groupId>
+        <artifactId>sis-build-helper</artifactId>
+        <version>${sis.plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>collect-jars</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+
+  <!-- ===========================================================
            Dependencies
        =========================================================== -->
   <dependencies>
     <dependency>
-      <groupId>org.apache.sis</groupId>
+      <groupId>org.apache.sis.core</groupId>
       <artifactId>sis-metadata</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.sis.core</groupId>
+      <artifactId>sis-referencing</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.opengis</groupId>
       <artifactId>geoapi</artifactId>
     </dependency>
+
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.opengis</groupId>
+      <artifactId>geoapi-conformance</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sis.core</groupId>
+      <artifactId>sis-utility</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 
@@ -94,6 +135,8 @@
            Sub-modules included in the build
        =========================================================== -->
   <modules>
+    <module>sis-storage</module>
+    <module>sis-shapefile</module>
     <module>sis-netcdf</module>
   </modules>
 

Modified: sis/branches/Android/storage/sis-netcdf/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/storage/sis-netcdf/pom.xml?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/storage/sis-netcdf/pom.xml (original)
+++ sis/branches/Android/storage/sis-netcdf/pom.xml Tue Apr 28 22:34:46 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>storage</artifactId>
-    <version>0.3-android-SNAPSHOT</version>
+    <version>0.6-android-SNAPSHOT</version>
   </parent>
 
 
@@ -42,7 +42,7 @@
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
        The leading space after the first line is necessary for proper formatting. -->
-Bridge between NetCDF CF convention and ISO 19115 metadata.
+Bridge between NetCDF Climate and Forecast (CF) convention and ISO 19115 metadata.
   </description>
 
 
@@ -72,6 +72,16 @@ Bridge between NetCDF CF convention and
         <role>developer</role>
       </roles>
     </contributor>
+    <contributor>
+      <name>Johann Sorel</name>
+      <email>johann.sorel@geomatys.com</email>
+      <organization>Geomatys</organization>
+      <organizationUrl>http://www.geomatys.com/</organizationUrl>
+      <timezone>+1</timezone>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </contributor>
   </contributors>
 
 
@@ -80,8 +90,20 @@ Bridge between NetCDF CF convention and
        =========================================================== -->
   <dependencies>
     <dependency>
+      <groupId>org.apache.sis.storage</groupId>
+      <artifactId>sis-storage</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
       <groupId>edu.ucar</groupId>
-      <artifactId>netcdf</artifactId>
+      <artifactId>cdm</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
@@ -91,6 +113,9 @@ Bridge between NetCDF CF convention and
       <id>UCAR</id>
       <name>UCAR repository</name>
       <url>https://artifacts.unidata.ucar.edu/content/repositories/unidata-releases</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
     </repository>
   </repositories>
 

Modified: sis/branches/Android/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/Android/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java [UTF-8] (original)
+++ sis/branches/Android/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java [UTF-8] Tue Apr 28 22:34:46 2015
@@ -16,20 +16,39 @@
  */
 
 /**
- * Maps ISO metadata elements from/to the <a href="http://www.cfconventions.org">CF-compliant</a>
+ * Maps ISO metadata elements from/to the <a href="http://www.cfconventions.org">Climate and Forecast (CF)</a>
  * attributes in a NetCDF file. The mapping is defined in the following web pages:
  *
  * <ul>
- *   <li><a href="https://geo-ide.noaa.gov/wiki/index.php?title=NetCDF_Attribute_Convention_for_Dataset_Discovery">NetCDF
- *       Attribute Convention for Dataset Discovery</a> wiki</li>
- *   <li><a href="http://ngdc.noaa.gov/metadata/published/xsl/nciso2.0/UnidataDD2MI.xsl">UnidataDD2MI.xsl</a> file</li>
+ *   <li><a href="http://wiki.esipfed.org/index.php/Category:Attribute_Conventions_Dataset_Discovery">NetCDF
+ *       Attribute Convention for Dataset Discovery</a> version 1.0.</li>
+ *   <li><a href="http://ngdc.noaa.gov/metadata/published/xsl/nciso2.0/UnidataDD2MI.xsl">UnidataDD2MI.xsl</a> file.</li>
  * </ul>
  *
  * The NetCDF attributes recognized by this package are listed in the
- * {@link org.apache.sis.storage.netcdf.NetcdfMetadata} class.
+ * {@link org.apache.sis.storage.netcdf.AttributeNames} class.
+ *
+ * <div class="section">Note on the definition of terms</div>
+ * The UCAR library sometime uses the same words than the ISO/OGC standards for different things.
+ * In particular the words <cite>"domain"</cite> and <cite>"range"</cite> can be applied to arbitrary functions,
+ * and the UCAR library chooses to apply it to the function that converts grid indices to geodetic coordinates.
+ * The ISO 19123 standard on the other hand considers coverage as a function, and applies those <cite>domain</cite>
+ * and <cite>range</cite> words to that function. More specifically:
+ *
+ * <ul>
+ *   <li>UCAR <cite>"coordinate system"</cite> is actually a mix of <cite>coordinate system</cite>,
+ *       <cite>coordinate reference system</cite> and <cite>grid geometry</cite> in OGC sense.</li>
+ *   <li>UCAR coordinate system <cite>"domain"</cite> is not equivalent to ISO 19123 coverage domain,
+ *       but is rather related to <cite>grid envelope</cite>.</li>
+ *   <li>ISO 19123 coverage <cite>domain</cite> is related to UCAR coordinate system <cite>"range"</cite>.</li>
+ *   <li>ISO 19123 coverage <cite>range</cite> is not equivalent to UCAR <cite>"range"</cite>,
+ *       but is rather related to the NetCDF variable's minimum and maximum values.</li>
+ * </ul>
+ *
+ * Care must be taken for avoiding confusion when using SIS and UCAR libraries together.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
- * @since   0.3 (derived from geotk-3.20)
+ * @since   0.3
  * @version 0.3
  * @module
  */

Modified: sis/branches/Android/storage/sis-shapefile/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/storage/sis-shapefile/pom.xml?rev=1676642&r1=1676571&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/storage/sis-shapefile/pom.xml (original)
+++ sis/branches/Android/storage/sis-shapefile/pom.xml Tue Apr 28 22:34:46 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>storage</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.6-android-SNAPSHOT</version>
   </parent>
 
 
@@ -37,7 +37,7 @@
        =========================================================== -->
   <groupId>org.apache.sis.storage</groupId>
   <artifactId>sis-shapefile</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Apache SIS Shapefile storage</name>
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
@@ -80,17 +80,6 @@ Read and write files in the Shapefile fo
           </execution>
         </executions>
       </plugin>
-
-      <!-- Package as OSGi bundle -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.sis.storage.shapefile</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

Modified: sis/branches/Android/storage/sis-storage/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/storage/sis-storage/pom.xml?rev=1676642&r1=1676571&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/storage/sis-storage/pom.xml (original)
+++ sis/branches/Android/storage/sis-storage/pom.xml Tue Apr 28 22:34:46 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>storage</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.6-android-SNAPSHOT</version>
   </parent>
 
 
@@ -37,7 +37,7 @@
        =========================================================== -->
   <groupId>org.apache.sis.storage</groupId>
   <artifactId>sis-storage</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Apache SIS common storage</name>
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
@@ -99,24 +99,6 @@ Provides the interfaces and base classes
 
 
   <!-- ===========================================================
-           Build configuration
-       =========================================================== -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.sis.storage</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-
-  <!-- ===========================================================
            Dependencies
        =========================================================== -->
   <dependencies>



Mime
View raw message