sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1394368 - in /sis/branches/JDK6: ./ ide-project/NetBeans/nbproject/ sis-app/ sis-build-helper/ sis-build-helper/src/main/java/org/apache/sis/internal/taglet/ sis-metadata/ sis-referencing/ sis-utility/ sis-webapp/ src/main/docbook/
Date Fri, 05 Oct 2012 05:56:31 GMT
Author: desruisseaux
Date: Fri Oct  5 05:56:30 2012
New Revision: 1394368

URL: http://svn.apache.org/viewvc?rev=1394368&view=rev
Log:
Changed version number from "0.3-geoapi3.0-SNAPSHOT" to "0.3-jdk6-SNAPSHOT" for that branch.
Changed NetBeans project name to "Apache SIS for JDK6".
Changed GeoAPI dependency from 3.0.0 to 3.1-M03.

Modified:
    sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml
    sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties
    sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties
    sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml
    sis/branches/JDK6/pom.xml
    sis/branches/JDK6/sis-app/pom.xml
    sis/branches/JDK6/sis-build-helper/pom.xml
    sis/branches/JDK6/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
    sis/branches/JDK6/sis-metadata/pom.xml
    sis/branches/JDK6/sis-referencing/pom.xml
    sis/branches/JDK6/sis-utility/pom.xml
    sis/branches/JDK6/sis-webapp/pom.xml
    sis/branches/JDK6/src/main/docbook/book.entities

Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml?rev=1394368&r1=1394367&r2=1394368&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml Fri Oct  5 05:56:30 2012
@@ -19,7 +19,7 @@ is divided into following sections:
   - cleanup
 
         -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3"
xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default"
name="Apache_SIS_on_GeoAPI_3.0-impl">
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3"
xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default"
name="Apache_SIS_on_GeoAPI_3.1-SNAPSHOT-impl">
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
             <not>
@@ -456,7 +456,7 @@ is divided into following sections:
                     </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_GeoAPI_3.0"
testname="TestNG tests" workingDir="${work.dir}">
+                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}"
mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Apache_SIS_on_GeoAPI_3.1-SNAPSHOT"
testname="TestNG tests" workingDir="${work.dir}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -607,7 +607,7 @@ is divided into following sections:
                 <condition else="-testclass @{testClass}" property="test.class.or.method"
value="-methods @{testClass}.@{testMethod}">
                     <isset property="test.method"/>
                 </condition>
-                <condition else="-suitename Apache_SIS_on_GeoAPI_3.0 -testname @{testClass}
${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                <condition else="-suitename Apache_SIS_on_GeoAPI_3.1-SNAPSHOT -testname
@{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
                     <matches pattern=".*\.xml" string="@{testClass}"/>
                 </condition>
                 <delete dir="${build.test.results.dir}" quiet="true"/>
@@ -899,7 +899,7 @@ is divided into following sections:
         <delete file="${built-jar.properties}" quiet="true"/>
     </target>
     <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: Apache SIS on GeoAPI 3.0 was already
built"/>
+        <echo level="warn" message="Cycle detected: Apache SIS on GeoAPI 3.1-SNAPSHOT
was already built"/>
     </target>
     <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
         <mkdir dir="${build.dir}"/>
@@ -1416,7 +1416,7 @@ is divided into following sections:
         <delete file="${built-clean.properties}" quiet="true"/>
     </target>
     <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: Apache SIS on GeoAPI 3.0 was already
built"/>
+        <echo level="warn" message="Cycle detected: Apache SIS on GeoAPI 3.1-SNAPSHOT
was already built"/>
     </target>
     <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
         <mkdir dir="${build.dir}"/>

Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties?rev=1394368&r1=1394367&r2=1394368&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties (original)
+++ sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties Fri Oct  5 05:56:30
2012
@@ -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=075b665d
-nbproject/build-impl.xml.script.CRC32=a54bea32
+nbproject/build-impl.xml.data.CRC32=763b82ce
+nbproject/build-impl.xml.script.CRC32=72f2518c
 nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46

Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties?rev=1394368&r1=1394367&r2=1394368&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties (original)
+++ sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties Fri Oct  5 05:56:30
2012
@@ -38,7 +38,7 @@ test.utility.dir     = ${project.root}/s
 # Those dependencies must exist in the local Maven repository.
 # Those numbers should match the ones declared in the pom.xml files.
 #
-geoapi.version       = 3.0.0
+geoapi.version       = 3.1-M03
 jsr275.version       = 0.9.3
 vecmath.version      = 1.5.2
 georss.version       = 0.9.8

Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml?rev=1394368&r1=1394367&r2=1394368&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml Fri Oct  5 05:56:30 2012
@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.java.j2seproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>Apache SIS on GeoAPI 3.0</name>
+            <name>Apache SIS for JDK6</name>
             <source-roots>
                 <root id="src.local-src.dir" name="Local sources (unversioned)"/>
                 <root id="src.webapp.dir" name="Web application"/>

Modified: sis/branches/JDK6/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/pom.xml?rev=1394368&r1=1394367&r2=1394368&view=diff
==============================================================================
--- sis/branches/JDK6/pom.xml (original)
+++ sis/branches/JDK6/pom.xml Fri Oct  5 05:56:30 2012
@@ -39,7 +39,7 @@
        ============================================================== -->
   <groupId>org.apache.sis</groupId>
   <artifactId>sis-parent</artifactId>
-  <version>0.3-geoapi3.0-SNAPSHOT</version>
+  <version>0.3-jdk6-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache SIS</name>
@@ -279,7 +279,7 @@ Apache SIS is a toolkit for describing l
          configuration.
        ============================================================== -->
   <properties>
-    <geoapi.version>3.0.0</geoapi.version>
+    <geoapi.version>3.1-M03</geoapi.version>
     <maven.compile.source>1.6</maven.compile.source>
     <maven.compile.target>1.6</maven.compile.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -452,7 +452,7 @@ Apache SIS is a toolkit for describing l
           <breakiterator>true</breakiterator>                   <!-- Better
boundary detection when determining the end of the first sentence. -->
           <stylesheetfile>src/main/javadoc/stylesheet.css</stylesheetfile>
           <links>
-            <link>http://www.geoapi.org/3.0/javadoc</link>
+            <link>http://www.geoapi.org/snapshot/javadoc</link>
           </links>
 
           <!-- Separates packages on the overview page into the groups specified. -->
@@ -572,6 +572,15 @@ Apache SIS is a toolkit for describing l
     </pluginRepository>
   </pluginRepositories>
 
+  <repositories>
+    <repository>
+      <!-- Used for GeoAPI snapshots only, removed for releases. -->
+      <id>geotoolkit</id>
+      <name>Geotoolkit.org repository</name>
+      <url>http://maven.geotoolkit.org</url>
+    </repository>
+  </repositories>
+
 
 
   <!-- ==============================================================

Modified: sis/branches/JDK6/sis-app/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-app/pom.xml?rev=1394368&r1=1394367&r2=1394368&view=diff
==============================================================================
--- sis/branches/JDK6/sis-app/pom.xml (original)
+++ sis/branches/JDK6/sis-app/pom.xml Fri Oct  5 05:56:30 2012
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-geoapi3.0-SNAPSHOT</version>
+    <version>0.3-jdk6-SNAPSHOT</version>
   </parent>
 
   <artifactId>sis-app</artifactId>

Modified: sis/branches/JDK6/sis-build-helper/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-build-helper/pom.xml?rev=1394368&r1=1394367&r2=1394368&view=diff
==============================================================================
--- sis/branches/JDK6/sis-build-helper/pom.xml (original)
+++ sis/branches/JDK6/sis-build-helper/pom.xml Fri Oct  5 05:56:30 2012
@@ -44,7 +44,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-geoapi3.0-SNAPSHOT</version>
+    <version>0.3-jdk6-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK6/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java?rev=1394368&r1=1394367&r2=1394368&view=diff
==============================================================================
--- sis/branches/JDK6/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
(original)
+++ sis/branches/JDK6/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
Fri Oct  5 05:56:30 2012
@@ -36,7 +36,7 @@ public final class Module implements Tag
     /**
      * SIS version to be referenced by this taglet.
      */
-    private static final String VERSION = "0.3-geoapi3.0-SNAPSHOT";
+    private static final String VERSION = "0.3-jdk6-SNAPSHOT";
 
     /**
      * Register this taglet.

Modified: sis/branches/JDK6/sis-metadata/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/pom.xml?rev=1394368&r1=1394367&r2=1394368&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/pom.xml (original)
+++ sis/branches/JDK6/sis-metadata/pom.xml Fri Oct  5 05:56:30 2012
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-geoapi3.0-SNAPSHOT</version>
+    <version>0.3-jdk6-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK6/sis-referencing/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-referencing/pom.xml?rev=1394368&r1=1394367&r2=1394368&view=diff
==============================================================================
--- sis/branches/JDK6/sis-referencing/pom.xml (original)
+++ sis/branches/JDK6/sis-referencing/pom.xml Fri Oct  5 05:56:30 2012
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-geoapi3.0-SNAPSHOT</version>
+    <version>0.3-jdk6-SNAPSHOT</version>
   </parent>
 
   <artifactId>sis-referencing</artifactId>

Modified: sis/branches/JDK6/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-utility/pom.xml?rev=1394368&r1=1394367&r2=1394368&view=diff
==============================================================================
--- sis/branches/JDK6/sis-utility/pom.xml (original)
+++ sis/branches/JDK6/sis-utility/pom.xml Fri Oct  5 05:56:30 2012
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-geoapi3.0-SNAPSHOT</version>
+    <version>0.3-jdk6-SNAPSHOT</version>
   </parent>
 
 

Modified: sis/branches/JDK6/sis-webapp/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-webapp/pom.xml?rev=1394368&r1=1394367&r2=1394368&view=diff
==============================================================================
--- sis/branches/JDK6/sis-webapp/pom.xml (original)
+++ sis/branches/JDK6/sis-webapp/pom.xml Fri Oct  5 05:56:30 2012
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.sis</groupId>
     <artifactId>sis-parent</artifactId>
-    <version>0.3-geoapi3.0-SNAPSHOT</version>
+    <version>0.3-jdk6-SNAPSHOT</version>
   </parent>
 
   <artifactId>sis-webapp</artifactId>

Modified: sis/branches/JDK6/src/main/docbook/book.entities
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/src/main/docbook/book.entities?rev=1394368&r1=1394367&r2=1394368&view=diff
==============================================================================
--- sis/branches/JDK6/src/main/docbook/book.entities (original)
+++ sis/branches/JDK6/src/main/docbook/book.entities Fri Oct  5 05:56:30 2012
@@ -1,5 +1,5 @@
-<!ENTITY geoapi-version "3.0.0">
+<!ENTITY geoapi-version "3.1-M03">
 <!ENTITY geoapi-release "3.0.0">
-<!ENTITY sis-release    "0.3-geoapi3.0-SNAPSHOT">
+<!ENTITY sis-release    "0.3-jdk6-SNAPSHOT">
 <!ENTITY gml-version    "3.3">
-<!ENTITY geoapi-javadoc "http://www.geoapi.org/3.0/javadoc">
+<!ENTITY geoapi-javadoc "http://www.geoapi.org/snapshot/javadoc">



Mime
View raw message