From 977f272245dd7ec958747a20e21c4bfe0a00020d Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 26 Feb 2011 13:32:34 +0000 Subject: [PATCH] Rename RAP git-svn-id: https://svn.argeo.org/commons/trunk@4219 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org.argeo.jcr.ui.explorer/META-INF/MANIFEST.MF | 3 ++- .../.classpath | 0 .../.project | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/MANIFEST.MF | 11 +++++++++++ .../build.properties | 0 .../main/java/org/argeo/gis/ui/rap/GisRapPlugin.java | 0 gis/plugins/org.argeo.gis.ui/META-INF/MANIFEST.MF | 12 ++++++++++++ .../org/argeo/jackrabbit/JackrabbitContainer.java | 2 +- 9 files changed, 27 insertions(+), 3 deletions(-) rename gis/plugins/{org.argeo.gis.ui.rap => org.argeo.gis.ui.rap.openlayers}/.classpath (100%) rename gis/plugins/{org.argeo.gis.ui.rap => org.argeo.gis.ui.rap.openlayers}/.project (93%) rename gis/plugins/{org.argeo.gis.ui.rap => org.argeo.gis.ui.rap.openlayers}/.settings/org.eclipse.jdt.core.prefs (100%) create mode 100644 gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/MANIFEST.MF rename gis/plugins/{org.argeo.gis.ui.rap => org.argeo.gis.ui.rap.openlayers}/build.properties (100%) rename gis/plugins/{org.argeo.gis.ui.rap => org.argeo.gis.ui.rap.openlayers}/src/main/java/org/argeo/gis/ui/rap/GisRapPlugin.java (100%) create mode 100644 gis/plugins/org.argeo.gis.ui/META-INF/MANIFEST.MF 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/.classpath b/gis/plugins/org.argeo.gis.ui.rap.openlayers/.classpath similarity index 100% rename from gis/plugins/org.argeo.gis.ui.rap/.classpath rename to gis/plugins/org.argeo.gis.ui.rap.openlayers/.classpath diff --git a/gis/plugins/org.argeo.gis.ui.rap/.project b/gis/plugins/org.argeo.gis.ui.rap.openlayers/.project similarity index 93% rename from gis/plugins/org.argeo.gis.ui.rap/.project rename to gis/plugins/org.argeo.gis.ui.rap.openlayers/.project index c875f1b49..2c1bde033 100644 --- a/gis/plugins/org.argeo.gis.ui.rap/.project +++ b/gis/plugins/org.argeo.gis.ui.rap.openlayers/.project @@ -1,6 +1,6 @@ - org.argeo.gis.ui.rap + org.argeo.gis.ui.rap.openlayers diff --git a/gis/plugins/org.argeo.gis.ui.rap/.settings/org.eclipse.jdt.core.prefs b/gis/plugins/org.argeo.gis.ui.rap.openlayers/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from gis/plugins/org.argeo.gis.ui.rap/.settings/org.eclipse.jdt.core.prefs rename to gis/plugins/org.argeo.gis.ui.rap.openlayers/.settings/org.eclipse.jdt.core.prefs 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/build.properties b/gis/plugins/org.argeo.gis.ui.rap.openlayers/build.properties similarity index 100% rename from gis/plugins/org.argeo.gis.ui.rap/build.properties rename to gis/plugins/org.argeo.gis.ui.rap.openlayers/build.properties 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.openlayers/src/main/java/org/argeo/gis/ui/rap/GisRapPlugin.java similarity index 100% rename from gis/plugins/org.argeo.gis.ui.rap/src/main/java/org/argeo/gis/ui/rap/GisRapPlugin.java rename to gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/GisRapPlugin.java 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 " -- 2.30.2