+ refactor to separate runtime and module project under eclipse plugin.

+ add some pom to prepare the deployment
+ clean client rcp & ui project (change src & target folder)

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

diff --git a/demo/site/org.argeo.slc.demo.log4j/log4j.properties b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
index 2b466919ea010a5d1203f1eb2d0d38f7936b9b56..eebe65485b5fa6b733ab730158012d94b4ab0ac0 100644 (file)
--- a/demo/site/org.argeo.slc.demo.log4j/log4j.properties
+++ b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
@@ -8,11 +8,14 @@ log4j.logger.org.argeo.slc.client=TRACE
 
 
 log4j.logger.org.hibernate=WARN
+#log4j.logger.org.hibernate.jdbc=DEBUG
+#log4j.logger.org.hibernate.transaction=DEBUG
 #log4j.logger.org.hibernate.SQL=DEBUG
 #log4j.logger.org.hibernate.tool.hbm2ddl=DEBUG
 
 
 log4j.logger.org.springframework=WARN
+#log4j.logger.org.springframework.osgi.extender.internal.dependencies=INFO
 #log4j.logger.org.springframework.web=DEBUG
 #log4j.logger.org.springframework.jms=WARN
 #log4j.logger.org.springframework.security=DEBUG

diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ProcessParametersEditingSupport.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ProcessParametersEditingSupport.java
index 7ca534e0f54ab8c4a85bc373b397bc8c14c1e2ba..fb81153bda4a5ff8bb4157af10597523d5894011 100644 (file)
--- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ProcessParametersEditingSupport.java
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ProcessParametersEditingSupport.java
@@ -32,15 +32,15 @@ public class ProcessParametersEditingSupport extends EditingSupport {
        // .getLog(ProcessParametersEditingSupport.class);
 
        private CellEditor strEditor;
-       private CellEditor nbEditor;
+       //private CellEditor nbEditor;
        // private int column;
 
        private final static String strType = "string", intType = "integer";
 
        // different type of primitive
-       private static enum primitiveType {
-               strType, intType
-       };
+       // private static enum primitiveType {
+       // strType, intType
+       // };
 
        // So that we can update corresponding process
        private int curProcessIndex;

diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java
index 5d62983f96ac2167859920dafcc94b3b463a2b27..bc4f262b989f58965c34450a3a125b147eff814d 100644 (file)
--- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessBuilderView.java
@@ -8,8 +8,6 @@ import java.util.Properties;
 import java.util.UUID;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.oxm.OxmInterface;
 import org.argeo.slc.client.ui.ClientUiPlugin;
@@ -49,12 +47,10 @@ import org.eclipse.ui.part.ViewPart;
  * 
  */
 public class ProcessBuilderView extends ViewPart {
-       private final static Log log = LogFactory.getLog(ProcessBuilderView.class);
+       // private final static Log log =
+       // LogFactory.getLog(ProcessBuilderView.class);
 
        public static final String ID = "org.argeo.slc.client.ui.processBuilderView";
-       private static final String EDIT_CMD = "org.argeo.slc.client.ui.editRealizedFlowDetails";
-       private static final String FLOWASXML_PARAM = "org.argeo.slc.client.commands.realizedFlowAsXml";
-       private static final String INDEX_PARAM = "org.argeo.slc.client.commands.realizedFlowIndex";
 
        // private final static Log log =
        // LogFactory.getLog(ProcessBuilderView.class);

diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessParametersView.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessParametersView.java
index b45fb99815a618c8402bc73ba2257d049e547bf9..2c4871423edf87994f6a10e636ed0d6f3bf3904c 100644 (file)
--- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessParametersView.java
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ProcessParametersView.java
@@ -4,8 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.argeo.slc.client.ui.providers.ProcessParametersEditingSupport;
 import org.argeo.slc.core.execution.PrimitiveAccessor;
@@ -34,8 +32,8 @@ import org.eclipse.ui.part.ViewPart;
  *         attribute to recall (and update ??) the various parameters.
  */
 public class ProcessParametersView extends ViewPart {
-       private static final Log log = LogFactory
-                       .getLog(ProcessParametersView.class);
+       // private static final Log log = LogFactory
+       // .getLog(ProcessParametersView.class);
 
        public static final String ID = "org.argeo.slc.client.ui.processParametersView";
 
@@ -142,7 +140,7 @@ public class ProcessParametersView extends ViewPart {
                public void dispose() {
                }
 
-               @SuppressWarnings("unchecked")
+               @SuppressWarnings({ "unchecked", "rawtypes" })
                // we cast the Map<String, Object> to List<Object>
                public Object[] getElements(Object obj) {
 

diff --git a/eclipse/plugins/runtime/pom.xml b/eclipse/plugins/runtime/pom.xml
index b63fba80042c85e997b00cb6b786d6c0d24791b4..218e19446c566a1f3692ad14b0493af1d1ad5bd2 100644 (file)
--- a/eclipse/plugins/runtime/pom.xml
+++ b/eclipse/plugins/runtime/pom.xml
@@ -8,7 +8,7 @@
                <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc.eclipse</groupId>
-       <artifactId>Runtime</artifactId>
+       <artifactId>runtime</artifactId>
        <name>Argeo Eclipse plugins runtime</name>
        <packaging>pom</packaging>
        <modules>

diff --git a/modules/agent/org.argeo.slc.agent/META-INF/MANIFEST.MF b/modules/agent/org.argeo.slc.agent/META-INF/MANIFEST.MF
index 4ed8eb7e8f9e98021f2cd97cacfb75fbfd0aa8ce..2f9a214bc1c79dab537a187970ba256a52884525 100644 (file)
--- a/modules/agent/org.argeo.slc.agent/META-INF/MANIFEST.MF
+++ b/modules/agent/org.argeo.slc.agent/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
-Require-Bundle: org.argeo.slc.specs,org.argeo.slc.core,org.argeo.slc.s
- upport.osgi
+Require-Bundle: org.argeo.slc.specs,
+ org.argeo.slc.core,
+ org.argeo.slc.support.osgi
 Bundle-Version: 0.13.0.SNAPSHOT
 Bundle-Name: Argeo SLC Agent
 Bundle-SymbolicName: org.argeo.slc.agent