From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 26 Feb 2011 13:32:34 +0000 (+0000)
Subject: Rename RAP
X-Git-Tag: argeo-commons-2.1.30~1412
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=977f272245dd7ec958747a20e21c4bfe0a00020d;p=lgpl%2Fargeo-commons.git

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 a8e05a897..bd310b8c0 100644
--- 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
index 000000000..92f19d2ff
--- /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
index 000000000..2c1bde033
--- /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
index 000000000..f6067d79d
--- /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
index 000000000..52ddac525
--- /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
index 000000000..5fc538bc8
--- /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
index 000000000..857deaeee
--- /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
index 92f19d2ff..000000000
--- 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
index c875f1b49..000000000
--- 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
index f6067d79d..000000000
--- 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
index 5fc538bc8..000000000
--- 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
index 857deaeee..000000000
--- 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
index 000000000..c184e8e32
--- /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 b5170c191..2dcb1a9cf 100644
--- 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 "