From 465645defedd08dcdf1cc066c5bdc2e14dc9da9b Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Wed, 30 Nov 2016 16:01:29 +0000 Subject: [PATCH] Adapt RCP bundle to latest conventions git-svn-id: https://svn.argeo.org/slc/trunk@9341 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../plugins/org.argeo.slc.client.rcp/pom.xml | 78 ------------------ legacy/plugins/pom.xml | 43 ---------- .../.classpath | 2 +- .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../META-INF/spring/commands.xml | 0 .../META-INF/spring/osgi.xml | 0 org.argeo.slc.client.rcp/bnd.bnd | 12 +++ .../build.properties | 4 +- .../icons/argeo-icon-256.png | Bin .../icons/argeo-trayIcon-256.png | Bin .../plugin.xml | 0 .../plugin_customization.ini | 0 org.argeo.slc.client.rcp/pom.xml | 50 +++++++++++ .../splash.bmp | Bin .../argeo/slc/client/rcp/SlcRcpPlugin.java | 0 .../rcp/SlcSecureClientApplication.java | 0 .../client/rcp/SlcSecureWorkbenchAdvisor.java | 0 .../rcp/SlcSecureWorkbenchWindowAdvisor.java | 0 .../slc/client/ui/specific/OpenJcrFile.java | 0 .../client/ui/specific/OpenJcrFileCmdId.java | 0 pom.xml | 12 +++ 22 files changed, 77 insertions(+), 124 deletions(-) delete mode 100644 legacy/plugins/org.argeo.slc.client.rcp/pom.xml delete mode 100644 legacy/plugins/pom.xml rename {legacy/plugins/org.argeo.slc.client.rcp => org.argeo.slc.client.rcp}/.classpath (95%) rename {legacy/plugins/org.argeo.slc.client.rcp => org.argeo.slc.client.rcp}/.project (100%) rename {legacy/plugins/org.argeo.slc.client.rcp => org.argeo.slc.client.rcp}/.settings/org.eclipse.jdt.core.prefs (100%) rename {legacy/plugins/org.argeo.slc.client.rcp => org.argeo.slc.client.rcp}/META-INF/spring/commands.xml (100%) rename {legacy/plugins/org.argeo.slc.client.rcp => org.argeo.slc.client.rcp}/META-INF/spring/osgi.xml (100%) create mode 100644 org.argeo.slc.client.rcp/bnd.bnd rename {legacy/plugins/org.argeo.slc.client.rcp => org.argeo.slc.client.rcp}/build.properties (76%) rename {legacy/plugins/org.argeo.slc.client.rcp => org.argeo.slc.client.rcp}/icons/argeo-icon-256.png (100%) rename {legacy/plugins/org.argeo.slc.client.rcp => org.argeo.slc.client.rcp}/icons/argeo-trayIcon-256.png (100%) rename {legacy/plugins/org.argeo.slc.client.rcp => org.argeo.slc.client.rcp}/plugin.xml (100%) rename {legacy/plugins/org.argeo.slc.client.rcp => org.argeo.slc.client.rcp}/plugin_customization.ini (100%) create mode 100644 org.argeo.slc.client.rcp/pom.xml rename {legacy/plugins/org.argeo.slc.client.rcp => org.argeo.slc.client.rcp}/splash.bmp (100%) rename {legacy/plugins/org.argeo.slc.client.rcp/src/main/java => org.argeo.slc.client.rcp/src}/org/argeo/slc/client/rcp/SlcRcpPlugin.java (100%) rename {legacy/plugins/org.argeo.slc.client.rcp/src/main/java => org.argeo.slc.client.rcp/src}/org/argeo/slc/client/rcp/SlcSecureClientApplication.java (100%) rename {legacy/plugins/org.argeo.slc.client.rcp/src/main/java => org.argeo.slc.client.rcp/src}/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java (100%) rename {legacy/plugins/org.argeo.slc.client.rcp/src/main/java => org.argeo.slc.client.rcp/src}/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java (100%) rename {legacy/plugins/org.argeo.slc.client.rcp/src/main/java => org.argeo.slc.client.rcp/src}/org/argeo/slc/client/ui/specific/OpenJcrFile.java (100%) rename {legacy/plugins/org.argeo.slc.client.rcp/src/main/java => org.argeo.slc.client.rcp/src}/org/argeo/slc/client/ui/specific/OpenJcrFileCmdId.java (100%) diff --git a/legacy/plugins/org.argeo.slc.client.rcp/pom.xml b/legacy/plugins/org.argeo.slc.client.rcp/pom.xml deleted file mode 100644 index c16dd009d..000000000 --- a/legacy/plugins/org.argeo.slc.client.rcp/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - 4.0.0 - - org.argeo.slc - plugins - 2.1.1-SNAPSHOT - .. - - org.argeo.slc.client.rcp - SLC Client RCP - jar - - - - org.apache.felix - maven-bundle-plugin - - - org.argeo.slc.client.rcp.SlcRcpPlugin - - org.eclipse.ui, - org.eclipse.core.runtime - - - org.argeo.eclipse.spring, - org.argeo.slc.repo.core, - javax.jcr.nodetype, - *, - - - - - - - - - - org.argeo.slc - org.argeo.slc.repo - 2.1.1-SNAPSHOT - - - - - org.argeo.slc - org.argeo.slc.node.jackrabbit - 2.1.1-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.agent - 2.1.1-SNAPSHOT - - - - org.argeo.commons.security - org.argeo.security.dao.jackrabbit - ${version.argeo-commons} - - - org.argeo.commons.server - org.argeo.node.repo.jackrabbit - ${version.argeo-commons} - - - - - org.argeo.commons.base - org.argeo.eclipse.dep.rcp - ${version.argeo-commons} - - - org.argeo.commons.security - org.argeo.security.ui.rcp - ${version.argeo-commons} - - - diff --git a/legacy/plugins/pom.xml b/legacy/plugins/pom.xml deleted file mode 100644 index 4dc3fe380..000000000 --- a/legacy/plugins/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - 4.0.0 - - org.argeo.slc - argeo-slc - 2.1.1-SNAPSHOT - .. - - plugins - SLC Eclipse Plugins - pom - - org.argeo.slc.client.rcp - org.argeo.slc.client.rap - org.argeo.slc.client.ui - org.argeo.slc.client.ui.dist - - - - - org.apache.felix - maven-bundle-plugin - - - ${project.artifactId};singleton:=true - lazy - - - - - org.apache.maven.plugins - maven-source-plugin - - - - plugin.xml - META-INF/MANIFEST.MF - - - - - - diff --git a/legacy/plugins/org.argeo.slc.client.rcp/.classpath b/org.argeo.slc.client.rcp/.classpath similarity index 95% rename from legacy/plugins/org.argeo.slc.client.rcp/.classpath rename to org.argeo.slc.client.rcp/.classpath index 57ffbb6c8..6e7c599fe 100644 --- a/legacy/plugins/org.argeo.slc.client.rcp/.classpath +++ b/org.argeo.slc.client.rcp/.classpath @@ -1,7 +1,7 @@ - + diff --git a/legacy/plugins/org.argeo.slc.client.rcp/.project b/org.argeo.slc.client.rcp/.project similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/.project rename to org.argeo.slc.client.rcp/.project diff --git a/legacy/plugins/org.argeo.slc.client.rcp/.settings/org.eclipse.jdt.core.prefs b/org.argeo.slc.client.rcp/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/.settings/org.eclipse.jdt.core.prefs rename to org.argeo.slc.client.rcp/.settings/org.eclipse.jdt.core.prefs diff --git a/legacy/plugins/org.argeo.slc.client.rcp/META-INF/spring/commands.xml b/org.argeo.slc.client.rcp/META-INF/spring/commands.xml similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/META-INF/spring/commands.xml rename to org.argeo.slc.client.rcp/META-INF/spring/commands.xml diff --git a/legacy/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml b/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml rename to org.argeo.slc.client.rcp/META-INF/spring/osgi.xml diff --git a/org.argeo.slc.client.rcp/bnd.bnd b/org.argeo.slc.client.rcp/bnd.bnd new file mode 100644 index 000000000..b1d059bf2 --- /dev/null +++ b/org.argeo.slc.client.rcp/bnd.bnd @@ -0,0 +1,12 @@ +Bundle-SymbolicName: org.argeo.slc.client.rcp;singleton=true +Bundle-ActivationPolicy: lazy +Bundle-Activator: org.argeo.slc.client.rcp.SlcRcpPlugin +Require-Bundle: org.eclipse.ui,\ +org.eclipse.core.runtime + +Import-Package: javax.jcr.nodetype,\ +org.argeo.eclipse.spring,\ +org.argeo.slc.repo.core,\ +org.argeo.cms.util,\ +* + \ No newline at end of file diff --git a/legacy/plugins/org.argeo.slc.client.rcp/build.properties b/org.argeo.slc.client.rcp/build.properties similarity index 76% rename from legacy/plugins/org.argeo.slc.client.rcp/build.properties rename to org.argeo.slc.client.rcp/build.properties index a971175f5..8b65761d0 100644 --- a/legacy/plugins/org.argeo.slc.client.rcp/build.properties +++ b/org.argeo.slc.client.rcp/build.properties @@ -1,5 +1,5 @@ -source.. = src/main/java -output.. = target/classes +source.. = src/ +output.. = bin/ bin.includes = plugin.xml,\ META-INF/,\ .,\ diff --git a/legacy/plugins/org.argeo.slc.client.rcp/icons/argeo-icon-256.png b/org.argeo.slc.client.rcp/icons/argeo-icon-256.png similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/icons/argeo-icon-256.png rename to org.argeo.slc.client.rcp/icons/argeo-icon-256.png diff --git a/legacy/plugins/org.argeo.slc.client.rcp/icons/argeo-trayIcon-256.png b/org.argeo.slc.client.rcp/icons/argeo-trayIcon-256.png similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/icons/argeo-trayIcon-256.png rename to org.argeo.slc.client.rcp/icons/argeo-trayIcon-256.png diff --git a/legacy/plugins/org.argeo.slc.client.rcp/plugin.xml b/org.argeo.slc.client.rcp/plugin.xml similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/plugin.xml rename to org.argeo.slc.client.rcp/plugin.xml diff --git a/legacy/plugins/org.argeo.slc.client.rcp/plugin_customization.ini b/org.argeo.slc.client.rcp/plugin_customization.ini similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/plugin_customization.ini rename to org.argeo.slc.client.rcp/plugin_customization.ini diff --git a/org.argeo.slc.client.rcp/pom.xml b/org.argeo.slc.client.rcp/pom.xml new file mode 100644 index 000000000..da389c21f --- /dev/null +++ b/org.argeo.slc.client.rcp/pom.xml @@ -0,0 +1,50 @@ + + 4.0.0 + + org.argeo.slc + argeo-slc + 2.1.6-SNAPSHOT + .. + + org.argeo.slc.client.rcp + SLC Client RCP + jar + + + + + + + + + + + + + + + + + + + + + + + + + + + org.argeo.slc + org.argeo.slc.repo + 2.1.6-SNAPSHOT + + + + org.argeo.commons.rcp + org.argeo.cms.ui.workbench.rcp + ${version.argeo-rcp} + + + diff --git a/legacy/plugins/org.argeo.slc.client.rcp/splash.bmp b/org.argeo.slc.client.rcp/splash.bmp similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/splash.bmp rename to org.argeo.slc.client.rcp/splash.bmp diff --git a/legacy/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcRcpPlugin.java b/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcRcpPlugin.java similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcRcpPlugin.java rename to org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcRcpPlugin.java diff --git a/legacy/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcSecureClientApplication.java b/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureClientApplication.java similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcSecureClientApplication.java rename to org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureClientApplication.java diff --git a/legacy/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java b/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java rename to org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java diff --git a/legacy/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java b/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java rename to org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java diff --git a/legacy/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/ui/specific/OpenJcrFile.java b/org.argeo.slc.client.rcp/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/ui/specific/OpenJcrFile.java rename to org.argeo.slc.client.rcp/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java diff --git a/legacy/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/ui/specific/OpenJcrFileCmdId.java b/org.argeo.slc.client.rcp/src/org/argeo/slc/client/ui/specific/OpenJcrFileCmdId.java similarity index 100% rename from legacy/plugins/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/ui/specific/OpenJcrFileCmdId.java rename to org.argeo.slc.client.rcp/src/org/argeo/slc/client/ui/specific/OpenJcrFileCmdId.java diff --git a/pom.xml b/pom.xml index 43b715d2f..0d22a4c4a 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,7 @@ 2.1 2015-02-12 + 2.1.12-SNAPSHOT 2.1.6-SNAPSHOT @@ -33,6 +34,7 @@ org.argeo.slc.client.ui org.argeo.slc.client.ui.dist org.argeo.slc.client.rap + org.argeo.slc.client.rcp lib dep @@ -126,6 +128,16 @@ limitations under the License. warn + + argeo-rcp + http://forge.argeo.org/data/public/java/argeo-rcp-2.1 + + true + daily + warn + + + central -- 2.39.2