From bf1f6b4f6cc4150a449b12a25256d2f8b3f803fb Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 29 Mar 2011 16:17:28 +0000
Subject: [PATCH] Iprove GIS Fix support JUnit

git-svn-id: https://svn.argeo.org/commons/trunk@4392 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 basic/runtime/org.argeo.support.junit/.classpath         | 2 +-
 basic/runtime/org.argeo.support.junit/.project           | 9 +++++++--
 basic/runtime/org.argeo.support.junit/pom.xml            | 4 +++-
 .../main/java/org/argeo/geotools/jcr/GeoJcrIndex.java    | 7 +++----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/basic/runtime/org.argeo.support.junit/.classpath b/basic/runtime/org.argeo.support.junit/.classpath
index 16f01e2ee..b9f9fd2f3 100644
--- 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 9b9565dee..cc37598f2 100644
--- 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 57922940b..e9b1653ac 100644
--- 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 75c1b81ad..b384eb3b6 100644
--- 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);
-- 
2.30.2