You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2013/05/09 15:33:25 UTC
svn commit: r1480628 - in /sis/branches/Android: ./ application/
application/sis-app/ application/sis-webapp/ core/ core/sis-build-helper/
core/sis-metadata/ core/sis-referencing/ core/sis-utility/
ide-project/NetBeans/ ide-project/NetBeans/nbproject/ ...
Author: desruisseaux
Date: Thu May 9 13:33:24 2013
New Revision: 1480628
URL: http://svn.apache.org/r1480628
Log:
Merge from trunk.
Added:
sis/branches/Android/application/ (with props)
sis/branches/Android/application/pom.xml
- copied, changed from r1480621, sis/trunk/application/pom.xml
sis/branches/Android/application/sis-app/
- copied from r1480602, sis/branches/Android/sis-app/
sis/branches/Android/application/sis-webapp/
- copied from r1480602, sis/branches/Android/sis-webapp/
sis/branches/Android/core/ (with props)
sis/branches/Android/core/pom.xml
- copied, changed from r1480621, sis/trunk/core/pom.xml
sis/branches/Android/core/sis-build-helper/
- copied from r1480602, sis/branches/Android/sis-build-helper/
sis/branches/Android/core/sis-metadata/
- copied from r1480602, sis/branches/Android/sis-metadata/
sis/branches/Android/core/sis-referencing/
- copied from r1480602, sis/branches/Android/sis-referencing/
sis/branches/Android/core/sis-utility/
- copied from r1480602, sis/branches/Android/sis-utility/
Removed:
sis/branches/Android/sis-app/
sis/branches/Android/sis-build-helper/
sis/branches/Android/sis-metadata/
sis/branches/Android/sis-referencing/
sis/branches/Android/sis-utility/
sis/branches/Android/sis-webapp/
Modified:
sis/branches/Android/ (props changed)
sis/branches/Android/application/sis-app/pom.xml
sis/branches/Android/application/sis-webapp/pom.xml
sis/branches/Android/core/sis-build-helper/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/build.xml
sis/branches/Android/ide-project/NetBeans/nbproject/project.properties
sis/branches/Android/ide-project/eclipse/classpath
sis/branches/Android/pom.xml
Propchange: sis/branches/Android/
------------------------------------------------------------------------------
Merged /sis/trunk:r1480596-1480621
Merged /sis/branches/JDK7:r1480591-1480605
Merged /sis/branches/JDK6:r1480592-1480612
Propchange: sis/branches/Android/application/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu May 9 13:33:24 2013
@@ -0,0 +1,10 @@
+.project
+.settings
+.classpath
+.jetproperties
+.wtpmodules
+target
+bin
+cobertura.ser
+nbproject
+nbactions.xml
Copied: sis/branches/Android/application/pom.xml (from r1480621, sis/trunk/application/pom.xml)
URL: http://svn.apache.org/viewvc/sis/branches/Android/application/pom.xml?p2=sis/branches/Android/application/pom.xml&p1=sis/trunk/application/pom.xml&r1=1480621&r2=1480628&rev=1480628&view=diff
==============================================================================
--- sis/trunk/application/pom.xml (original)
+++ sis/branches/Android/application/pom.xml Thu May 9 13:33:24 2013
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>sis-parent</artifactId>
- <version>0.3-geoapi3.0-SNAPSHOT</version>
+ <version>0.3-android-SNAPSHOT</version>
</parent>
Modified: sis/branches/Android/application/sis-app/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/application/sis-app/pom.xml?rev=1480628&r1=1480602&r2=1480628&view=diff
==============================================================================
--- sis/branches/Android/application/sis-app/pom.xml (original)
+++ sis/branches/Android/application/sis-app/pom.xml Thu May 9 13:33:24 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.sis</groupId>
- <artifactId>sis-parent</artifactId>
+ <artifactId>application</artifactId>
<version>0.3-android-SNAPSHOT</version>
</parent>
Modified: sis/branches/Android/application/sis-webapp/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/application/sis-webapp/pom.xml?rev=1480628&r1=1480602&r2=1480628&view=diff
==============================================================================
--- sis/branches/Android/application/sis-webapp/pom.xml (original)
+++ sis/branches/Android/application/sis-webapp/pom.xml Thu May 9 13:33:24 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.sis</groupId>
- <artifactId>sis-parent</artifactId>
+ <artifactId>application</artifactId>
<version>0.3-android-SNAPSHOT</version>
</parent>
Propchange: sis/branches/Android/core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu May 9 13:33:24 2013
@@ -0,0 +1,10 @@
+.project
+.settings
+.classpath
+.jetproperties
+.wtpmodules
+target
+bin
+cobertura.ser
+nbproject
+nbactions.xml
Copied: sis/branches/Android/core/pom.xml (from r1480621, sis/trunk/core/pom.xml)
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/pom.xml?p2=sis/branches/Android/core/pom.xml&p1=sis/trunk/core/pom.xml&r1=1480621&r2=1480628&rev=1480628&view=diff
==============================================================================
--- sis/trunk/core/pom.xml (original)
+++ sis/branches/Android/core/pom.xml Thu May 9 13:33:24 2013
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>sis-parent</artifactId>
- <version>0.3-geoapi3.0-SNAPSHOT</version>
+ <version>0.3-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=1480628&r1=1480602&r2=1480628&view=diff
==============================================================================
--- sis/branches/Android/core/sis-build-helper/pom.xml (original)
+++ sis/branches/Android/core/sis-build-helper/pom.xml Thu May 9 13:33:24 2013
@@ -43,7 +43,7 @@
<parent>
<groupId>org.apache.sis</groupId>
- <artifactId>sis-parent</artifactId>
+ <artifactId>core</artifactId>
<version>0.3-android-SNAPSHOT</version>
</parent>
Modified: sis/branches/Android/core/sis-metadata/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/sis-metadata/pom.xml?rev=1480628&r1=1480602&r2=1480628&view=diff
==============================================================================
--- sis/branches/Android/core/sis-metadata/pom.xml (original)
+++ sis/branches/Android/core/sis-metadata/pom.xml Thu May 9 13:33:24 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.sis</groupId>
- <artifactId>sis-parent</artifactId>
+ <artifactId>core</artifactId>
<version>0.3-android-SNAPSHOT</version>
</parent>
Modified: sis/branches/Android/core/sis-referencing/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/sis-referencing/pom.xml?rev=1480628&r1=1480602&r2=1480628&view=diff
==============================================================================
--- sis/branches/Android/core/sis-referencing/pom.xml (original)
+++ sis/branches/Android/core/sis-referencing/pom.xml Thu May 9 13:33:24 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.sis</groupId>
- <artifactId>sis-parent</artifactId>
+ <artifactId>core</artifactId>
<version>0.3-android-SNAPSHOT</version>
</parent>
Modified: sis/branches/Android/core/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/core/sis-utility/pom.xml?rev=1480628&r1=1480602&r2=1480628&view=diff
==============================================================================
--- sis/branches/Android/core/sis-utility/pom.xml (original)
+++ sis/branches/Android/core/sis-utility/pom.xml Thu May 9 13:33:24 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.sis</groupId>
- <artifactId>sis-parent</artifactId>
+ <artifactId>core</artifactId>
<version>0.3-android-SNAPSHOT</version>
</parent>
Modified: sis/branches/Android/ide-project/NetBeans/build.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/ide-project/NetBeans/build.xml?rev=1480628&r1=1480627&r2=1480628&view=diff
==============================================================================
--- sis/branches/Android/ide-project/NetBeans/build.xml (original)
+++ sis/branches/Android/ide-project/NetBeans/build.xml Thu May 9 13:33:24 2013
@@ -13,19 +13,19 @@
-->
<target name="-pre-jar">
<copy todir="${build.classes.dir}/org/apache/sis/util/iso">
- <fileset dir="${project.root}/sis-utility/src/main/resources/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}/sis-utility/target/classes/org/apache/sis/util/resources">
+ <fileset dir="${project.root}/core/sis-utility/target/classes/org/apache/sis/util/resources">
<include name="*.utf"/>
</fileset>
</copy>
<!-- Following are classical properties resources files. -->
<copy todir="${build.classes.dir}">
- <fileset dir="${project.root}/sis-utility/src/main/resources">
+ <fileset dir="${project.root}/core/sis-utility/src/main/resources">
<include name="META-INF/services/*"/>
<include name="**/*.properties"/>
</fileset>
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=1480628&r1=1480627&r2=1480628&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] Thu May 9 13:33:24 2013
@@ -26,16 +26,16 @@ junit.forkmode = once
#
project.root = ../..
src.local-src.dir = ../local-src
-src.webapp.dir = ${project.root}/sis-webapp/src/main/java
-src.app.dir = ${project.root}/sis-app/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.netcdf.dir = ${project.root}/storage/sis-netcdf/src/main/java
test.netcdf.dir = ${project.root}/storage/sis-netcdf/src/test/java
-src.referencing.dir = ${project.root}/sis-referencing/src/main/java
-test.referencing.dir = ${project.root}/sis-referencing/src/test/java
-src.metadata.dir = ${project.root}/sis-metadata/src/main/java
-test.metadata.dir = ${project.root}/sis-metadata/src/test/java
-src.utility.dir = ${project.root}/sis-utility/src/main/java
-test.utility.dir = ${project.root}/sis-utility/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
#
# Version numbers for all dependencies.
Modified: sis/branches/Android/ide-project/eclipse/classpath
URL: http://svn.apache.org/viewvc/sis/branches/Android/ide-project/eclipse/classpath?rev=1480628&r1=1480627&r2=1480628&view=diff
==============================================================================
--- sis/branches/Android/ide-project/eclipse/classpath (original)
+++ sis/branches/Android/ide-project/eclipse/classpath Thu May 9 13:33:24 2013
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="trunk/sis-webapp/src/main/java"/>
- <classpathentry kind="src" path="trunk/sis-app/src/main/java"/>
- <classpathentry kind="src" path="trunk/sis-metadata/src/main/java"/>
- <classpathentry kind="src" path="trunk/sis-webapp/src/main/resources"/>
- <classpathentry kind="src" path="trunk/sis-utility/src/test/java"/>
- <classpathentry kind="src" path="trunk/sis-utility/src/main/resources"/>
- <classpathentry kind="src" path="trunk/sis-utility/src/main/javadoc"/>
- <classpathentry kind="src" path="trunk/sis-utility/src/main/java"/>
- <classpathentry kind="src" path="trunk/sis-build-helper/src/main/resources"/>
- <classpathentry kind="src" path="trunk/sis-build-helper/src/main/javadoc"/>
- <classpathentry kind="src" path="trunk/sis-build-helper/src/main/java"/>
- <classpathentry kind="src" path="trunk/sis-referencing/src/main/resources"/>
- <classpathentry kind="src" path="trunk/sis-referencing/src/main/java"/>
+ <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/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"/>
+ <classpathentry kind="src" path="trunk/core/sis-utility/src/main/java"/>
+ <classpathentry kind="src" path="trunk/core/sis-utility/src/main/resources"/>
+ <classpathentry kind="src" path="trunk/core/sis-utility/src/main/javadoc"/>
+ <classpathentry kind="src" path="trunk/core/sis-utility/src/test/java"/>
+ <classpathentry kind="src" path="trunk/core/sis-metadata/src/main/java"/>
+ <classpathentry kind="src" path="trunk/core/sis-referencing/src/main/java"/>
+ <classpathentry kind="src" path="trunk/core/sis-referencing/src/main/resources"/>
<classpathentry kind="var" path="M2_REPO/org/geonames/georss-rome/0.9.8/georss-rome-0.9.8.jar"/>
<classpathentry kind="var" path="M2_REPO/rome/rome/0.9/rome-0.9.jar"/>
<classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
Modified: sis/branches/Android/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/pom.xml?rev=1480628&r1=1480627&r2=1480628&view=diff
==============================================================================
--- sis/branches/Android/pom.xml (original)
+++ sis/branches/Android/pom.xml Thu May 9 13:33:24 2013
@@ -691,16 +691,12 @@ Apache SIS is a toolkit for describing l
<!-- ==============================================================
- Modules to build in approximate dependency order.
+ Group of modules to build in approximate dependency order.
============================================================== -->
<modules>
- <module>sis-build-helper</module>
- <module>sis-utility</module>
- <module>sis-metadata</module>
- <module>sis-referencing</module>
+ <module>core</module>
<module>storage</module>
- <module>sis-webapp</module>
- <module>sis-app</module>
+ <module>application</module>
</modules>
</project>