SLC JCR

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

diff --git a/demo/slc-client-rcp-dev.product b/demo/slc-client-rcp-dev.product
index 07f002c975e867dbc330bdf37570cb82581254e0..1fbadc765c3fe9dd3595930e61d2f0b270bc70fc 100644 (file)
--- a/demo/slc-client-rcp-dev.product
+++ b/demo/slc-client-rcp-dev.product
@@ -166,11 +166,13 @@
       <plugin id="org.argeo.dep.osgi.tika"/>
       <plugin id="org.argeo.eclipse.ui"/>
       <plugin id="org.argeo.eclipse.ui.jcr"/>
+      <plugin id="org.argeo.eclipse.ui.rap"/>
       <plugin id="org.argeo.jcr.ui.explorer"/>
       <plugin id="org.argeo.node.repo.jackrabbit"/>
       <plugin id="org.argeo.security.activemq"/>
       <plugin id="org.argeo.security.core"/>
       <plugin id="org.argeo.security.equinox"/>
+      <plugin id="org.argeo.security.jackrabbit" fragment="true"/>
       <plugin id="org.argeo.security.ldap"/>
       <plugin id="org.argeo.security.manager.ldap"/>
       <plugin id="org.argeo.security.services"/>
@@ -183,6 +185,7 @@
       <plugin id="org.argeo.server.ext.jackrabbit" fragment="true"/>
       <plugin id="org.argeo.server.jackrabbit"/>
       <plugin id="org.argeo.server.jcr"/>
+      <plugin id="org.argeo.server.jcr.mvc"/>
       <plugin id="org.argeo.server.jdbc" fragment="true"/>
       <plugin id="org.argeo.server.json"/>
       <plugin id="org.argeo.server.tika.jackrabbit" fragment="true"/>
@@ -202,8 +205,8 @@
       <plugin id="org.argeo.slc.client.ui.dist"/>
       <plugin id="org.argeo.slc.core"/>
       <plugin id="org.argeo.slc.demo.agent" fragment="true"/>
-      <plugin id="org.argeo.slc.demo.ant"/>
-      <plugin id="org.argeo.slc.demo.basic"/>
+      <plugin id="org.argeo.slc.demo.ant" fragment=""/>
+      <plugin id="org.argeo.slc.demo.basic" fragment=""/>
       <plugin id="org.argeo.slc.demo.log4j" fragment="true"/>
       <plugin id="org.argeo.slc.detached"/>
       <plugin id="org.argeo.slc.ext.activemq" fragment="true"/>
@@ -228,8 +231,8 @@
       <plugin id="org.argeo.slc.support.maven"/>
       <plugin id="org.argeo.slc.support.osgi"/>
       <plugin id="org.argeo.slc.support.simple"/>
-      <plugin id="org.argeo.slc.ui.gis"/>
-      <plugin id="org.argeo.slc.ui.gis.rcp"/>
+      <plugin id="org.argeo.slc.ui.gis" fragment=""/>
+      <plugin id="org.argeo.slc.ui.gis.rcp" fragment=""/>
       <plugin id="org.eclipse.core.commands"/>
       <plugin id="org.eclipse.core.contenttype"/>
       <plugin id="org.eclipse.core.databinding"/>

diff --git a/demo/slc-client-rcp.product b/demo/slc-client-rcp.product
index b0c48b16fee21f1690c267b7497cb2a48c795d91..ba5646b35e9be89fc2b18cde7944859619616e95 100644 (file)
--- a/demo/slc-client-rcp.product
+++ b/demo/slc-client-rcp.product
@@ -157,9 +157,12 @@
       <plugin id="org.argeo.dep.osgi.tagsoup"/>
       <plugin id="org.argeo.dep.osgi.tika"/>
       <plugin id="org.argeo.eclipse.ui"/>
+      <plugin id="org.argeo.eclipse.ui.jcr"/>
+      <plugin id="org.argeo.eclipse.ui.rcp"/>
       <plugin id="org.argeo.security.activemq"/>
       <plugin id="org.argeo.security.core"/>
       <plugin id="org.argeo.security.equinox"/>
+      <plugin id="org.argeo.security.jackrabbit" fragment="true"/>
       <plugin id="org.argeo.security.ldap"/>
       <plugin id="org.argeo.security.manager.ldap"/>
       <plugin id="org.argeo.security.services"/>
@@ -169,6 +172,7 @@
       <plugin id="org.argeo.server.ads.server"/>
       <plugin id="org.argeo.server.core"/>
       <plugin id="org.argeo.server.ext.jackrabbit" fragment="true"/>
+      <plugin id="org.argeo.server.jcr"/>
       <plugin id="org.argeo.server.jdbc" fragment="true"/>
       <plugin id="org.argeo.server.json"/>
       <plugin id="org.argeo.server.tika.jackrabbit" fragment="true"/>
@@ -177,7 +181,7 @@
       <plugin id="org.argeo.slc.agent.ext.jdbc" fragment="true"/>
       <plugin id="org.argeo.slc.agent.ext.xalan" fragment="true"/>
       <plugin id="org.argeo.slc.client.agent"/>
-      <plugin id="org.argeo.slc.client.commons"/>
+      <plugin id="org.argeo.slc.client.commons" fragment=""/>
       <plugin id="org.argeo.slc.client.core"/>
       <plugin id="org.argeo.slc.client.hibernate"/>
       <plugin id="org.argeo.slc.client.oxm"/>
@@ -186,11 +190,12 @@
       <plugin id="org.argeo.slc.client.ui.dist"/>
       <plugin id="org.argeo.slc.core"/>
       <plugin id="org.argeo.slc.demo.agent" fragment="true"/>
-      <plugin id="org.argeo.slc.demo.ant" fragment=""/>
+      <plugin id="org.argeo.slc.demo.ant"/>
       <plugin id="org.argeo.slc.demo.basic"/>
       <plugin id="org.argeo.slc.demo.log4j" fragment="true"/>
       <plugin id="org.argeo.slc.detached"/>
       <plugin id="org.argeo.slc.ext.activemq" fragment="true"/>
+      <plugin id="org.argeo.slc.gis.ext.dbcp" fragment="true"/>
       <plugin id="org.argeo.slc.server"/>
       <plugin id="org.argeo.slc.server.castor"/>
       <plugin id="org.argeo.slc.server.h2"/>
@@ -256,7 +261,6 @@
       <plugin id="org.argeo.server.ads.server" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.agent" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.client.agent" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.client.commons" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.client.core" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.client.hibernate" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.slc.client.oxm" autoStart="true" startLevel="0" />

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
index d380602a70ed633fd81af125fcc13cb32ff52501..6b1039d1e4e412d3b9d52cce02f31cc365054c33 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.ui;resolution:=optional,
  org.eclipse.rap.ui.workbench;resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.argeo.slc.client.ui.listeners,
+Export-Package: org.argeo.slc.client.ui,
+ org.argeo.slc.client.ui.listeners,
  org.argeo.slc.client.ui.perspectives,
  org.argeo.slc.client.ui.views
 Import-Package: org.apache.commons.io;version="1.4.0",

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/ClientUiPlugin.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/ClientUiPlugin.java
new file mode 100644 (file)
index 0000000..8552b50
--- /dev/null
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/ClientUiPlugin.java
@@ -0,0 +1,88 @@
+package org.argeo.slc.client.ui;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class ClientUiPlugin extends AbstractUIPlugin {
+
+       // The plug-in ID
+       public static final String PLUGIN_ID = "org.argeo.slc.client.ui";
+
+       // The shared instance
+       private static ClientUiPlugin plugin;
+
+       private BundleContext bundleContext;
+
+       /**
+        * The constructor
+        */
+       public ClientUiPlugin() {
+       }
+
+       /*
+        * (non-Javadoc)
+        * 
+        * @see
+        * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
+        * )
+        */
+       public void start(BundleContext context) throws Exception {
+               super.start(context);
+               this.bundleContext = context;
+               plugin = this;
+       }
+
+       /*
+        * (non-Javadoc)
+        * 
+        * @see
+        * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
+        * )
+        */
+       public void stop(BundleContext context) throws Exception {
+               plugin = null;
+               super.stop(context);
+       }
+
+       /**
+        * Returns the shared instance
+        * 
+        * @return the shared instance
+        */
+       public static ClientUiPlugin getDefault() {
+               return plugin;
+       }
+
+       /**
+        * Returns an image descriptor for the image file at the given plug-in
+        * relative path
+        * 
+        * @param path
+        *            the path
+        * @return the image descriptor
+        */
+       public static ImageDescriptor getImageDescriptor(String path) {
+               return imageDescriptorFromPlugin(PLUGIN_ID, path);
+       }
+
+       @Override
+       protected void initializeImageRegistry(ImageRegistry reg) {
+               reg.put("agent", getImageDescriptor("icons/agent.gif"));
+               reg.put("executionModule", getImageDescriptor("icons/module.png"));
+               reg.put("folder", getImageDescriptor("icons/folder.gif"));
+               reg.put("flow", getImageDescriptor("icons/flow.png"));
+               reg.put("processes", getImageDescriptor("icons/processes.gif"));
+               reg.put("passedTest", getImageDescriptor("icons/passed.gif"));
+               reg.put("failedTest", getImageDescriptor("icons/error.gif"));
+       }
+
+       public BundleContext getBundleContext() {
+               return bundleContext;
+       }
+
+}

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/.classpath b/eclipse/runtime/org.argeo.slc.client.commons/.classpath
deleted file mode 100644 (file)
index 92f19d2..0000000
--- a/eclipse/runtime/org.argeo.slc.client.commons/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <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.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="output" path="target/classes"/>
-</classpath>

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/.project b/eclipse/runtime/org.argeo.slc.client.commons/.project
deleted file mode 100644 (file)
index 377e326..0000000
--- a/eclipse/runtime/org.argeo.slc.client.commons/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.slc.client.commons</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.PluginNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-       </natures>
-</projectDescription>

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/.settings/org.eclipse.jdt.core.prefs b/eclipse/runtime/org.argeo.slc.client.commons/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index c1d561a..0000000
--- a/eclipse/runtime/org.argeo.slc.client.commons/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Nov 08 17:00:09 CET 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/META-INF/MANIFEST.MF b/eclipse/runtime/org.argeo.slc.client.commons/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index 37f8461..0000000
--- a/eclipse/runtime/org.argeo.slc.client.commons/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Client commons
-Bundle-SymbolicName: org.argeo.slc.client.commons;singleton:=true
-Bundle-Version: 0.13.1.SNAPSHOT
-Require-Bundle: org.eclipse.ui;resolution:=optional,
- org.eclipse.core.runtime;resolution:=optional,
- org.eclipse.rap.ui;resolution:=optional,
- org.eclipse.rap.ui.workbench;resolution:=optional
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.argeo.slc.client.ui

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/build.properties b/eclipse/runtime/org.argeo.slc.client.commons/build.properties
deleted file mode 100644 (file)
index 5a20aff..0000000
--- a/eclipse/runtime/org.argeo.slc.client.commons/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/main/java
-output.. = target/classes
-bin.includes = META-INF/,\
-               .,\
-               icons/
-               
\ No newline at end of file

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/icons/archive.png b/eclipse/runtime/org.argeo.slc.client.commons/icons/archive.png
deleted file mode 100644 (file)
index fb36f36..0000000
Binary files a/eclipse/runtime/org.argeo.slc.client.commons/icons/archive.png and /dev/null differ

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/icons/computer.png b/eclipse/runtime/org.argeo.slc.client.commons/icons/computer.png
deleted file mode 100644 (file)
index ff64b84..0000000
Binary files a/eclipse/runtime/org.argeo.slc.client.commons/icons/computer.png and /dev/null differ

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/icons/error.gif b/eclipse/runtime/org.argeo.slc.client.commons/icons/error.gif
deleted file mode 100644 (file)
index 64b4384..0000000
Binary files a/eclipse/runtime/org.argeo.slc.client.commons/icons/error.gif and /dev/null differ

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/icons/folder.png b/eclipse/runtime/org.argeo.slc.client.commons/icons/folder.png
deleted file mode 100644 (file)
index 6937ed4..0000000
Binary files a/eclipse/runtime/org.argeo.slc.client.commons/icons/folder.png and /dev/null differ

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/icons/passed.gif b/eclipse/runtime/org.argeo.slc.client.commons/icons/passed.gif
deleted file mode 100644 (file)
index 23c97f0..0000000
Binary files a/eclipse/runtime/org.argeo.slc.client.commons/icons/passed.gif and /dev/null differ

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/icons/processes.gif b/eclipse/runtime/org.argeo.slc.client.commons/icons/processes.gif
deleted file mode 100644 (file)
index 364c0e7..0000000
Binary files a/eclipse/runtime/org.argeo.slc.client.commons/icons/processes.gif and /dev/null differ

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/icons/system.png b/eclipse/runtime/org.argeo.slc.client.commons/icons/system.png
deleted file mode 100644 (file)
index 71f44d0..0000000
Binary files a/eclipse/runtime/org.argeo.slc.client.commons/icons/system.png and /dev/null differ

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/pom.xml b/eclipse/runtime/org.argeo.slc.client.commons/pom.xml
deleted file mode 100644 (file)
index 11ba6e0..0000000
--- a/eclipse/runtime/org.argeo.slc.client.commons/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<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.slc.eclipse</groupId>
-               <artifactId>runtime</artifactId>
-               <version>0.13.1-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.slc.client.commons</artifactId>
-       <name>SLC Eclipse Commons</name>
-       <packaging>jar</packaging>
-       <dependencies>
-               <!-- SLC -->
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.core</artifactId>
-                       <version>${version.slc}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.server</artifactId>
-                       <version>${version.slc}</version>
-               </dependency>
-               <!-- Commons -->
-               <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
-                       <artifactId>org.argeo.eclipse.ui</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
-               <!-- Eclipse <dependency> <groupId>org.eclipse.ui</groupId> <artifactId>org.eclipse.ui</artifactId> 
-                       </dependency> -->
-               <!-- Eclipse and RCP only dependency, needed at compile time -->
-               <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
-                       <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
-                       <version>${version.argeo-commons}</version>
-                       <scope>provided</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.eclipse.core</groupId>
-                       <artifactId>org.eclipse.core.runtime</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
-               </dependency>
-       </dependencies>
-</project>

diff --git a/eclipse/runtime/org.argeo.slc.client.commons/src/main/java/org/argeo/slc/client/ui/ClientUiPlugin.java b/eclipse/runtime/org.argeo.slc.client.commons/src/main/java/org/argeo/slc/client/ui/ClientUiPlugin.java
deleted file mode 100644 (file)
index 8552b50..0000000
--- a/eclipse/runtime/org.argeo.slc.client.commons/src/main/java/org/argeo/slc/client/ui/ClientUiPlugin.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.argeo.slc.client.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class ClientUiPlugin extends AbstractUIPlugin {
-
-       // The plug-in ID
-       public static final String PLUGIN_ID = "org.argeo.slc.client.ui";
-
-       // The shared instance
-       private static ClientUiPlugin plugin;
-
-       private BundleContext bundleContext;
-
-       /**
-        * The constructor
-        */
-       public ClientUiPlugin() {
-       }
-
-       /*
-        * (non-Javadoc)
-        * 
-        * @see
-        * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
-        * )
-        */
-       public void start(BundleContext context) throws Exception {
-               super.start(context);
-               this.bundleContext = context;
-               plugin = this;
-       }
-
-       /*
-        * (non-Javadoc)
-        * 
-        * @see
-        * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
-        * )
-        */
-       public void stop(BundleContext context) throws Exception {
-               plugin = null;
-               super.stop(context);
-       }
-
-       /**
-        * Returns the shared instance
-        * 
-        * @return the shared instance
-        */
-       public static ClientUiPlugin getDefault() {
-               return plugin;
-       }
-
-       /**
-        * Returns an image descriptor for the image file at the given plug-in
-        * relative path
-        * 
-        * @param path
-        *            the path
-        * @return the image descriptor
-        */
-       public static ImageDescriptor getImageDescriptor(String path) {
-               return imageDescriptorFromPlugin(PLUGIN_ID, path);
-       }
-
-       @Override
-       protected void initializeImageRegistry(ImageRegistry reg) {
-               reg.put("agent", getImageDescriptor("icons/agent.gif"));
-               reg.put("executionModule", getImageDescriptor("icons/module.png"));
-               reg.put("folder", getImageDescriptor("icons/folder.gif"));
-               reg.put("flow", getImageDescriptor("icons/flow.png"));
-               reg.put("processes", getImageDescriptor("icons/processes.gif"));
-               reg.put("passedTest", getImageDescriptor("icons/passed.gif"));
-               reg.put("failedTest", getImageDescriptor("icons/error.gif"));
-       }
-
-       public BundleContext getBundleContext() {
-               return bundleContext;
-       }
-
-}

diff --git a/eclipse/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF b/eclipse/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF
index a79376c4858821328acbad7ac141eac782abf8cf..f23e5faf82458d339071b294386172d4409d1f3a 100644 (file)
--- a/eclipse/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF
+++ b/eclipse/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Import-Package: org.apache.commons.io;version="1.4.0",
  org.apache.commons.logging;version="1.1.1",
  org.argeo.eclipse.spring,
  org.argeo.eclipse.ui,
- org.argeo.slc.client.ui,
  org.argeo.slc.core.structure.tree,
  org.argeo.slc.core.test.tree,
  org.argeo.slc.dao.process,

diff --git a/eclipse/runtime/org.argeo.slc.client.core/pom.xml b/eclipse/runtime/org.argeo.slc.client.core/pom.xml
index f622bf1878423f540941f06883ffa3aeb608bb5d..54dc6251502fd9807e0ee7e8a24c7c9c723183d1 100644 (file)
--- a/eclipse/runtime/org.argeo.slc.client.core/pom.xml
+++ b/eclipse/runtime/org.argeo.slc.client.core/pom.xml
@@ -8,17 +8,9 @@
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.client.core</artifactId>
-       <name>SLC Eclipse core</name>
+       <name>SLC Eclipse Core</name>
        <packaging>jar</packaging>
-       <dependencies>
-
-               <!-- SLC Client UI -->
-               <dependency>
-                       <groupId>org.argeo.slc.eclipse</groupId>
-                       <artifactId>org.argeo.slc.client.commons</artifactId>
-                       <version>${version.slc}</version>
-               </dependency>
-               
+       <dependencies>          
                <!-- Commons For Eclipse -->
                <dependency>
                        <groupId>org.argeo.commons.eclipse</groupId>

diff --git a/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailLabelProvider.java b/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailLabelProvider.java
index 01e506b5162f713ca49609481edd5d84a9291860..a1db51ba57a5cb2c3049793d92754367e4516040 100644 (file)
--- a/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailLabelProvider.java
+++ b/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailLabelProvider.java
@@ -3,7 +3,6 @@ package org.argeo.slc.client.contentprovider;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.slc.client.contentprovider.ResultDetailContentProvider.ResultPartNode;
 import org.argeo.slc.client.contentprovider.ResultDetailContentProvider.StatusAware;
-import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
@@ -47,12 +46,13 @@ public class ResultDetailLabelProvider extends LabelProvider implements
 
        public Image getImage(Object element) {
                if (element instanceof StatusAware) {
-                       if (((StatusAware) element).isPassed())
-                               return ClientUiPlugin.getDefault().getImageRegistry()
-                                               .get("passedTest");
-                       else
-                               return ClientUiPlugin.getDefault().getImageRegistry()
-                                               .get("failedTest");
+                       // FIXME: fin icons somewhere
+//                     if (((StatusAware) element).isPassed())
+//                             return ClientUiPlugin.getDefault().getImageRegistry()
+//                                             .get("passedTest");
+//                     else
+//                             return ClientUiPlugin.getDefault().getImageRegistry()
+//                                             .get("failedTest");
                }
                return null;
        }

diff --git a/eclipse/runtime/pom.xml b/eclipse/runtime/pom.xml
index 915131f8852784889ebf727242f49360912c4b29..eed86db3b3facef0081bb4d5c54cb0d606ea5f61 100644 (file)
--- a/eclipse/runtime/pom.xml
+++ b/eclipse/runtime/pom.xml
@@ -11,7 +11,6 @@
        <name>SLC Eclipse Runtime</name>
        <packaging>pom</packaging>
        <modules>
-               <module>org.argeo.slc.client.commons</module>
                <module>org.argeo.slc.client.oxm</module>
                <module>org.argeo.slc.client.core</module>
        </modules>

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrAgent.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrAgent.java
new file mode 100644 (file)
index 0000000..b8e99cb
--- /dev/null
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/JcrAgent.java
@@ -0,0 +1,37 @@
+package org.argeo.slc.jcr;
+
+import java.util.List;
+
+import org.argeo.slc.execution.ExecutionModuleDescriptor;
+import org.argeo.slc.process.SlcExecution;
+import org.argeo.slc.runtime.SlcAgent;
+
+public class JcrAgent implements SlcAgent {
+
+       public String getAgentUuid() {
+               // TODO Auto-generated method stub
+               return null;
+       }
+
+       public ExecutionModuleDescriptor getExecutionModuleDescriptor(
+                       String moduleName, String version) {
+               // TODO Auto-generated method stub
+               return null;
+       }
+
+       public List<ExecutionModuleDescriptor> listExecutionModuleDescriptors() {
+               // TODO Auto-generated method stub
+               return null;
+       }
+
+       public void runSlcExecution(SlcExecution slcExecution) {
+               // TODO Auto-generated method stub
+
+       }
+
+       public boolean ping() {
+               // TODO Auto-generated method stub
+               return false;
+       }
+
+}

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java
new file mode 100644 (file)
index 0000000..81517c5
--- /dev/null
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/SlcTypes.java
@@ -0,0 +1,6 @@
+package org.argeo.slc.jcr;
+
+public interface SlcTypes {
+
+       public final static String SLC_AGENT = "slc:agent";
+}