From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 1 Dec 2007 16:09:21 +0000 (+0000)
Subject: Remove unused logs and clean warnings
X-Git-Tag: argeo-slc-2.1.7~3147
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=0d9ed03d0ff7d6e1b4f9c0f544e961f977cb857f;p=gpl%2Fargeo-slc.git

Remove unused logs and clean warnings

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

diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcAntConfig.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
index e55a39c65..6f805a784 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcAntConfig.java
@@ -11,8 +11,6 @@ import org.springframework.util.Log4jConfigurer;
 
 import org.apache.tools.ant.Project;
 
-import org.argeo.slc.core.test.WritableTestRun;
-
 /**
  * <p>
  * Manager and initializer of the properties required by SLC Ant.
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
index 0b2698d26..4cc2d9d39 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/SlcProjectHelper.java
@@ -47,14 +47,15 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 		if (!(source instanceof File)) {
 			throw new UnsupportedException("Ant file", source);
 		}
-		File sourceFile = (File)source;
+		File sourceFile = (File) source;
 
 		// initialize config
 		SlcAntConfig slcAntConfig = new SlcAntConfig();
 
-		System.out.println("Base dir prop2: " + project.getProperty("basedir"));
-		// In order to avoid base dire override when running in Maven
-		project.setProperty("basedir", sourceFile.getParentFile().getAbsolutePath());
+		// Reset basedir property, in order to avoid base dir override when
+		// running in Maven
+		project.setProperty("basedir", sourceFile.getParentFile()
+				.getAbsolutePath());
 		if (!slcAntConfig.initProject(project)) {
 			// not SLC compatible, do normal Ant
 			super.parse(project, source);
@@ -66,24 +67,17 @@ public class SlcProjectHelper extends ProjectHelperImpl {
 			log = LogFactory.getLog(SlcProjectHelper.class);
 		}
 		log.debug("SLC properties are set, starting initialization..");
-		log.debug("Base dir1: " + project.getBaseDir().getAbsoluteFile());
-		log.debug("Base dir prop1: " + project.getProperty("basedir"));
 
 		// init Spring application context
 		initSpringContext(project);
-		log.debug("Base dir2: " + project.getBaseDir().getAbsoluteFile());
 
 		// init structure registry
 		DefaultSRegistry registry = new DefaultSRegistry();
 		project.addReference(REF_STRUCTURE_REGISTRY, registry);
 
-		log.debug("Base dir prop2: " + project.getProperty("basedir"));
-		// in order to prevent pb w/ basedir setting:
-		source = ((File) source).getAbsoluteFile();
 		// call the underlying implementation to do the actual work
 		super.parse(project, source);
 
-		log.debug("Base dir3: " + project.getBaseDir().getAbsoluteFile());
 		// create structure root
 		registerProjectAndParents(project, slcAntConfig);
 
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java b/org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java
index fb470992d..36c22547b 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java
@@ -4,7 +4,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tools.ant.BuildException;
 
-import org.argeo.slc.ant.SlcAntConfig;
 import org.argeo.slc.ant.spring.AbstractSpringArg;
 import org.argeo.slc.ant.structure.SAwareTask;
 import org.argeo.slc.core.deploy.DeploymentData;
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java b/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java
index aa6b0da52..868186566 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/core/structure/SimpleSElement.java
@@ -1,6 +1,5 @@
 package org.argeo.slc.core.structure;
 
-import org.argeo.slc.core.structure.tree.TreeSPath;
 
 /**
  * Basic implementation of <code>StructureElement</code>.
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/package.html b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/package.html
deleted file mode 100644
index a0098cd8d..000000000
--- a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/package.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head></head>
-<body>
-Hibernate based DAO implementations for core structure objects.
-</body>
-</html>
\ No newline at end of file
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernate.java b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernate.java
index fe0839272..e20e3deb3 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernate.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/tree/TreeSPathDaoHibernate.java
@@ -8,7 +8,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.argeo.slc.core.structure.tree.TreeSPath;
-import org.argeo.slc.core.test.tree.TreeTestResult;
 import org.argeo.slc.dao.structure.tree.TreeSPathDao;
 
 /**
diff --git a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TestResultDaoHibernate.java b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TestResultDaoHibernate.java
index 4c55a5385..afe76abeb 100644
--- a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TestResultDaoHibernate.java
+++ b/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/test/tree/TestResultDaoHibernate.java
@@ -7,7 +7,6 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 import org.argeo.slc.core.test.NumericTRId;
 import org.argeo.slc.core.test.TestResult;
 import org.argeo.slc.core.test.TestResultId;
-import org.argeo.slc.core.test.tree.TreeTestResult;
 import org.argeo.slc.dao.test.TestResultDao;
 
 /**