sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1676642 [1/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
Author: desruisseaux
Date: Tue Apr 28 22:34:46 2015
New Revision: 1676642

URL: http://svn.apache.org/r1676642
Log:
Merge the trunk to the Android branch.
This is not yet really an Android-compatible branch however, as we need to remove dependencies not available on Android.

Added:
    sis/branches/Android/.gitignore
      - copied unchanged from r1676571, sis/trunk/.gitignore
    sis/branches/Android/application/
      - copied from r1676571, sis/trunk/application/
    sis/branches/Android/application/sis-android/   (props changed)
      - copied from r1676637, sis/branches/Android/application/sis-android/
    sis/branches/Android/core/
      - copied from r1676571, sis/trunk/core/
    sis/branches/Android/profiles/
      - copied from r1676571, sis/trunk/profiles/
    sis/branches/Android/src/README.txt
      - copied unchanged from r1676571, sis/trunk/src/README.txt
    sis/branches/Android/src/main/javadoc/warning.png
      - copied unchanged from r1676571, sis/trunk/src/main/javadoc/warning.png
    sis/branches/Android/src/site/resources/images/banner.png
      - copied unchanged from r1676571, sis/trunk/src/site/resources/images/banner.png
    sis/branches/Android/storage/sis-netcdf/src/main/java/org/apache/sis/internal/
      - copied from r1676571, sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/
    sis/branches/Android/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
      - copied unchanged from r1676571, sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
    sis/branches/Android/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
      - copied unchanged from r1676571, sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
    sis/branches/Android/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
      - copied unchanged from r1676571, sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
    sis/branches/Android/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
      - copied unchanged from r1676571, sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
    sis/branches/Android/storage/sis-netcdf/src/main/resources/
      - copied from r1676571, sis/trunk/storage/sis-netcdf/src/main/resources/
    sis/branches/Android/storage/sis-netcdf/src/test/java/org/apache/sis/internal/
      - copied from r1676571, sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/
    sis/branches/Android/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
      - copied unchanged from r1676571, sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
    sis/branches/Android/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
      - copied unchanged from r1676571, sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
    sis/branches/Android/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
      - copied unchanged from r1676571, sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/NetcdfStoreTest.java
    sis/branches/Android/storage/sis-netcdf/src/test/java/org/apache/sis/test/
      - copied from r1676571, sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/test/
    sis/branches/Android/storage/sis-shapefile/
      - copied from r1676571, sis/trunk/storage/sis-shapefile/
    sis/branches/Android/storage/sis-storage/
      - copied from r1676571, sis/trunk/storage/sis-storage/
Removed:
    sis/branches/Android/CHANGES
    sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml~
    sis/branches/Android/src/main/docbook/
    sis/branches/Android/src/site/apt/branches.apt
    sis/branches/Android/src/site/apt/code-format.apt
    sis/branches/Android/src/site/apt/develop.apt
    sis/branches/Android/src/site/apt/download.apt
    sis/branches/Android/src/site/fml/
    sis/branches/Android/src/site/resources/book/
    sis/branches/Android/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfMetadata.java
Modified:
    sis/branches/Android/   (props changed)
    sis/branches/Android/KEYS
    sis/branches/Android/NOTICE
    sis/branches/Android/README
    sis/branches/Android/application/pom.xml
    sis/branches/Android/application/sis-android/pom.xml
    sis/branches/Android/application/sis-console/pom.xml
    sis/branches/Android/application/sis-javafx/pom.xml
    sis/branches/Android/application/sis-webapp/pom.xml
    sis/branches/Android/core/pom.xml
    sis/branches/Android/core/sis-build-helper/pom.xml
    sis/branches/Android/core/sis-feature/pom.xml
    sis/branches/Android/core/sis-metadata/pom.xml
    sis/branches/Android/core/sis-referencing/pom.xml
    sis/branches/Android/core/sis-utility/pom.xml
    sis/branches/Android/ide-project/NetBeans/README.txt
    sis/branches/Android/ide-project/NetBeans/build.xml
    sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml
    sis/branches/Android/ide-project/NetBeans/nbproject/genfiles.properties
    sis/branches/Android/ide-project/NetBeans/nbproject/project.properties
    sis/branches/Android/ide-project/NetBeans/nbproject/project.xml
    sis/branches/Android/ide-project/eclipse/classpath
    sis/branches/Android/pom.xml
    sis/branches/Android/profiles/pom.xml
    sis/branches/Android/profiles/sis-french-profile/pom.xml
    sis/branches/Android/src/main/javadoc/overview.html
    sis/branches/Android/src/main/javadoc/stylesheet.css
    sis/branches/Android/src/site/apt/index.apt
    sis/branches/Android/src/site/resources/css/site.css
    sis/branches/Android/src/site/site.xml
    sis/branches/Android/storage/pom.xml
    sis/branches/Android/storage/sis-netcdf/pom.xml
    sis/branches/Android/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java
    sis/branches/Android/storage/sis-shapefile/pom.xml
    sis/branches/Android/storage/sis-storage/pom.xml

Propchange: sis/branches/Android/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 28 22:34:46 2015
@@ -1,3 +1,4 @@
-/sis/branches/JDK6:1394364-1480634
-/sis/branches/JDK7:1394913-1480633
-/sis/trunk:1430670-1480638
+/sis/branches/JDK6:1394364-1675090
+/sis/branches/JDK7:1394913-1675087
+/sis/branches/JDK8:1584960-1675086
+/sis/trunk:1430670-1676571

Modified: sis/branches/Android/KEYS
URL: http://svn.apache.org/viewvc/sis/branches/Android/KEYS?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/KEYS (original)
+++ sis/branches/Android/KEYS Tue Apr 28 22:34:46 2015
@@ -47,4 +47,63 @@ dTgTbK62ZnSjsnRYbgf0HdA+kW9n9XBMEHwgYk0q
 iEkEGBECAAkFAkdvL9QCGwwACgkQcPCcxrh2iEplXwCgraY3ELlDStqpJDSUzVsN
 rGuNiwsAoKz92ycEjcMnoLnX8AaPADdo1m/P
 =zEfO
------END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub   4096R/74383E9D 2013-07-24
+uid                  Martin Desruisseaux (Code signing key) <desruisseaux@apache.org>
+sig 3        74383E9D 2013-07-24  Martin Desruisseaux (Code signing key) <desruisseaux@apache.org>
+sub   4096R/E498164E 2013-07-24
+sig          74383E9D 2013-07-24  Martin Desruisseaux (Code signing key) <desruisseaux@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.13 (Darwin)
+
+mQINBFHvqcIBEAC3A4uREnOGEk/oUzFMEjvVpzTWUv4jEcZSYe85X26XMJIUaF5S
+8HNVP+ub5cD+nEQg/pW9ZFKO7K4dEsWNMkbsWN4Rs5Jd/mU+IMI8af6VtptIzvFS
+pzjjz+6PQhE1lkjj8hqssY8NiMMDbhOrI581tXAIWU44u0159Qv36op8u1k6gBs9
+7uwWXhL9CIUMrvHXQ8bYlYE0Tdq0x9Me8rPSUri7/0alXI7VShTv58ZgVHEdkd4w
+YdcKSjc+oMjB/Vr+ZR6eszLDVOgd6MfsD7glu9Igepeura64FZSo/tVndX02SBlk
+Grf4xIetzr93YNXnQmy3DNjJCA8cR4up0PS3hDaT/VoMpM/fKG3b3rNnKH0+p6s6
+akudbCBaWp0Y4IF+WMhXXQ1fGpDpg9pZxRNqAUFn4O+wYi1N1Ipyrs8LuP2br69P
+wTb/+qreab/ya8/moFNJAnmB9kVevXjqVG4Ua6kvxp9ArsI+xPXADH1FH5n0bgoC
+lT6UBO+Lav48oKyQXNjAay1TpDeWodsYW2XNq+DvbkBiUWgFa6n7KzRlTsS2ZBEB
+Djq+bNjt+5banhIe/4WQfjD8HeC//y3QVjCpzYqZIWfjzK3IEcUnnb8ryVz74//N
+GlxwRPcLVmfAHlcCCTRHlDtiXRe1+WG43yTNWx7Nf8cMxaTgIbLazuwBYQARAQAB
+tEBNYXJ0aW4gRGVzcnVpc3NlYXV4IChDb2RlIHNpZ25pbmcga2V5KSA8ZGVzcnVp
+c3NlYXV4QGFwYWNoZS5vcmc+iQI3BBMBCgAhBQJR76nCAhsDBQsJCAcDBRUKCQgL
+BRYCAwEAAh4BAheAAAoJENie86Z0OD6dVhkP/iNiTCCpMDEMdbItQHVePyiJo5TF
+V4OVqSKeD+LudFu1W+lUrvH12qBs4hRBn9X7jOAHEKomEbNXjAbxtM8hLm8nsVTD
+wiKFRs5mSx73YU6CZp4xfohITihud7fqjKaFVsFJHhye5/Y5HbRGxqjs5BgAmsGe
+1VzlUxyLQIDq5kNhupqSf4iGignkTG6AWkc/G554e72MNSQs+Pn5addkCFxcVYDA
+IvLslDqYKpeO+H5CZd4ErfgI479zOg4jigvGMpX1CmbKm6BlYN+qyQ55RqNPxkgR
+HvtR3QtPW+f15TgTA959uOhmG3hY/e2LA2PYZfgrfEuD6/F73O/t7F7BKLhLHM4e
+K2fU7lKKN75EuWBL4t5Jk/XpfhyyhhgC+nQSwpp/m+DilH6g+2dwUS0PNMLp1FL7
+v36TihFsY5KG4K6PF0x3HziJRNmAOihr+boWTIzYbpajnwMB3pssjXBAHh1gwVrp
+bv/03+xnwDl390mZ0pUaFqh+EmOb2SAESs509VYCpwmM40uXa7dtuzQQOjNYyaQf
+qSll3OsHv0jj7q9tfzmS06Pe37Fd82KeJWQ3cEq3yS6l0mdsruM7ad3i6KJffM+n
+QzQb8wJ9wGnLunmhmR8KfNgjXjUGSPjUDJbRGOtljiGj8PI+F+ai5Z8/nOqUnmCB
+yi/2Z2gmXP3Ab9/BuQINBFHvqcIBEADTmQbDA+vAVXO9jQhs5JFCBOPFJ7SrV4Pa
+9OWtEBQnXaRp5t7xGlCE4UeIGypXD36IETnrujeU4oleoiqIbhi9l/zJPwxfCMVN
+YJzLhRH264D1PFlAhoACK+h0gVUlMAU+uT9ZK2jpOxta/QIVI16qYkiQbfG/x7n2
+/JSvZM41A85Xgjcyo9YXGxuWClNKNOslQevv7caJFy9KKVC/9F7II7cPoC/pes5T
+QwM5MHEUzpDKy6pcy/LlkbkD50p/yMft8A8xf1k3PNz/WheDrR/bZU1R9xzfuzDJ
+d6RvXx3qK3LVnmhp916sOYGLTn8uumsiaSGafk+rhWCmIKIBTyNx2aJb/sygEAJ6
+SgWId6XkzmBcoIuqhg1B2UfqIYXIr22OeIawzhus2yruMBw6ihxJELwgRDdpiFXw
+3ZDtZoAncxrwWJH2MZjeitHz1qZwWoOxo/8D4iKP7o4i4pB6glVnyaXnoAC9Kzk8
+OREFKX/EBpXTNIpJ+QnbADMqzmiBV8RmF4WNLI+5S+n3CrZF8nCmxCfzh+Bt8yWg
+W+hf8RjHqJ3W83fJ2lrrtNZoAZxcAfljhsI537Y2iqt14ug52gIViEhP0yZjnofa
+i+QvzZuzUlYbn6ciu3/cAe+3mAqdt4DiEXvpsQhpvIWjJQg3OOvyjtDxNCIJJUIa
+6rDVSmhrOwARAQABiQIfBBgBCgAJBQJR76nCAhsMAAoJENie86Z0OD6dU4oQAIXy
+OhaCR+DrkeN0PIHmRH6PziXT3MYlW8/VZ+DDnUrXEjMcNK54AEVnU5zMBWDvbUc5
+NY/V6m7YSuLyMBt3VDHpbSOvCe+sGMf1REf3I5WEatCACX9d1YNo+QtXIs+XzpRB
+scB8hOlLvzeHCUw6hPyRIqLkBuGRHGz/oI0gU89AEjEa/sQmTQMgu5Kbvvx5dgkj
+IFau07qjsw/B0FhMD4TfSbvc63tYrP7fYq1MYA0RGoxSGQT3dKTobp9M22+Ad8oX
+3xOE1NhqdiK9hUstKlpMk9enx5ptLPsTIw4Ukq27pMCsvzX1K2XnjvZf0T7g70uT
+eN7oe3PMwrAfxJ6cGksO2KAqU+iBmQIJxtGDNtEvNW4+vsAQjwHEySSMWaBti/nZ
++2FEfHv+om8rviBqNPuNxyppd1PItdgEf3qr0CUHnzWxbM8zgDGHUWVx2tglFIX3
+e4Y+IxQJ7832aWU8IsRANJUMJNyVXsqa0KhZe8HiuQeiBTjJ7lTojMirIqol2Oo1
+iINiBWgWK097misxZJn+UEdqFy6QaSV+D4LfJLUNUlW95qKK3lwANajx+TMRKq/T
+pYIMUHvS5/iFiLqB2+356mstyfihcCNYHtItl5JoHuk70lgo++kXNXFqeioxmhLO
+fply+kduHJz3CtJhSQpzcPlbwXtyR4OkRTHWBCG/
+=rrNc
+-----END PGP PUBLIC KEY BLOCK-----

Modified: sis/branches/Android/NOTICE
URL: http://svn.apache.org/viewvc/sis/branches/Android/NOTICE?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/NOTICE (original)
+++ sis/branches/Android/NOTICE Tue Apr 28 22:34:46 2015
@@ -1,5 +1,5 @@
 Apache Spatial Information System (SIS)
-Copyright 2010-2013 The Apache Software Foundation
+Copyright 2010-2015 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -8,5 +8,11 @@ The Javadoc contains documentation from
 (OGC®) specifications (http://www.opengeospatial.org/standards/), also
 known as OpenGIS.
 
-The test suite includes software developed by
-the JUnit community (http://github.com/junit-team/junit.contrib/)
+The matrix package contains code adapted from JAMA Java Matrix Package
+(http://math.nist.gov/javanumerics/jama/)
+
+Some modules use the Esri Geometry API developed by ESRI
+(http://github.com/Esri/geometry-api-java/)
+
+The test suite uses software developed by the JUnit community
+(http://github.com/junit-team/junit.contrib/)

Modified: sis/branches/Android/README
URL: http://svn.apache.org/viewvc/sis/branches/Android/README?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/README (original)
+++ sis/branches/Android/README Tue Apr 28 22:34:46 2015
@@ -1,16 +1,28 @@
-========================================================
-Welcome to Apache SIS <http://incubator.apache.org/sis/>
-========================================================
-
-Apache SIS(TM) is a spatial framework that enables better representation
-of coordinates for searching, data clustering, archiving, or any other
-relevant spatial needs.
+=============================================
+Welcome to Apache SIS <http://sis.apache.org>
+=============================================
+
+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 Apache Software Foundation <http://www.apache.org/>.
 
 Apache SIS, SIS, Apache, the Apache feather logo, and the Apache SIS
 project logo are trademarks of The Apache Software Foundation.
 
+
 Getting Started
 ===============
 
@@ -19,56 +31,14 @@ build system. To build SIS, use the foll
 
     mvn clean install
 
+Information for running the application can be found on the wiki
+(<http://cwiki.apache.org/confluence/display/SIS/>)
 
-Tomcat Server (See much simpler Jetty integration below)
-========================================================
-The build consists of a number of components, including a web-based application
-file (WAR) you can use to try out SISfeatures. You can run it on top of Apache Tomcat like this:
-
-    /usr/local/tomcat/bin/shutdown.sh
-    mkdir /usr/local/sis
-    cd /usr/local/sis
-    cp -R /path/to/apache-sis-X.Y-src/sis-webapp/target/sis-webapp-X.Y.war ./
-    cp -R /path/to/apache-sis-X.Y-src/sis-webapp/src/main/webapp/META-INF/context.xml ./sis.xml
-    edit sis.xml (set the docBase to /usr/local/sis/sis-webapp-X.Y.war and the property
-          org.apache.sis.services.config.filePath to /usr/local/sis/sis-location-config.xml,
-          org.apache.sis.services.config.qIndexPath to /usr/local/sis/qtree,
-          org.apache.sis.services.config.geodataPath to /usr/local/sis/geodata)
-    cp -R /path/to/apache-sis-X.Y-src/sis-webapp/src/main/resources/sis-location-config.xml ./
-    edit sis-location-config.xml (add or delete GeoRSS URLs)
-    ln -s /usr/local/sis/sis.xml /usr/local/tomcat/conf/Catalina/localhost/sis.xml
-    /usr/local/tomcat/bin/startup.sh
-    Visit http://localhost:8080/sis/demo.jsp and checkout the demo!
-    Try some queries:
-
-    Bounding Box:
-      0, 50, 50, 100
-
-    Point Raidus:
-      0, 80, 400km
-
-Jetty Server
-============
-Jetty is now supported too (as of 02/11/2012). Simply build the project at the root level
-
-	mvn clean install
-
-Then browse to the sis-webapp directory. To run the built-in Jetty server, type the command:
-
-	mvn jetty:run
-
-Visit http://localhost:8080/sis-webapp/demp.jsp and run the same queries as noted above.
-
-    Bounding Box:
-      0, 50, 50, 100
-
-    Point Raidus:
-      0, 80, 400km
 
 License (see also LICENSE)
 ==========================
 
-Collective work: Copyright 2010 The Apache Software Foundation.
+Collective work: Copyright 2010-2015 The Apache Software Foundation.
 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -109,6 +79,7 @@ You can subscribe the mailing lists by s
 To unsubscribe, send a message to <LIST>-unsubscribe@sis.apache.org.
 For more instructions, send a message to <LIST>-help@sis.apache.org.
 
+
 Issue Tracker
 =============
 

Modified: sis/branches/Android/application/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/application/pom.xml?rev=1676642&r1=1676571&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/application/pom.xml (original)
+++ sis/branches/Android/application/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>
 
 

Propchange: sis/branches/Android/application/sis-android/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 28 22:34:46 2015
@@ -0,0 +1,10 @@
+.project
+.settings
+.classpath
+.jetproperties
+.wtpmodules
+target
+bin
+cobertura.ser
+nbproject
+nbactions.xml

Propchange: sis/branches/Android/application/sis-android/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 28 22:34:46 2015
@@ -0,0 +1,3 @@
+/sis/branches/JDK6/application/sis-android:1394364-1480634
+/sis/branches/JDK7/application/sis-android:1394913-1480633
+/sis/trunk/application/sis-android:1430670-1480638

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

Modified: sis/branches/Android/application/sis-console/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/application/sis-console/pom.xml?rev=1676642&r1=1676571&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/application/sis-console/pom.xml (original)
+++ sis/branches/Android/application/sis-console/pom.xml Tue Apr 28 22:34:46 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>application</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.6-android-SNAPSHOT</version>
   </parent>
 
 
@@ -37,7 +37,7 @@
        =========================================================== -->
   <groupId>org.apache.sis.application</groupId>
   <artifactId>sis-console</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Apache SIS console</name>
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
@@ -82,21 +82,6 @@ Console application.
           <skipIfEmpty>true</skipIfEmpty>
         </configuration>
       </plugin>
-
-      <!-- Package as OSGi bundle -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.sis.console
-            </Export-Package>
-            <Main-Class>org.apache.sis.console.Command</Main-Class>
-            <Bundle-SymbolicName>org.apache.sis.console</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

Modified: sis/branches/Android/application/sis-javafx/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/application/sis-javafx/pom.xml?rev=1676642&r1=1676571&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/application/sis-javafx/pom.xml (original)
+++ sis/branches/Android/application/sis-javafx/pom.xml Tue Apr 28 22:34:46 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>application</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.6-android-SNAPSHOT</version>
   </parent>
 
 
@@ -37,7 +37,7 @@
        =========================================================== -->
   <groupId>org.apache.sis.application</groupId>
   <artifactId>sis-javafx</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Apache SIS application for JavaFX</name>
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
@@ -60,26 +60,6 @@ Client application for JavaFX.
 
 
   <!-- ===========================================================
-           Build configuration
-       =========================================================== -->
-  <build>
-    <plugins>
-
-      <!-- Package as OSGi bundle -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.sis.gui</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-
-  <!-- ===========================================================
            Dependencies
        =========================================================== -->
   <dependencies>

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

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

Modified: sis/branches/Android/core/sis-feature/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/sis-feature/pom.xml?rev=1676642&r1=1676571&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/core/sis-feature/pom.xml (original)
+++ sis/branches/Android/core/sis-feature/pom.xml Tue Apr 28 22:34:46 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>core</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.6-android-SNAPSHOT</version>
   </parent>
 
 
@@ -37,7 +37,7 @@
        =========================================================== -->
   <groupId>org.apache.sis.core</groupId>
   <artifactId>sis-feature</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Apache SIS features</name>
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
@@ -81,26 +81,6 @@ Representations of geographic features.
 
 
   <!-- ===========================================================
-           Build configuration
-       =========================================================== -->
-  <build>
-    <plugins>
-
-      <!-- Package as OSGi bundle -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.sis.feature</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-
-  <!-- ===========================================================
            Dependencies
        =========================================================== -->
   <dependencies>

Modified: sis/branches/Android/core/sis-metadata/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/sis-metadata/pom.xml?rev=1676642&r1=1676571&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/core/sis-metadata/pom.xml (original)
+++ sis/branches/Android/core/sis-metadata/pom.xml Tue Apr 28 22:34:46 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>core</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.6-android-SNAPSHOT</version>
   </parent>
 
 
@@ -37,7 +37,7 @@
        =========================================================== -->
   <groupId>org.apache.sis.core</groupId>
   <artifactId>sis-metadata</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Apache SIS metadata</name>
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
@@ -104,26 +104,6 @@ Implementations of metadata derived from
 
 
   <!-- ===========================================================
-           Build configuration
-       =========================================================== -->
-  <build>
-    <plugins>
-
-      <!-- Package as OSGi bundle -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.sis.metadata</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-
-  <!-- ===========================================================
            Dependencies
        =========================================================== -->
   <dependencies>

Modified: sis/branches/Android/core/sis-referencing/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/sis-referencing/pom.xml?rev=1676642&r1=1676571&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/core/sis-referencing/pom.xml (original)
+++ sis/branches/Android/core/sis-referencing/pom.xml Tue Apr 28 22:34:46 2015
@@ -28,12 +28,12 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>core</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.6-android-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.sis.core</groupId>
   <artifactId>sis-referencing</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Apache SIS referencing</name>
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
@@ -74,26 +74,6 @@ Implementations of Coordinate Reference
 
 
   <!-- ===========================================================
-           Build configuration
-       =========================================================== -->
-  <build>
-    <plugins>
-
-      <!-- Package as OSGi bundle -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.sis.referencing</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-
-  <!-- ===========================================================
            Dependencies
        =========================================================== -->
   <dependencies>

Modified: sis/branches/Android/core/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/sis-utility/pom.xml?rev=1676642&r1=1676571&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/core/sis-utility/pom.xml (original)
+++ sis/branches/Android/core/sis-utility/pom.xml Tue Apr 28 22:34:46 2015
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>core</artifactId>
-    <version>0.6-SNAPSHOT</version>
+    <version>0.6-android-SNAPSHOT</version>
   </parent>
 
 
@@ -37,7 +37,7 @@
        =========================================================== -->
   <groupId>org.apache.sis.core</groupId>
   <artifactId>sis-utility</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Apache SIS utilities</name>
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
@@ -146,18 +146,6 @@ Miscellaneous utilities.
           </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.utility</Bundle-SymbolicName>
-            <Bundle-Activator>org.apache.sis.internal.system.OSGiActivator</Bundle-Activator>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

Modified: sis/branches/Android/ide-project/NetBeans/README.txt
URL: http://svn.apache.org/viewvc/sis/branches/Android/ide-project/NetBeans/README.txt?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/ide-project/NetBeans/README.txt [UTF-8] (original)
+++ sis/branches/Android/ide-project/NetBeans/README.txt [UTF-8] Tue Apr 28 22:34:46 2015
@@ -1,5 +1,12 @@
 This is the root directory of NetBeans project configuration for Apache SIS.
-There is 3 important files that must be edited BY HAND for preserving user-
+This configuration is provided as a convenience for NetBeans users - this is
+not a replacement for the Maven build.
+
+
+==============================================================================
+Recommendations for NetBeans project configuration changes
+==============================================================================
+There is 3 important files that should be edited BY HAND for preserving user-
 neutral configuration:
 
 build.xml
@@ -16,6 +23,8 @@ Contains most of the project configurati
 modified by the NetBeans "Project properties" panel. PLEASE REVIEW MANUALLY
 BEFORE COMMITTING ANY CHANGE. Please preserve the formatting for easier
 reading. Ensure that all directories are relative to a variable.
+If some user-specific properties are desired (e.g. absolute paths),
+they can be declared in the "nbproject/private/private.properties" file.
 
 
 nbproject/project.xml

Modified: sis/branches/Android/ide-project/NetBeans/build.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/ide-project/NetBeans/build.xml?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/ide-project/NetBeans/build.xml (original)
+++ sis/branches/Android/ide-project/NetBeans/build.xml Tue Apr 28 22:34:46 2015
@@ -1,4 +1,24 @@
 <?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.
+-->
+
 <!--
   Customization of Apache SIS build from NetBeans IDE.
 -->
@@ -7,28 +27,133 @@
   <import file="nbproject/build-impl.xml"/>
 
   <!--
-    Called before JAR creation. Copies the "*.utf" resources files created by Maven.
-    Note that the Apache SIS project must have been build by Maven at least once it
-    can be built by the NetBeans IDE.
+    Called after compilation. Copies the "*.utf" resources files created by Maven.
+    Note that the Apache SIS project must have been build by Maven at least once
+    before it can be built by the NetBeans IDE.
   -->
-  <target name="-pre-jar">
+  <target name="-post-compile">
     <copy todir="${build.classes.dir}/org/apache/sis/util/iso">
       <fileset dir="${project.root}/core/sis-utility/src/main/resources/org/apache/sis/util/iso">
         <include name="class-index.properties"/>
       </fileset>
     </copy>
     <copy todir="${build.classes.dir}/org/apache/sis/util/resources">
-      <fileset dir="${project.root}/core/sis-utility/target/classes/org/apache/sis/util/resources">
+      <fileset dir="${project.root}/core/sis-utility/target/generated-resources/org/apache/sis/util/resources">
         <include name="*.utf"/>
       </fileset>
     </copy>
+    <!-- Pending discussion about how to handle resources in the Shapefile module.
+    <copy todir="${build.classes.dir}/org/apache/sis/internal/shapefile/jdbc">
+      <fileset dir="${project.root}/storage/sis-shapefile/target/generated-resources/org/apache/sis/internal/shapefile/jdbc">
+        <include name="*.utf"/>
+      </fileset>
+    </copy>
+    -->
 
     <!-- Following are classical properties resources files. -->
     <copy todir="${build.classes.dir}">
       <fileset dir="${project.root}/core/sis-utility/src/main/resources">
-        <include name="META-INF/services/*"/>
         <include name="**/*.properties"/>
       </fileset>
+      <fileset dir="${project.root}/application/sis-console/src/main/resources">
+        <include name="**/*.properties"/>
+      </fileset>
+    </copy>
+
+
+
+    <!-- ==== Standard JAVA service providers ====================================================================== -->
+
+    <!-- FileTypeDetector implementations to be loaded by ServiceLoader. -->
+    <concat destfile="${build.classes.dir}/META-INF/services/java.nio.file.spi.FileTypeDetector" encoding="UTF-8" fixlastline="yes">
+      <fileset dir="${project.root}">
+        <include name="*/*/src/main/resources/META-INF/services/java.nio.file.spi.FileTypeDetector"/>
+      </fileset>
+    </concat>
+
+
+
+    <!-- ==== GeoAPI service providers ============================================================================= -->
+
+    <!-- NameFactory implementations to be loaded by ServiceLoader. -->
+    <concat destfile="${build.classes.dir}/META-INF/services/org.opengis.util.NameFactory" encoding="UTF-8" fixlastline="yes">
+      <fileset dir="${project.root}">
+        <include name="*/*/src/main/resources/META-INF/services/org.opengis.util.NameFactory"/>
+      </fileset>
+    </concat>
+
+    <!-- MathTransformFactory implementations to be loaded by ServiceLoader. -->
+    <concat destfile="${build.classes.dir}/META-INF/services/org.opengis.referencing.operation.MathTransformFactory" encoding="UTF-8" fixlastline="yes">
+      <fileset dir="${project.root}">
+        <include name="*/*/src/main/resources/META-INF/services/org.opengis.referencing.operation.MathTransformFactory"/>
+      </fileset>
+    </concat>
+
+    <!-- OperationMethod implementations to be loaded by ServiceLoader. -->
+    <concat destfile="${build.classes.dir}/META-INF/services/org.opengis.referencing.operation.OperationMethod" encoding="UTF-8" fixlastline="yes">
+      <fileset dir="${project.root}">
+        <include name="*/*/src/main/resources/META-INF/services/org.opengis.referencing.operation.OperationMethod"/>
+      </fileset>
+    </concat>
+
+
+
+    <!-- ==== Apache SIS service providers ========================================================================= -->
+
+    <!-- ObjectConverter implementations to be loaded by ServiceLoader. -->
+    <concat destfile="${build.classes.dir}/META-INF/services/org.apache.sis.util.ObjectConverter" encoding="UTF-8" fixlastline="yes">
+      <fileset dir="${project.root}">
+        <include name="*/*/src/main/resources/META-INF/services/org.apache.sis.util.ObjectConverter"/>
+      </fileset>
+    </concat>
+
+    <!-- TypeRegistration implementations to be loaded by ServiceLoader. -->
+    <concat destfile="${build.classes.dir}/META-INF/services/org.apache.sis.internal.jaxb.TypeRegistration" encoding="UTF-8" fixlastline="yes">
+      <fileset dir="${project.root}">
+        <include name="*/*/src/main/resources/META-INF/services/org.apache.sis.internal.jaxb.TypeRegistration"/>
+      </fileset>
+    </concat>
+
+    <!-- AdapterReplacement implementations to be loaded by ServiceLoader. -->
+    <concat destfile="${build.classes.dir}/META-INF/services/org.apache.sis.internal.jaxb.AdapterReplacement" encoding="UTF-8" fixlastline="yes">
+      <fileset dir="${project.root}">
+        <include name="*/*/src/main/resources/META-INF/services/org.apache.sis.internal.jaxb.AdapterReplacement"/>
+      </fileset>
+    </concat>
+
+    <!-- DataStoreProvider implementations to be loaded by ServiceLoader. -->
+    <concat destfile="${build.classes.dir}/META-INF/services/org.apache.sis.storage.DataStoreProvider" encoding="UTF-8" fixlastline="yes">
+      <fileset dir="${project.root}">
+        <include name="*/*/src/main/resources/META-INF/services/org.apache.sis.storage.DataStoreProvider"/>
+      </fileset>
+    </concat>
+  </target>
+
+  <!--
+    Called after compilation of test classes in order to copy test files.
+  -->
+  <target name="-post-compile-test">
+    <copy todir="${build.test.classes.dir}">
+      <fileset dir="${project.root}/core/sis-metadata/src/test/resources">
+        <include name="**/*.properties"/>
+        <include name="**/*.xml"/>
+      </fileset>
+      <fileset dir="${project.root}/core/sis-referencing/src/test/resources">
+        <include name="**/*.xml"/>
+      </fileset>
+    </copy>
+    <copy todir="${build.test.classes.dir}">
+      <fileset dir="${project.root}/storage/sis-shapefile/src/test/resources">
+        <include name="**/*.dbf"/>
+        <include name="**/*.prj"/>
+        <include name="**/*.shp"/>
+        <include name="**/*.shx"/>
+      </fileset>
+    </copy>
+    <copy todir="${build.test.classes.dir}">
+      <fileset dir="${project.root}/profiles/sis-french-profile/src/test/resources">
+        <include name="**/*.xml"/>
+      </fileset>
     </copy>
   </target>
 </project>

Modified: sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml Tue Apr 28 22:34:46 2015
@@ -28,9 +28,9 @@ is divided into following sections:
         </condition>
     </fail>
     <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!--
+    <!-- 
                 ======================
-                INITIALIZATION SECTION
+                INITIALIZATION SECTION 
                 ======================
             -->
     <target name="-pre-init">
@@ -54,6 +54,7 @@ is divided into following sections:
         <property file="nbproject/project.properties"/>
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <property name="platform.java" value="${java.home}/bin/java"/>
         <available file="${manifest.file}" property="manifest.available"/>
         <condition property="splashscreen.available">
             <and>
@@ -71,16 +72,20 @@ is divided into following sections:
                 </not>
             </and>
         </condition>
-        <condition property="manifest.available+main.class">
+        <condition property="profile.available">
             <and>
-                <isset property="manifest.available"/>
-                <isset property="main.class.available"/>
+                <isset property="javac.profile"/>
+                <length length="0" string="${javac.profile}" when="greater"/>
+                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
             </and>
         </condition>
         <condition property="do.archive">
-            <not>
-                <istrue value="${jar.archive.disabled}"/>
-            </not>
+            <or>
+                <not>
+                    <istrue value="${jar.archive.disabled}"/>
+                </not>
+                <istrue value="${not.archive.disabled}"/>
+            </or>
         </condition>
         <condition property="do.mkdist">
             <and>
@@ -91,12 +96,6 @@ is divided into following sections:
                 </not>
             </and>
         </condition>
-        <condition property="manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="do.mkdist"/>
-            </and>
-        </condition>
         <condition property="do.archive+manifest.available">
             <and>
                 <isset property="manifest.available"/>
@@ -115,30 +114,23 @@ is divided into following sections:
                 <istrue value="${do.archive}"/>
             </and>
         </condition>
-        <condition property="do.archive+manifest.available+main.class">
+        <condition property="do.archive+profile.available">
             <and>
-                <istrue value="${manifest.available+main.class}"/>
+                <isset property="profile.available"/>
                 <istrue value="${do.archive}"/>
             </and>
         </condition>
-        <condition property="manifest.available-mkdist.available">
-            <or>
-                <istrue value="${manifest.available}"/>
-                <isset property="do.mkdist"/>
-            </or>
-        </condition>
-        <condition property="manifest.available+main.class-mkdist.available">
-            <or>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="do.mkdist"/>
-            </or>
-        </condition>
         <condition property="have.tests">
             <or>
+                <available file="${test.console.dir}"/>
                 <available file="${test.netcdf.dir}"/>
+                <available file="${test.shapefile.dir}"/>
+                <available file="${test.storage.dir}"/>
+                <available file="${test.feature.dir}"/>
                 <available file="${test.referencing.dir}"/>
                 <available file="${test.metadata.dir}"/>
                 <available file="${test.utility.dir}"/>
+                <available file="${test.fra-profile.dir}"/>
             </or>
         </condition>
         <condition property="have.sources">
@@ -147,11 +139,15 @@ is divided into following sections:
                 <available file="${src.android.dir}"/>
                 <available file="${src.android.gen}"/>
                 <available file="${src.webapp.dir}"/>
-                <available file="${src.app.dir}"/>
+                <available file="${src.console.dir}"/>
                 <available file="${src.netcdf.dir}"/>
+                <available file="${src.shapefile.dir}"/>
+                <available file="${src.storage.dir}"/>
+                <available file="${src.feature.dir}"/>
                 <available file="${src.referencing.dir}"/>
                 <available file="${src.metadata.dir}"/>
                 <available file="${src.utility.dir}"/>
+                <available file="${src.fra-profile.dir}"/>
             </or>
         </condition>
         <condition property="netbeans.home+have.tests">
@@ -197,7 +193,15 @@ is divided into following sections:
         </condition>
         <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
         <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-            <length length="0" string="${endorsed.classpath}" when="greater"/>
+            <and>
+                <isset property="endorsed.classpath"/>
+                <not>
+                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
+            <isset property="profile.available"/>
         </condition>
         <condition else="false" property="jdkBug6558476">
             <and>
@@ -243,15 +247,24 @@ is divided into following sections:
         <fail unless="src.android.dir">Must set src.android.dir</fail>
         <fail unless="src.android.gen">Must set src.android.gen</fail>
         <fail unless="src.webapp.dir">Must set src.webapp.dir</fail>
-        <fail unless="src.app.dir">Must set src.app.dir</fail>
+        <fail unless="src.console.dir">Must set src.console.dir</fail>
         <fail unless="src.netcdf.dir">Must set src.netcdf.dir</fail>
+        <fail unless="src.shapefile.dir">Must set src.shapefile.dir</fail>
+        <fail unless="src.storage.dir">Must set src.storage.dir</fail>
+        <fail unless="src.feature.dir">Must set src.feature.dir</fail>
         <fail unless="src.referencing.dir">Must set src.referencing.dir</fail>
         <fail unless="src.metadata.dir">Must set src.metadata.dir</fail>
         <fail unless="src.utility.dir">Must set src.utility.dir</fail>
+        <fail unless="src.fra-profile.dir">Must set src.fra-profile.dir</fail>
+        <fail unless="test.console.dir">Must set test.console.dir</fail>
         <fail unless="test.netcdf.dir">Must set test.netcdf.dir</fail>
+        <fail unless="test.shapefile.dir">Must set test.shapefile.dir</fail>
+        <fail unless="test.storage.dir">Must set test.storage.dir</fail>
+        <fail unless="test.feature.dir">Must set test.feature.dir</fail>
         <fail unless="test.referencing.dir">Must set test.referencing.dir</fail>
         <fail unless="test.metadata.dir">Must set test.metadata.dir</fail>
         <fail unless="test.utility.dir">Must set test.utility.dir</fail>
+        <fail unless="test.fra-profile.dir">Must set test.fra-profile.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
         <fail unless="dist.dir">Must set dist.dir</fail>
         <fail unless="build.classes.dir">Must set build.classes.dir</fail>
@@ -272,7 +285,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}" name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -297,6 +310,7 @@ is divided into following sections:
                         <path path="@{classpath}"/>
                     </classpath>
                     <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
                     <compilerarg line="${javac.compilerargs}"/>
                     <compilerarg value="-processorpath"/>
                     <compilerarg path="@{processorpath}:${empty.dir}"/>
@@ -312,7 +326,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}" name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -336,6 +350,7 @@ is divided into following sections:
                         <path path="@{classpath}"/>
                     </classpath>
                     <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
                     <compilerarg line="${javac.compilerargs}"/>
                     <customize/>
                 </javac>
@@ -344,7 +359,7 @@ is divided into following sections:
     </target>
     <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}" name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -431,9 +446,21 @@ is divided into following sections:
                 <property name="junit.forkmode" value="perTest"/>
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
                     <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.console.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
                         <fileset dir="${test.netcdf.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
+                        <fileset dir="${test.shapefile.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                        <fileset dir="${test.storage.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                        <fileset dir="${test.feature.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
                         <fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
@@ -443,6 +470,9 @@ is divided into following sections:
                         <fileset dir="${test.utility.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
+                        <fileset dir="${test.fra-profile.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
                         <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
                             <filename name="${test.binarytestincludes}"/>
                         </fileset>
@@ -472,9 +502,21 @@ is divided into following sections:
                     <isset property="test.method"/>
                 </condition>
                 <union id="test.set">
+                    <fileset dir="${test.console.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+                        <filename name="@{testincludes}"/>
+                    </fileset>
                     <fileset dir="${test.netcdf.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
                         <filename name="@{testincludes}"/>
                     </fileset>
+                    <fileset dir="${test.shapefile.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+                        <filename name="@{testincludes}"/>
+                    </fileset>
+                    <fileset dir="${test.storage.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+                        <filename name="@{testincludes}"/>
+                    </fileset>
+                    <fileset dir="${test.feature.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+                        <filename name="@{testincludes}"/>
+                    </fileset>
                     <fileset dir="${test.referencing.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
                         <filename name="@{testincludes}"/>
                     </fileset>
@@ -484,9 +526,12 @@ is divided into following sections:
                     <fileset dir="${test.utility.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
                         <filename name="@{testincludes}"/>
                     </fileset>
+                    <fileset dir="${test.fra-profile.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+                        <filename name="@{testincludes}"/>
+                    </fileset>
                 </union>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Apache_SIS_on_Android" testname="TestNG tests" workingDir="${work.dir}">
+                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Apache_SIS_on_Android" testname="TestNG tests" workingDir="${work.dir}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -593,9 +638,21 @@ is divided into following sections:
                 <property name="junit.forkmode" value="perTest"/>
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
                     <batchtest todir="${build.test.results.dir}">
+                        <fileset dir="${test.console.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
                         <fileset dir="${test.netcdf.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
+                        <fileset dir="${test.shapefile.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                        <fileset dir="${test.storage.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
+                        <fileset dir="${test.feature.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
                         <fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
@@ -605,6 +662,9 @@ is divided into following sections:
                         <fileset dir="${test.utility.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
+                        <fileset dir="${test.fra-profile.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
                         <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
                             <filename name="${test.binarytestincludes}"/>
                         </fileset>
@@ -886,8 +946,8 @@ is divided into following sections:
                     </chainedmapper>
                 </pathconvert>
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-                    <fileset dir="${build.classes.dir}"/>
+                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
                     <manifest>
                         <attribute name="Class-Path" value="${jar.classpath}"/>
                         <customize/>
@@ -899,7 +959,7 @@ is divided into following sections:
     <target name="-init-presetdef-jar">
         <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
             <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}"/>
+                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
             </jar>
         </presetdef>
     </target>
@@ -969,7 +1029,7 @@ is divided into following sections:
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${build.generated.subdirs}"/>
     </target>
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
@@ -978,11 +1038,15 @@ is divided into following sections:
             <fileset dir="${src.android.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.android.gen}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.webapp.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-            <fileset dir="${src.app.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${src.console.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.netcdf.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${src.shapefile.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${src.storage.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${src.feature.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.utility.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${src.fra-profile.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target if="has.persistence.xml" name="-copy-persistence-xml">
@@ -1003,7 +1067,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -1023,41 +1087,25 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
-        <j2seproject1:jar/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}">
-            <j2seproject1:manifest>
-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
-            </j2seproject1:manifest>
-        </j2seproject1:jar>
-        <echo level="info">To run this application from the command line without Ant, try:</echo>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
-    </target>
-    <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
+    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
         <touch file="${tmp.manifest.file}" verbose="false"/>
     </target>
-    <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
+    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
         <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
     </target>
-    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
         <manifest file="${tmp.manifest.file}" mode="update">
             <attribute name="Main-Class" value="${main.class}"/>
         </manifest>
     </target>
-    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="Profile" value="${javac.profile}"/>
+        </manifest>
+    </target>
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
         <basename file="${application.splash}" property="splashscreen.basename"/>
         <mkdir dir="${build.classes.dir}/META-INF"/>
         <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
@@ -1065,23 +1113,41 @@ is divided into following sections:
             <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
         </manifest>
     </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
         <echo level="info">To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
         <echo level="info">java -jar "${dist.jar.resolved}"</echo>
     </target>
-    <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
+        <j2seproject1:jar manifest="${tmp.manifest.file}"/>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
+            <isset property="main.class.available"/>
+        </condition>
+        <condition else="debug" property="jar.usage.level" value="info">
+            <isset property="main.class.available"/>
+        </condition>
+        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
+    </target>
+    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
         <delete>
             <fileset file="${tmp.manifest.file}"/>
         </delete>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
     <target name="-post-jar">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
     <!--
                 =================
                 EXECUTION SECTION
@@ -1260,35 +1326,50 @@ is divided into following sections:
                 </not>
             </and>
         </condition>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+        <condition else="" property="bug5101868workaround" value="*.java">
+            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
+        </condition>
+        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
-            <fileset dir="${src.local-src.dir}" excludes="*.java,${excludes}" includes="${includes}">
+            <fileset dir="${src.local-src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${src.android.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.android.dir}" excludes="*.java,${excludes}" includes="${includes}">
+            <fileset dir="${src.android.gen}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.android.gen}" excludes="*.java,${excludes}" includes="${includes}">
+            <fileset dir="${src.webapp.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.webapp.dir}" excludes="*.java,${excludes}" includes="${includes}">
+            <fileset dir="${src.console.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.app.dir}" excludes="*.java,${excludes}" includes="${includes}">
+            <fileset dir="${src.netcdf.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.netcdf.dir}" excludes="*.java,${excludes}" includes="${includes}">
+            <fileset dir="${src.shapefile.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.referencing.dir}" excludes="*.java,${excludes}" includes="${includes}">
+            <fileset dir="${src.storage.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.metadata.dir}" excludes="*.java,${excludes}" includes="${includes}">
+            <fileset dir="${src.feature.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.utility.dir}" excludes="*.java,${excludes}" includes="${includes}">
+            <fileset dir="${src.referencing.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${src.metadata.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${src.utility.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${src.fra-profile.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
@@ -1310,12 +1391,21 @@ is divided into following sections:
             <fileset dir="${src.webapp.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
-            <fileset dir="${src.app.dir}" excludes="${excludes}" includes="${includes}">
+            <fileset dir="${src.console.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
             <fileset dir="${src.netcdf.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
+            <fileset dir="${src.shapefile.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
+            <fileset dir="${src.storage.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
+            <fileset dir="${src.feature.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
             <fileset dir="${src.referencing.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
@@ -1325,6 +1415,9 @@ is divided into following sections:
             <fileset dir="${src.utility.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
+            <fileset dir="${src.fra-profile.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
                 <include name="**/doc-files/**"/>
             </fileset>
@@ -1347,15 +1440,20 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.netcdf.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"/>
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.console.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"/>
     </target>
     <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.netcdf.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.console.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"/>
         <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.console.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.netcdf.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${test.shapefile.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${test.storage.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${test.feature.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.utility.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${test.fra-profile.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile-test">
@@ -1370,12 +1468,17 @@ is divided into following sections:
     <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.netcdf.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}" srcdir="${test.netcdf.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.console.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}" srcdir="${test.console.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"/>
         <copy todir="${build.test.classes.dir}">
+            <fileset dir="${test.console.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.netcdf.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${test.shapefile.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${test.storage.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${test.feature.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${test.utility.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${test.fra-profile.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile-test-single">
@@ -1392,7 +1495,7 @@ is divided into following sections:
         <mkdir dir="${build.test.results.dir}"/>
     </target>
     <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:test testincludes="**/*Test.java"/>
+        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
     </target>
     <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
         <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>

Modified: sis/branches/Android/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/branches/Android/ide-project/NetBeans/nbproject/genfiles.properties?rev=1676642&r1=1676641&r2=1676642&view=diff
==============================================================================
--- sis/branches/Android/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] (original)
+++ sis/branches/Android/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] Tue Apr 28 22:34:46 2015
@@ -3,6 +3,6 @@
 build.xml.data.CRC32=58e6b21c
 build.xml.script.CRC32=462eaba0
 build.xml.stylesheet.CRC32=28e38971@1.53.1.46
-nbproject/build-impl.xml.data.CRC32=b391602f
-nbproject/build-impl.xml.script.CRC32=34e9591f
-nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46
+nbproject/build-impl.xml.data.CRC32=c4eed276
+nbproject/build-impl.xml.script.CRC32=ff03d076
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48



Mime
View raw message