sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1515800 - in /sis/branches/JDK7: ./ core/ core/sis-feature/ core/sis-feature/src/ core/sis-feature/src/main/ core/sis-feature/src/main/java/ core/sis-feature/src/main/java/org/ core/sis-feature/src/main/java/org/apache/ core/sis-feature/sr...
Date Tue, 20 Aug 2013 12:44:42 GMT
Author: desruisseaux
Date: Tue Aug 20 12:44:41 2013
New Revision: 1515800

URL: http://svn.apache.org/r1515800
Log:
Initial creation of a new sis-feature module, with a copy of the Feature class from the Shapefile
branch.

Added:
    sis/branches/JDK7/core/sis-feature/   (with props)
    sis/branches/JDK7/core/sis-feature/pom.xml   (contents, props changed)
      - copied, changed from r1515769, sis/branches/Shapefile/storage/sis-shapefile/pom.xml
    sis/branches/JDK7/core/sis-feature/src/
    sis/branches/JDK7/core/sis-feature/src/main/
    sis/branches/JDK7/core/sis-feature/src/main/java/
    sis/branches/JDK7/core/sis-feature/src/main/java/org/
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeature.java
  (contents, props changed)
      - copied, changed from r1515769, sis/branches/Shapefile/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/Feature.java
    sis/branches/JDK7/core/sis-feature/src/test/
    sis/branches/JDK7/core/sis-feature/src/test/java/
Modified:
    sis/branches/JDK7/core/pom.xml
    sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml
    sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
    sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties
    sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
    sis/branches/JDK7/pom.xml

Modified: sis/branches/JDK7/core/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/pom.xml?rev=1515800&r1=1515799&r2=1515800&view=diff
==============================================================================
--- sis/branches/JDK7/core/pom.xml (original)
+++ sis/branches/JDK7/core/pom.xml Tue Aug 20 12:44:41 2013
@@ -66,6 +66,14 @@
         <role>developer</role>
       </roles>
     </developer>
+    <developer>
+      <name>Travis L. Pinney</name>
+      <id>tlpinney</id>
+      <email>travis.pinney@gmail.com</email>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
   </developers>
   <contributors>
     <contributor>
@@ -124,6 +132,7 @@
     <module>sis-utility</module>
     <module>sis-metadata</module>
     <module>sis-referencing</module>
+    <module>sis-feature</module>
   </modules>
 
 </project>

Propchange: sis/branches/JDK7/core/sis-feature/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Aug 20 12:44:41 2013
@@ -0,0 +1,10 @@
+.project
+.settings
+.classpath
+.jetproperties
+.wtpmodules
+target
+bin
+cobertura.ser
+nbproject
+nbactions.xml

Copied: sis/branches/JDK7/core/sis-feature/pom.xml (from r1515769, sis/branches/Shapefile/storage/sis-shapefile/pom.xml)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/pom.xml?p2=sis/branches/JDK7/core/sis-feature/pom.xml&p1=sis/branches/Shapefile/storage/sis-shapefile/pom.xml&r1=1515769&r2=1515800&rev=1515800&view=diff
==============================================================================
--- sis/branches/Shapefile/storage/sis-shapefile/pom.xml (original)
+++ sis/branches/JDK7/core/sis-feature/pom.xml Tue Aug 20 12:44:41 2013
@@ -19,71 +19,93 @@
   under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns              = "http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0
+                               http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
+    <groupId>org.apache.sis</groupId>
+    <artifactId>core</artifactId>
+    <version>0.4-jdk7-SNAPSHOT</version>
+  </parent>
 
-<parent>
-  <groupId>org.apache.sis</groupId>
-  <artifactId>storage</artifactId>
-  <version>0.3-geoapi3.0-SNAPSHOT</version>
-</parent>
-  
-  
-  
-   <!-- ===========================================================
+
+  <!-- ===========================================================
            Module Description
        =========================================================== -->
-  <groupId>org.apache.sis.storage</groupId>
-  <artifactId>sis-shapefile</artifactId>
+  <groupId>org.apache.sis.core</groupId>
+  <artifactId>sis-feature</artifactId>
   <packaging>bundle</packaging>
-  <name>Apache SIS Shapefile storage</name>
+  <name>Apache SIS features</name>
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
        The leading space after the first line is necessary for proper formatting. -->
-Shapefile Driver
+Representations of geographic features.
   </description>
-  <url>http://maven.apache.org</url>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
 
-<!-- ===========================================================
+  <!-- ===========================================================
+           Developers and Contributors
+       =========================================================== -->
+  <developers>
+    <developer>
+      <name>Travis L. Pinney</name>
+      <id>tlpinney</id>
+      <email>travis.pinney@gmail.com</email>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+  </developers>
+
+
+  <!-- ===========================================================
+           Build configuration
+       =========================================================== -->
+  <build>
+    <plugins>
+
+      <!-- Collect JAR files in <root>/target/binaries directory. -->
+      <plugin>
+        <groupId>org.apache.sis.core</groupId>
+        <artifactId>sis-build-helper</artifactId>
+        <version>${sis.plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>collect-jars</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- 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>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-	  <groupId>com.esri.geometry</groupId>
- 	  <artifactId>esri-geometry-api</artifactId>
- 	  <version>1.0</version>
-    </dependency>
-    <dependency>
-	  <groupId>commons-io</groupId>
-	  <artifactId>commons-io</artifactId>
-	  <version>2.4</version>
-    </dependency>  
-    <dependency>
-	  <groupId>commons-codec</groupId>
-	  <artifactId>commons-codec</artifactId>
-	  <version>1.8</version>
-    </dependency>
-    <dependency>
- 	  <groupId>org.apache.sis.storage</groupId>
-  	  <artifactId>sis-storage</artifactId>
-      <version>0.3-geoapi3.0-SNAPSHOT</version>
+      <groupId>org.opengis</groupId>
+      <artifactId>geoapi-pending</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <scope>test</scope>
+      <groupId>com.esri.geometry</groupId>
+      <artifactId>esri-geometry-api</artifactId>
     </dependency>
   </dependencies>
 

Propchange: sis/branches/JDK7/core/sis-feature/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK7/core/sis-feature/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Aug 20 12:44:41 2013
@@ -0,0 +1,3 @@
+/sis/branches/Android/storage/sis-shapefile/pom.xml:1430670-1480699
+/sis/branches/JDK6/storage/sis-shapefile/pom.xml:1394364-1493762
+/sis/branches/JDK7/storage/sis-shapefile/pom.xml:1394913-1493760

Propchange: sis/branches/JDK7/core/sis-feature/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeature.java
(from r1515769, sis/branches/Shapefile/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/Feature.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeature.java?p2=sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeature.java&p1=sis/branches/Shapefile/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/Feature.java&r1=1515769&r2=1515800&rev=1515800&view=diff
==============================================================================
--- sis/branches/Shapefile/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/Feature.java
[iso-8859-1] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeature.java
[UTF-8] Tue Aug 20 12:44:41 2013
@@ -14,59 +14,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.apache.sis.feature;
 
-package org.apache.sis.storage.shapefile;
-
+import java.util.Map;
 import java.util.HashMap;
 import com.esri.core.geometry.Geometry;
 
-// 
 
 /**
- * Provides a simple Feature class
+ * Simple Feature class.
  *
- * when dealing with codepages, should first check if there is a .cpg file 
- * 
- * @see <a href="http://www.clicketyclick.dk/databases/xbase/format/dbf.html#DBF_STRUCT">Xbase
Data file</a>
+ * @author  Travis L. Pinney
+ * @since   0.4
+ * @version 0.4
+ * @module
  */
+public class DefaultFeature {
 
-public class Feature {
-	
-	private HashMap<String, String> record;  
-	private	Geometry geom;
-	
-	
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		String lineSeparator = System.getProperty("line.separator", "\n");
-		
-		for (String s : this.record.keySet()) {
-			sb.append(s).append(": ").append(record.get(s)).append(lineSeparator);
-		}
-
-		return sb.toString();
-	}
-	
-	
-	// getters and setters
-	
-	public HashMap<String, String> getRecord() {
-		return record;
-	}
-
-
-	public void setRecord(HashMap<String, String> record) {
-		this.record = record;
-	}
-
-
-	public Geometry getGeom() {
-		return geom;
-	}
-
-
-	public void setGeom(Geometry geom) {
-		this.geom = geom;
-	}
+    private Map<String, String> record;
+    private Geometry geom;
 
+    public Map<String, String> getRecord() {
+        return record;
+    }
+
+    public void setRecord(HashMap<String, String> record) {
+        this.record = record;
+    }
+
+    public Geometry getGeom() {
+        return geom;
+    }
+
+    public void setGeom(Geometry geom) {
+        this.geom = geom;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder();
+        final String lineSeparator = System.lineSeparator();
+        for (String s : this.record.keySet()) {
+            sb.append(s).append(": ").append(record.get(s)).append(lineSeparator);
+        }
+        return sb.toString();
+    }
 }

Propchange: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeature.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeature.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Aug 20 12:44:41 2013
@@ -0,0 +1,3 @@
+/sis/branches/Android/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/Feature.java:1430670-1480699
+/sis/branches/JDK6/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/Feature.java:1394364-1493762
+/sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/Feature.java:1394913-1493760

Propchange: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeature.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml?rev=1515800&r1=1515799&r2=1515800&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml Tue Aug 20 12:44:41 2013
@@ -138,6 +138,7 @@ is divided into following sections:
                 <available file="${test.console.dir}"/>
                 <available file="${test.netcdf.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}"/>
@@ -150,6 +151,7 @@ is divided into following sections:
                 <available file="${src.console.dir}"/>
                 <available file="${src.netcdf.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}"/>
@@ -245,12 +247,14 @@ is divided into following sections:
         <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.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="test.console.dir">Must set test.console.dir</fail>
         <fail unless="test.netcdf.dir">Must set test.netcdf.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>
@@ -274,7 +278,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.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -314,7 +318,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.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -346,7 +350,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.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -442,6 +446,9 @@ is divided into following sections:
                         <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>
@@ -489,6 +496,9 @@ is divided into following sections:
                     <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>
@@ -616,6 +626,9 @@ is divided into following sections:
                         <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>
@@ -989,7 +1002,7 @@ is divided into following sections:
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.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}"/>
@@ -999,6 +1012,7 @@ is divided into following sections:
             <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.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}"/>
@@ -1022,7 +1036,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.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.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.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -1298,6 +1312,9 @@ is divided into following sections:
             <fileset dir="${src.storage.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
+            <fileset dir="${src.feature.dir}" excludes="*.java,${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
             <fileset dir="${src.referencing.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -1329,6 +1346,9 @@ is divided into following sections:
             <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>
@@ -1360,14 +1380,15 @@ 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.console.dir}:${test.netcdf.dir}:${test.storage.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.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.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.console.dir}:${test.netcdf.dir}:${test.storage.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.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.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.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}"/>
@@ -1385,11 +1406,12 @@ 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.console.dir}:${test.netcdf.dir}:${test.storage.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"
srcdir="${test.console.dir}:${test.netcdf.dir}:${test.storage.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.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"
srcdir="${test.console.dir}:${test.netcdf.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.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.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}"/>

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties?rev=1515800&r1=1515799&r2=1515800&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] Tue
Aug 20 12:44:41 2013
@@ -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=d45d31b9
-nbproject/build-impl.xml.script.CRC32=bdea8683
+nbproject/build-impl.xml.data.CRC32=bd5320d7
+nbproject/build-impl.xml.script.CRC32=8f7cbac4
 nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties?rev=1515800&r1=1515799&r2=1515800&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Tue Aug
20 12:44:41 2013
@@ -50,6 +50,8 @@ src.netcdf.dir       = ${project.root}/s
 test.netcdf.dir      = ${project.root}/storage/sis-netcdf/src/test/java
 src.storage.dir      = ${project.root}/storage/sis-storage/src/main/java
 test.storage.dir     = ${project.root}/storage/sis-storage/src/test/java
+src.feature.dir      = ${project.root}/core/sis-feature/src/main/java
+test.feature.dir     = ${project.root}/core/sis-feature/src/test/java
 src.referencing.dir  = ${project.root}/core/sis-referencing/src/main/java
 test.referencing.dir = ${project.root}/core/sis-referencing/src/test/java
 src.metadata.dir     = ${project.root}/core/sis-metadata/src/main/java
@@ -66,6 +68,7 @@ geoapi.version       = 3.1-M04
 unit-api.version     = 0.6.1
 jsr275.version       = 0.9.3
 vecmath.version      = 1.5.2
+geometry.version     = 1.0
 georss.version       = 0.9.8
 rome.version         = 0.9
 jdom1.version        = 1.0
@@ -89,6 +92,7 @@ javac.classpath=\
     ${maven.repository}/org/unitsofmeasurement/unit-api/${unit-api.version}/unit-api-${unit-api.version}.jar:\
     ${maven.repository}/javax/measure/jsr-275/${jsr275.version}/jsr-275-${jsr275.version}.jar:\
     ${maven.repository}/java3d/vecmath/${vecmath.version}/vecmath-${vecmath.version}.jar:\
+    ${maven.repository}/com/esri/geometry/esri-geometry-api/${geometry.version}/esri-geometry-api-${geometry.version}.jar:\
     ${maven.repository}/org/geonames/georss-rome/${georss.version}/georss-rome-${georss.version}.jar:\
     ${maven.repository}/rome/rome/${rome.version}/rome-${rome.version}.jar:\
     ${maven.repository}/jdom/jdom/${jdom1.version}/jdom-${jdom1.version}.jar:\

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml?rev=1515800&r1=1515799&r2=1515800&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml Tue Aug 20 12:44:41 2013
@@ -28,6 +28,7 @@
                 <root id="src.console.dir" name="Console"/>
                 <root id="src.netcdf.dir" name="NetCDF"/>
                 <root id="src.storage.dir" name="Storage"/>
+                <root id="src.feature.dir" name="Feature"/>
                 <root id="src.referencing.dir" name="Referencing"/>
                 <root id="src.metadata.dir" name="Metadata"/>
                 <root id="src.utility.dir" name="Utility"/>
@@ -36,6 +37,7 @@
                 <root id="test.console.dir" name="Test Console"/>
                 <root id="test.netcdf.dir" name="Test NetCDF"/>
                 <root id="test.storage.dir" name="Test Storage"/>
+                <root id="test.feature.dir" name="Test Feature"/>
                 <root id="test.referencing.dir" name="Test Referencing"/>
                 <root id="test.metadata.dir" name="Test Metadata"/>
                 <root id="test.utility.dir" name="Test Utility"/>

Modified: sis/branches/JDK7/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1515800&r1=1515799&r2=1515800&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Tue Aug 20 12:44:41 2013
@@ -188,6 +188,14 @@ Apache SIS is a free software, Java lang
       </roles>
     </developer>
     <developer>
+      <name>Travis L. Pinney</name>
+      <id>tlpinney</id>
+      <email>travis.pinney@gmail.com</email>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
       <name>Nga Chung</name>
       <id>nchung</id>
       <email>nchung@apache.org</email>
@@ -325,6 +333,11 @@ Apache SIS is a free software, Java lang
 
       <!-- Libraries (language, XML, network) -->
       <dependency>
+        <groupId>com.esri.geometry</groupId>
+        <artifactId>esri-geometry-api</artifactId>
+        <version>1.0</version>
+      </dependency>
+      <dependency>
         <groupId>javax</groupId>
         <artifactId>javaee-api</artifactId>
         <version>6.0</version>



Mime
View raw message