From afb6d7b61d38bdb104414601d296070c893ece8c Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 30 Mar 2011 14:50:14 +0000 Subject: [PATCH] SImplify launch git-svn-id: https://svn.argeo.org/slc/trunk@4408 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- demo/slc-client-gis.product | 273 ---------------- demo/slc-client-rcp.product | 306 ++++++++++++++++-- .../META-INF/spring/osgi.xml | 35 ++ eclipse/plugins/pom.xml | 13 + .../org.argeo.slc.node.jackrabbit/.project | 22 ++ .../META-INF/MANIFEST.MF | 14 + .../META-INF/spring/jackrabbit-osgi.xml | 26 ++ .../META-INF/spring/jackrabbit.xml | 29 ++ .../build.properties | 1 + .../jackrabbit.properties | 7 + .../java/org/argeo/slc/equinox/cli/Main.java | 21 ++ 11 files changed, 451 insertions(+), 296 deletions(-) delete mode 100644 demo/slc-client-gis.product create mode 100644 modules/server/org.argeo.slc.node.jackrabbit/.project create mode 100644 modules/server/org.argeo.slc.node.jackrabbit/META-INF/MANIFEST.MF create mode 100644 modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml create mode 100644 modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml create mode 100644 modules/server/org.argeo.slc.node.jackrabbit/build.properties create mode 100644 modules/server/org.argeo.slc.node.jackrabbit/jackrabbit.properties create mode 100644 runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/cli/Main.java diff --git a/demo/slc-client-gis.product b/demo/slc-client-gis.product deleted file mode 100644 index 48ab780fe..000000000 --- a/demo/slc-client-gis.product +++ /dev/null @@ -1,273 +0,0 @@ - - - - - - - - - - -console - -Dlog4j.configuration=file:${system_property:user.home}/dev/src/slc/demo/log4j.properties -Dorg.argeo.security.ui.initialPerspective=org.argeo.slc.client.gis.gpsPerspective - -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/demo/slc-client-rcp.product b/demo/slc-client-rcp.product index 21cfe1f5d..37368db1c 100644 --- a/demo/slc-client-rcp.product +++ b/demo/slc-client-rcp.product @@ -25,157 +25,344 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -184,91 +371,164 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml index 4b7f32a5b..773358254 100644 --- a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml +++ b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml @@ -9,4 +9,39 @@ Implements All RCP basic classes that are not SLC dependent. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eclipse/plugins/pom.xml b/eclipse/plugins/pom.xml index f2a08dd4a..482b7d292 100644 --- a/eclipse/plugins/pom.xml +++ b/eclipse/plugins/pom.xml @@ -29,5 +29,18 @@ + + + org.apache.maven.plugins + maven-source-plugin + + + + plugin.xml + META-INF/MANIFEST.MF + + + + diff --git a/modules/server/org.argeo.slc.node.jackrabbit/.project b/modules/server/org.argeo.slc.node.jackrabbit/.project new file mode 100644 index 000000000..b072cd982 --- /dev/null +++ b/modules/server/org.argeo.slc.node.jackrabbit/.project @@ -0,0 +1,22 @@ + + + org.argeo.slc.node.jackrabbit + + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + + diff --git a/modules/server/org.argeo.slc.node.jackrabbit/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/MANIFEST.MF new file mode 100644 index 000000000..d1c6a7cc0 --- /dev/null +++ b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/MANIFEST.MF @@ -0,0 +1,14 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Node Wrapper +Bundle-SymbolicName: org.argeo.slc.node.jackrabbit +Bundle-Version: 0.13.1.SNAPSHOT +Bundle-Vendor: Argeo +Import-Package: javax.jcr;version="[2.0.0,3.0.0)", + org.argeo.jackrabbit, + org.argeo.jcr, + org.argeo.security, + org.argeo.security.jackrabbit, + org.argeo.slc.repo, + org.postgresql;version="[8.3.0,9.0.0)", + org.springframework.beans.factory.config;version="2.5.6.SEC01" diff --git a/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml new file mode 100644 index 000000000..c29e2dba7 --- /dev/null +++ b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml new file mode 100644 index 000000000..12f8265f0 --- /dev/null +++ b/modules/server/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml @@ -0,0 +1,29 @@ + + + + + + + osgibundle:jackrabbit.properties + + + + + + + + + + + + + classpath:/org/argeo/slc/repo/repo.cnd + + + + + + \ No newline at end of file diff --git a/modules/server/org.argeo.slc.node.jackrabbit/build.properties b/modules/server/org.argeo.slc.node.jackrabbit/build.properties new file mode 100644 index 000000000..5f22cdd44 --- /dev/null +++ b/modules/server/org.argeo.slc.node.jackrabbit/build.properties @@ -0,0 +1 @@ +bin.includes = META-INF/ diff --git a/modules/server/org.argeo.slc.node.jackrabbit/jackrabbit.properties b/modules/server/org.argeo.slc.node.jackrabbit/jackrabbit.properties new file mode 100644 index 000000000..e161f420a --- /dev/null +++ b/modules/server/org.argeo.slc.node.jackrabbit/jackrabbit.properties @@ -0,0 +1,7 @@ +argeo.node.repo.alias=node + +slc.jackrabbit.home=${user.home}/.slc/repo/jackrabbit +slc.jackrabbit.configuration=osgibundle:/repository.xml +slc.jackrabbit.dburl=jdbc:postgresql://air:5432/slc +slc.jackrabbit.dbuser=argeo +slc.jackrabbit.dbpassword=argeo \ No newline at end of file diff --git a/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/cli/Main.java b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/cli/Main.java new file mode 100644 index 000000000..e7f6aa3e9 --- /dev/null +++ b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/cli/Main.java @@ -0,0 +1,21 @@ +package org.argeo.slc.equinox.cli; + +import org.eclipse.core.runtime.adaptor.EclipseStarter; +import org.osgi.framework.BundleContext; + +@SuppressWarnings("restriction") +public class Main { + + public static void main(String[] args) { + try { + String confDir = ""; + String[] equinoxArgs = { "-console", "-conf", confDir }; + BundleContext systemBundleContext = EclipseStarter.startup( + equinoxArgs, null); + + } catch (Exception e) { + e.printStackTrace(); + } + + } +} -- 2.39.2