sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1480621 - in /sis/trunk: ./ 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/ ide-project...
Date Thu, 09 May 2013 13:21:23 GMT
Author: desruisseaux
Date: Thu May  9 13:21:22 2013
New Revision: 1480621

URL: http://svn.apache.org/r1480621
Log:
Merge from the JDK6 branch.

Added:
    sis/trunk/application/   (with props)
    sis/trunk/application/pom.xml
      - copied, changed from r1480612, sis/branches/JDK6/application/pom.xml
    sis/trunk/application/sis-app/
      - copied from r1480612, sis/trunk/sis-app/
    sis/trunk/application/sis-webapp/
      - copied from r1480612, sis/trunk/sis-webapp/
    sis/trunk/core/   (with props)
    sis/trunk/core/pom.xml
      - copied, changed from r1480612, sis/branches/JDK6/core/pom.xml
    sis/trunk/core/sis-build-helper/
      - copied from r1480612, sis/trunk/sis-build-helper/
    sis/trunk/core/sis-metadata/
      - copied from r1480612, sis/trunk/sis-metadata/
    sis/trunk/core/sis-referencing/
      - copied from r1480612, sis/trunk/sis-referencing/
    sis/trunk/core/sis-utility/
      - copied from r1480612, sis/trunk/sis-utility/
Removed:
    sis/trunk/sis-app/
    sis/trunk/sis-build-helper/
    sis/trunk/sis-metadata/
    sis/trunk/sis-referencing/
    sis/trunk/sis-utility/
    sis/trunk/sis-webapp/
Modified:
    sis/trunk/   (props changed)
    sis/trunk/application/sis-app/pom.xml
    sis/trunk/application/sis-webapp/pom.xml
    sis/trunk/core/sis-build-helper/pom.xml
    sis/trunk/core/sis-metadata/pom.xml
    sis/trunk/core/sis-referencing/pom.xml
    sis/trunk/core/sis-utility/pom.xml
    sis/trunk/ide-project/NetBeans/build.xml
    sis/trunk/ide-project/NetBeans/nbproject/project.properties
    sis/trunk/ide-project/eclipse/classpath
    sis/trunk/pom.xml

Propchange: sis/trunk/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1480591-1480605
  Merged /sis/branches/JDK6:r1480592-1480612

Propchange: sis/trunk/application/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu May  9 13:21:22 2013
@@ -0,0 +1,10 @@
+.project
+.settings
+.classpath
+.jetproperties
+.wtpmodules
+target
+bin
+cobertura.ser
+nbproject
+nbactions.xml

Copied: sis/trunk/application/pom.xml (from r1480612, sis/branches/JDK6/application/pom.xml)
URL: http://svn.apache.org/viewvc/sis/trunk/application/pom.xml?p2=sis/trunk/application/pom.xml&p1=sis/branches/JDK6/application/pom.xml&r1=1480612&r2=1480621&rev=1480621&view=diff
==============================================================================
--- sis/branches/JDK6/application/pom.xml (original)
+++ sis/trunk/application/pom.xml Thu May  9 13:21:22 2013
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-jdk6-SNAPSHOT</version>
+    <version>0.3-geoapi3.0-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/trunk/application/sis-app/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-app/pom.xml?rev=1480621&r1=1480612&r2=1480621&view=diff
==============================================================================
--- sis/trunk/application/sis-app/pom.xml (original)
+++ sis/trunk/application/sis-app/pom.xml Thu May  9 13:21:22 2013
@@ -27,7 +27,7 @@
 
   <parent>
     <groupId>org.apache.sis</groupId>
-    <artifactId>sis-parent</artifactId>
+    <artifactId>application</artifactId>
     <version>0.3-geoapi3.0-SNAPSHOT</version>
   </parent>
 

Modified: sis/trunk/application/sis-webapp/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-webapp/pom.xml?rev=1480621&r1=1480612&r2=1480621&view=diff
==============================================================================
--- sis/trunk/application/sis-webapp/pom.xml (original)
+++ sis/trunk/application/sis-webapp/pom.xml Thu May  9 13:21:22 2013
@@ -27,7 +27,7 @@
 
   <parent>
     <groupId>org.apache.sis</groupId>
-    <artifactId>sis-parent</artifactId>
+    <artifactId>application</artifactId>
     <version>0.3-geoapi3.0-SNAPSHOT</version>
   </parent>
 

Propchange: sis/trunk/core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu May  9 13:21:22 2013
@@ -0,0 +1,10 @@
+.project
+.settings
+.classpath
+.jetproperties
+.wtpmodules
+target
+bin
+cobertura.ser
+nbproject
+nbactions.xml

Copied: sis/trunk/core/pom.xml (from r1480612, sis/branches/JDK6/core/pom.xml)
URL: http://svn.apache.org/viewvc/sis/trunk/core/pom.xml?p2=sis/trunk/core/pom.xml&p1=sis/branches/JDK6/core/pom.xml&r1=1480612&r2=1480621&rev=1480621&view=diff
==============================================================================
--- sis/branches/JDK6/core/pom.xml (original)
+++ sis/trunk/core/pom.xml Thu May  9 13:21:22 2013
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-jdk6-SNAPSHOT</version>
+    <version>0.3-geoapi3.0-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/trunk/core/sis-build-helper/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/pom.xml?rev=1480621&r1=1480612&r2=1480621&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/pom.xml (original)
+++ sis/trunk/core/sis-build-helper/pom.xml Thu May  9 13:21:22 2013
@@ -43,7 +43,7 @@
 
   <parent>
     <groupId>org.apache.sis</groupId>
-    <artifactId>sis-parent</artifactId>
+    <artifactId>core</artifactId>
     <version>0.3-geoapi3.0-SNAPSHOT</version>
   </parent>
 

Modified: sis/trunk/core/sis-metadata/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/pom.xml?rev=1480621&r1=1480612&r2=1480621&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/pom.xml (original)
+++ sis/trunk/core/sis-metadata/pom.xml Thu May  9 13:21:22 2013
@@ -27,7 +27,7 @@
 
   <parent>
     <groupId>org.apache.sis</groupId>
-    <artifactId>sis-parent</artifactId>
+    <artifactId>core</artifactId>
     <version>0.3-geoapi3.0-SNAPSHOT</version>
   </parent>
 

Modified: sis/trunk/core/sis-referencing/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/pom.xml?rev=1480621&r1=1480612&r2=1480621&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/pom.xml (original)
+++ sis/trunk/core/sis-referencing/pom.xml Thu May  9 13:21:22 2013
@@ -27,7 +27,7 @@
 
   <parent>
     <groupId>org.apache.sis</groupId>
-    <artifactId>sis-parent</artifactId>
+    <artifactId>core</artifactId>
     <version>0.3-geoapi3.0-SNAPSHOT</version>
   </parent>
 

Modified: sis/trunk/core/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/pom.xml?rev=1480621&r1=1480612&r2=1480621&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/pom.xml (original)
+++ sis/trunk/core/sis-utility/pom.xml Thu May  9 13:21:22 2013
@@ -27,7 +27,7 @@
 
   <parent>
     <groupId>org.apache.sis</groupId>
-    <artifactId>sis-parent</artifactId>
+    <artifactId>core</artifactId>
     <version>0.3-geoapi3.0-SNAPSHOT</version>
   </parent>
 

Modified: sis/trunk/ide-project/NetBeans/build.xml
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/build.xml?rev=1480621&r1=1480620&r2=1480621&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/build.xml (original)
+++ sis/trunk/ide-project/NetBeans/build.xml Thu May  9 13:21:22 2013
@@ -18,14 +18,14 @@
       </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/trunk/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/project.properties?rev=1480621&r1=1480620&r2=1480621&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/trunk/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Thu May  9 13:21:22
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/trunk/ide-project/eclipse/classpath
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/eclipse/classpath?rev=1480621&r1=1480620&r2=1480621&view=diff
==============================================================================
--- sis/trunk/ide-project/eclipse/classpath (original)
+++ sis/trunk/ide-project/eclipse/classpath Thu May  9 13:21:22 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/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/pom.xml?rev=1480621&r1=1480620&r2=1480621&view=diff
==============================================================================
--- sis/trunk/pom.xml (original)
+++ sis/trunk/pom.xml Thu May  9 13:21:22 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>



Mime
View raw message