Iprove GIS

Fix support JUnit

git-svn-id: https://svn.argeo.org/commons/trunk@4392 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/basic/runtime/org.argeo.support.junit/.classpath b/basic/runtime/org.argeo.support.junit/.classpath
index 16f01e2ee7b671c44c26c453773dab706e98da1e..b9f9fd2f3f1ac55e10fc3b14a79bc5c0142a9200 100644 (file)
--- a/basic/runtime/org.argeo.support.junit/.classpath
+++ b/basic/runtime/org.argeo.support.junit/.classpath
@@ -2,6 +2,6 @@
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/basic/runtime/org.argeo.support.junit/.project b/basic/runtime/org.argeo.support.junit/.project
index 9b9565deec72b8d131078d8953dd231ca87d25ed..cc37598f2cd591df813a1ce71dfe7b4585eb2827 100644 (file)
--- a/basic/runtime/org.argeo.support.junit/.project
+++ b/basic/runtime/org.argeo.support.junit/.project
@@ -11,13 +11,18 @@
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
        </natures>
 </projectDescription>

diff --git a/basic/runtime/org.argeo.support.junit/pom.xml b/basic/runtime/org.argeo.support.junit/pom.xml
index 57922940bf1965049fc82bc19e7b5e664d68b343..e9b1653acdfc33eb221c39f6608a55b70a311b62 100644 (file)
--- a/basic/runtime/org.argeo.support.junit/pom.xml
+++ b/basic/runtime/org.argeo.support.junit/pom.xml
@@ -1,4 +1,5 @@
-<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/maven-v4_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/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.basic</groupId>
@@ -31,6 +32,7 @@
                                                <Export-Package>
                                                        org.argeo.support.junit.*
                                                </Export-Package>
+                                               <Import-Package>org.springframework.core.io,*</Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/gis/runtime/org.argeo.gis.geotools/src/main/java/org/argeo/geotools/jcr/GeoJcrIndex.java b/gis/runtime/org.argeo.gis.geotools/src/main/java/org/argeo/geotools/jcr/GeoJcrIndex.java
index 75c1b81ad745b30e2e9ddc85ee3fc38393e50653..b384eb3b69b0cdaabb085e7d01212a3c1a00139e 100644 (file)
--- a/gis/runtime/org.argeo.gis.geotools/src/main/java/org/argeo/geotools/jcr/GeoJcrIndex.java
+++ b/gis/runtime/org.argeo.gis.geotools/src/main/java/org/argeo/geotools/jcr/GeoJcrIndex.java
@@ -26,7 +26,6 @@ import org.argeo.jcr.JcrUtils;
 import org.argeo.jcr.gis.GisNames;
 import org.argeo.jcr.gis.GisTypes;
 import org.argeo.jts.jcr.JtsJcrUtils;
-import org.argeo.security.SystemExecutionService;
 import org.geotools.data.DataStore;
 import org.geotools.data.DefaultTransaction;
 import org.geotools.data.FeatureStore;
@@ -201,7 +200,7 @@ public class GeoJcrIndex implements EventListener, GisNames, GisTypes {
                        if (node.isNodeType(GIS_LOCATED)) {
                                locatedNode = node;
                        } else if (node.isNodeType(GIS_INDEXED)) {
-                               locatedNode = findLocatedparent(node);
+                               locatedNode = findLocatedParent(node);
                        } else {
                                throw new ArgeoException("Unsupported node " + node);
                        }
@@ -231,12 +230,12 @@ public class GeoJcrIndex implements EventListener, GisNames, GisTypes {
                }
        }
 
-       protected Node findLocatedparent(Node child) {
+       protected Node findLocatedParent(Node child) {
                try {
                        if (child.getParent().isNodeType(GIS_LOCATED))
                                return child.getParent();
                        else
-                               return findLocatedparent(child.getParent());
+                               return findLocatedParent(child.getParent());
                } catch (Exception e) {
                        // also if child is root node
                        throw new ArgeoException("Cannot find located parent", e);