Rename RAP

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

diff --git a/eclipse/plugins/org.argeo.jcr.ui.explorer/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.jcr.ui.explorer/META-INF/MANIFEST.MF
index a8e05a89716708197ba5542c5f4c2a0e80b30caf..bd310b8c0b593a0232d78183cea137939b458cb5 100644 (file)
--- a/eclipse/plugins/org.argeo.jcr.ui.explorer/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.jcr.ui.explorer/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Bundle-Version: 0.2.3.SNAPSHOT
 Bundle-Activator: org.argeo.eclipse.ui.jcr.explorer.JcrExplorerPlugin
 Bundle-Vendor: Argeo
 Require-Bundle: org.eclipse.ui;resolution:=optional,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ org.eclipse.rap.ui;resolution:=optional
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.jcr;version="2.0.0",

diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/.classpath b/gis/plugins/org.argeo.gis.ui.rap.openlayers/.classpath
new file mode 100644 (file)
index 0000000..92f19d2
--- /dev/null
+++ b/gis/plugins/org.argeo.gis.ui.rap.openlayers/.classpath
@@ -0,0 +1,7 @@
+<?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/gis/plugins/org.argeo.gis.ui.rap.openlayers/.project b/gis/plugins/org.argeo.gis.ui.rap.openlayers/.project
new file mode 100644 (file)
index 0000000..2c1bde0
--- /dev/null
+++ b/gis/plugins/org.argeo.gis.ui.rap.openlayers/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.gis.ui.rap.openlayers</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/gis/plugins/org.argeo.gis.ui.rap.openlayers/.settings/org.eclipse.jdt.core.prefs b/gis/plugins/org.argeo.gis.ui.rap.openlayers/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..f6067d7
--- /dev/null
+++ b/gis/plugins/org.argeo.gis.ui.rap.openlayers/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Sat Feb 26 14:16:37 CET 2011
+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/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/MANIFEST.MF b/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..52ddac5
--- /dev/null
+++ b/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Rap
+Bundle-SymbolicName: org.argeo.gis.ui.rap.openlayers
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.argeo.gis.ui.rap.GisRapPlugin
+Bundle-Vendor: Argeo
+Require-Bundle: org.eclipse.rap.ui,
+ org.eclipse.core.runtime
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy

diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/build.properties b/gis/plugins/org.argeo.gis.ui.rap.openlayers/build.properties
new file mode 100644 (file)
index 0000000..5fc538b
--- /dev/null
+++ b/gis/plugins/org.argeo.gis.ui.rap.openlayers/build.properties
@@ -0,0 +1,4 @@
+source.. = src/main/java/
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .

diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/GisRapPlugin.java b/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/GisRapPlugin.java
new file mode 100644 (file)
index 0000000..857deae
--- /dev/null
+++ b/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/GisRapPlugin.java
@@ -0,0 +1,50 @@
+package org.argeo.gis.ui.rap;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class GisRapPlugin extends AbstractUIPlugin {
+
+       // The plug-in ID
+       public static final String PLUGIN_ID = "org.argeo.gis.ui.rap"; //$NON-NLS-1$
+
+       // The shared instance
+       private static GisRapPlugin plugin;
+       
+       /**
+        * The constructor
+        */
+       public GisRapPlugin() {
+       }
+
+       /*
+        * (non-Javadoc)
+        * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+        */
+       public void start(BundleContext context) throws Exception {
+               super.start(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 GisRapPlugin getDefault() {
+               return plugin;
+       }
+
+}

diff --git a/gis/plugins/org.argeo.gis.ui.rap/.classpath b/gis/plugins/org.argeo.gis.ui.rap/.classpath
deleted file mode 100644 (file)
index 92f19d2..0000000
--- a/gis/plugins/org.argeo.gis.ui.rap/.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/gis/plugins/org.argeo.gis.ui.rap/.project b/gis/plugins/org.argeo.gis.ui.rap/.project
deleted file mode 100644 (file)
index c875f1b..0000000
--- a/gis/plugins/org.argeo.gis.ui.rap/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.argeo.gis.ui.rap</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/gis/plugins/org.argeo.gis.ui.rap/.settings/org.eclipse.jdt.core.prefs b/gis/plugins/org.argeo.gis.ui.rap/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index f6067d7..0000000
--- a/gis/plugins/org.argeo.gis.ui.rap/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Sat Feb 26 14:16:37 CET 2011
-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/gis/plugins/org.argeo.gis.ui.rap/build.properties b/gis/plugins/org.argeo.gis.ui.rap/build.properties
deleted file mode 100644 (file)
index 5fc538b..0000000
--- a/gis/plugins/org.argeo.gis.ui.rap/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/main/java/
-output.. = target/classes/
-bin.includes = META-INF/,\
-               .

diff --git a/gis/plugins/org.argeo.gis.ui.rap/src/main/java/org/argeo/gis/ui/rap/GisRapPlugin.java b/gis/plugins/org.argeo.gis.ui.rap/src/main/java/org/argeo/gis/ui/rap/GisRapPlugin.java
deleted file mode 100644 (file)
index 857deae..0000000
--- a/gis/plugins/org.argeo.gis.ui.rap/src/main/java/org/argeo/gis/ui/rap/GisRapPlugin.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.argeo.gis.ui.rap;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class GisRapPlugin extends AbstractUIPlugin {
-
-       // The plug-in ID
-       public static final String PLUGIN_ID = "org.argeo.gis.ui.rap"; //$NON-NLS-1$
-
-       // The shared instance
-       private static GisRapPlugin plugin;
-       
-       /**
-        * The constructor
-        */
-       public GisRapPlugin() {
-       }
-
-       /*
-        * (non-Javadoc)
-        * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-        */
-       public void start(BundleContext context) throws Exception {
-               super.start(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 GisRapPlugin getDefault() {
-               return plugin;
-       }
-
-}

diff --git a/gis/plugins/org.argeo.gis.ui/META-INF/MANIFEST.MF b/gis/plugins/org.argeo.gis.ui/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..c184e8e
--- /dev/null
+++ b/gis/plugins/org.argeo.gis.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Ui
+Bundle-SymbolicName: org.argeo.gis.ui
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.argeo.gis.ui.GisUiPlugin
+Bundle-Vendor: Argeo
+Require-Bundle: org.eclipse.ui;resolution:=optional,
+ org.eclipse.rap.ui;resolution:=optional,
+ org.eclipse.core.runtime
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java
index b5170c191867ac2eddc58fdbf27b44eed2789349..2dcb1a9cf911f0569ebd79e0d51ca6e1e0f00fa1 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitContainer.java
@@ -156,7 +156,7 @@ public class JackrabbitContainer implements InitializingBean, DisposableBean,
                                                        + homeDirectory);
                        }
 
-               if (uri != null)
+               if (uri != null && !uri.trim().equals(""))
                        log.info("Destroyed Jackrabbit repository with uri " + uri);
                else
                        log.info("Destroyed Jackrabbit repository " + repository + " in "