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 e55a39c6512187d214bd07a3e8ab7f13ea414cc3..6f805a784cb8e18d243070f3afbf3226bc767f2c 100644 (file)
--- 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;
 \r
 import org.apache.tools.ant.Project;\r
 \r
-import org.argeo.slc.core.test.WritableTestRun;\r
-\r
 /**\r
  * <p>\r
  * Manager and initializer of the properties required by SLC Ant.\r

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 0b2698d2615eb59cc5f2a116ad65d1dacd6e15b0..4cc2d9d39d84b26e193980d17198a20f609ecf72 100644 (file)
--- 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)) {\r
                        throw new UnsupportedException("Ant file", source);\r
                }\r
-               File sourceFile = (File)source;\r
+               File sourceFile = (File) source;\r
 \r
                // initialize config\r
                SlcAntConfig slcAntConfig = new SlcAntConfig();\r
 \r
-               System.out.println("Base dir prop2: " + project.getProperty("basedir"));\r
-               // In order to avoid base dire override when running in Maven\r
-               project.setProperty("basedir", sourceFile.getParentFile().getAbsolutePath());\r
+               // Reset basedir property, in order to avoid base dir override when\r
+               // running in Maven\r
+               project.setProperty("basedir", sourceFile.getParentFile()\r
+                               .getAbsolutePath());\r
                if (!slcAntConfig.initProject(project)) {\r
                        // not SLC compatible, do normal Ant\r
                        super.parse(project, source);\r
@@ -66,24 +67,17 @@ public class SlcProjectHelper extends ProjectHelperImpl {
                        log = LogFactory.getLog(SlcProjectHelper.class);\r
                }\r
                log.debug("SLC properties are set, starting initialization..");\r
-               log.debug("Base dir1: " + project.getBaseDir().getAbsoluteFile());\r
-               log.debug("Base dir prop1: " + project.getProperty("basedir"));\r
 \r
                // init Spring application context\r
                initSpringContext(project);\r
-               log.debug("Base dir2: " + project.getBaseDir().getAbsoluteFile());\r
 \r
                // init structure registry\r
                DefaultSRegistry registry = new DefaultSRegistry();\r
                project.addReference(REF_STRUCTURE_REGISTRY, registry);\r
 \r
-               log.debug("Base dir prop2: " + project.getProperty("basedir"));\r
-               // in order to prevent pb w/ basedir setting:\r
-               source = ((File) source).getAbsoluteFile();\r
                // call the underlying implementation to do the actual work\r
                super.parse(project, source);\r
 \r
-               log.debug("Base dir3: " + project.getBaseDir().getAbsoluteFile());\r
                // create structure root\r
                registerProjectAndParents(project, slcAntConfig);\r
 \r

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 fb470992d0592640a20b391762d1bf07e5c244d6..36c22547bd73d1aee2428562f5de51e3eb85987c 100644 (file)
--- 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;\r
 import org.apache.tools.ant.BuildException;\r
 \r
-import org.argeo.slc.ant.SlcAntConfig;\r
 import org.argeo.slc.ant.spring.AbstractSpringArg;\r
 import org.argeo.slc.ant.structure.SAwareTask;\r
 import org.argeo.slc.core.deploy.DeploymentData;\r

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 aa6b0da52e43208f25d15ecc8d33a9430dc065ca..8681865662b6fc3dfdb88019eb96cbc84e70291a 100644 (file)
--- 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;\r
 \r
-import org.argeo.slc.core.structure.tree.TreeSPath;\r
 \r
 /**\r
  * Basic implementation of <code>StructureElement</code>.\r

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 (file)
index a0098cd..0000000
--- a/org.argeo.slc/src/main/java/org/argeo/slc/hibernate/structure/package.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>\r
-<head></head>\r
-<body>\r
-Hibernate based DAO implementations for core structure objects.\r
-</body>\r
-</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 fe083927229109b52ae181e5bd28f0469900e727..e20e3deb3c33e2d29b851e34710f8377bcf2b8d5 100644 (file)
--- 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;\r
 \r
 import org.argeo.slc.core.structure.tree.TreeSPath;\r
-import org.argeo.slc.core.test.tree.TreeTestResult;\r
 import org.argeo.slc.dao.structure.tree.TreeSPathDao;\r
 \r
 /**\r

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 4c55a5385f8cda62c29681d5b0de9935fc8e0501..afe76abeb68bcf79fc4a90fcd1dbaaf006022149 100644 (file)
--- 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;\r
 import org.argeo.slc.core.test.TestResult;\r
 import org.argeo.slc.core.test.TestResultId;\r
-import org.argeo.slc.core.test.tree.TreeTestResult;\r
 import org.argeo.slc.dao.test.TestResultDao;\r
 \r
 /**\r