Fix various build issues

diff --git a/Makefile b/Makefile
index 2ef8c78a891ba609286221fb3efa515fadf7d6b0..f3c2fcd6e8c68c00c5ca64fa5c54944ee17e5095 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,9 @@ org.argeo.slc.api \
 org.argeo.slc.factory \
 org.argeo.slc.runtime \
 org.argeo.slc.cms \
+org.argeo.slc.repo \
+org.argeo.slc.rpmfactory \
+org.argeo.slc.jcr \
 swt/rap/org.argeo.tool.server \
 
 clean:

diff --git a/org.argeo.slc.jcr/build.properties b/org.argeo.slc.jcr/build.properties
index b0d77e98b636a6b3f9f1873df43484b6e578e8ff..2363a1dc08862fc46f0fda2ecb50485d9330daf8 100644 (file)
--- a/org.argeo.slc.jcr/build.properties
+++ b/org.argeo.slc.jcr/build.properties
@@ -3,7 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .
 additional.bundles = org.junit,\
-                     org.hamcrest,\
                      org.apache.jackrabbit.core,\
                      javax.jcr,\
                      org.apache.jackrabbit.api,\
@@ -12,7 +11,7 @@ additional.bundles = org.junit,\
                      org.apache.jackrabbit.spi,\
                      org.apache.jackrabbit.spi.commons,\
                      org.slf4j.api,\
-                      org.apache.commons.collections,\
+                     org.apache.commons.collections,\
                      EDU.oswego.cs.dl.util.concurrent,\
                      org.apache.lucene,\
                      org.apache.tika.core,\

diff --git a/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrCommands.java b/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrCommands.java
index 5dd9955226156cb12a5031f02152a163862936f9..fd5b5d763488868edd6ba57bbab65e38ece2eb47 100644 (file)
--- a/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrCommands.java
+++ b/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrCommands.java
@@ -1,6 +1,6 @@
 package org.argeo.cli.jcr;
 
-import org.argeo.slc.cli.CommandsCli;
+import org.argeo.api.cli.CommandsCli;
 
 /** File utilities. */
 public class JcrCommands extends CommandsCli {

diff --git a/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrSync.java b/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrSync.java
index 5fe02eb9b1fe8c75bba5225d6014d3adddc67c47..ed1a5f869ce8172caccd616d027487049d59a1b9 100644 (file)
--- a/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrSync.java
+++ b/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrSync.java
@@ -20,12 +20,12 @@ import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
+import org.argeo.api.cli.CommandArgsException;
+import org.argeo.api.cli.CommandRuntimeException;
+import org.argeo.api.cli.DescribedCommand;
+import org.argeo.cms.file.SyncResult;
 import org.argeo.jackrabbit.client.ClientDavexRepositoryFactory;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.slc.cli.CommandArgsException;
-import org.argeo.slc.cli.CommandRuntimeException;
-import org.argeo.slc.cli.DescribedCommand;
-import org.argeo.slc.sync.SyncResult;
 
 public class JcrSync implements DescribedCommand<SyncResult<Node>> {
        public final static String DEFAULT_LOCALFS_CONFIG = "repository-localfs.xml";

diff --git a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java
index 89f416819d4a13d154e224b92e74d21db248095f..219309f33bbac4363391b619499b8d83edd3d407 100644 (file)
--- a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java
+++ b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java
@@ -40,7 +40,6 @@ public class SlcJcrResultUtils {
         * it throws an exception.
         * 
         * @param session
-        * @return
         */
        public static Node getSlcResultsParentNode(Session session) {
                try {
@@ -90,7 +89,6 @@ public class SlcJcrResultUtils {
         * that node if it has the correct type and throws an exception otherwise.
         * 
         * @param session
-        * @return
         */
        public static Node getMyResultParentNode(Session session) {
                try {
@@ -123,7 +121,6 @@ public class SlcJcrResultUtils {
         * 
         * @param session
         * @param absPath
-        * @return
         */
        public static synchronized Node createResultFolderNode(Session session,
                        String absPath) {

diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThread.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThread.java
index 33ea9f07ae6f0ddfe26b29127df8986e9dbe4828..1bbf9d12857a3bb554491aff8625125aa8e8f008 100644 (file)
--- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThread.java
+++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThread.java
@@ -148,7 +148,6 @@ public class ProcessThread extends Thread {
                }
        }
 
-       /** @return the (distinct) thread used for this execution */
        protected final void execute(RealizedFlow realizedFlow, Boolean synchronous) throws InterruptedException {
                if (killed)
                        return;