From b36c62642bd0db11b3133b369cc026fd4b7a1ec6 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 15 Nov 2021 07:45:33 +0100 Subject: [PATCH] Remove unused. --- cms/org.argeo.slc.client.rcp/.classpath | 9 - cms/org.argeo.slc.client.rcp/.gitignore | 1 - cms/org.argeo.slc.client.rcp/.project | 28 -- .../.settings/org.eclipse.jdt.core.prefs | 8 - .../META-INF/.gitignore | 1 - .../META-INF/spring/commands.xml | 18 - .../META-INF/spring/osgi.xml | 18 - cms/org.argeo.slc.client.rcp/bnd.bnd | 13 - cms/org.argeo.slc.client.rcp/build.properties | 8 - .../icons/argeo-icon-256.png | Bin 10716 -> 0 bytes .../icons/argeo-trayIcon-256.png | Bin 10127 -> 0 bytes cms/org.argeo.slc.client.rcp/plugin.xml | 69 --- .../plugin_customization.ini | 5 - cms/org.argeo.slc.client.rcp/pom.xml | 64 --- cms/org.argeo.slc.client.rcp/splash.bmp | Bin 403614 -> 0 bytes .../argeo/slc/client/rcp/SlcRcpPlugin.java | 39 -- .../rcp/SlcSecureClientApplication.java | 26 -- .../client/rcp/SlcSecureWorkbenchAdvisor.java | 20 - .../rcp/SlcSecureWorkbenchWindowAdvisor.java | 146 ------- .../slc/client/ui/specific/OpenJcrFile.java | 135 ------ .../client/ui/specific/OpenJcrFileCmdId.java | 17 - cms/org.argeo.slc.e4/.classpath | 7 - cms/org.argeo.slc.e4/.gitignore | 2 - cms/org.argeo.slc.e4/.project | 28 -- cms/org.argeo.slc.e4/META-INF/.gitignore | 1 - cms/org.argeo.slc.e4/bnd.bnd | 9 - cms/org.argeo.slc.e4/build.properties | 4 - cms/org.argeo.slc.e4/pom.xml | 48 -- .../src/org/argeo/slc/e4/SlcImages.java | 52 --- .../slc/e4/parts/JcrExecutionModulesView.java | 411 ------------------ cms/org.argeo.slc.support.maven/.classpath | 36 -- .../.classpath.old | 38 -- cms/org.argeo.slc.support.maven/.gitignore | 2 - cms/org.argeo.slc.support.maven/.project | 21 - cms/org.argeo.slc.support.maven/MANIFEST.MF | 74 ---- .../META-INF/.gitignore | 1 - .../META-INF/spring/maven-osgi.xml | 21 - .../META-INF/spring/maven.xml | 16 - cms/org.argeo.slc.support.maven/bnd.bnd | 0 .../lib/.gitignore | 1 - cms/org.argeo.slc.support.maven/pom.xml | 277 ------------ .../src/org/argeo/slc/maven/CustomCli.java | 19 - .../argeo/slc/maven/DependencyFileLoader.java | 77 ---- .../argeo/slc/maven/ManualWagonProvider.java | 34 -- .../src/org/argeo/slc/maven/MavenCall.java | 119 ----- .../slc/maven/MavenDeployEnvironment.java | 74 ---- .../src/org/argeo/slc/maven/MavenFile.java | 72 --- .../src/org/argeo/slc/maven/MavenManager.java | 161 ------- .../src/org/argeo/slc/maven/MavenToUrl.java | 46 -- .../src/org/argeo/slc/maven/RemoteRepo.java | 23 - .../src/org/argeo/slc/maven/build.xml | 40 -- .../META-INF/spring/det.xml | 27 -- .../META-INF/spring/osgi.xml | 14 - demo/modules/org.argeo.slc.demo.det/pom.xml | 11 - .../META-INF/spring/detached.xml | 88 ---- .../META-INF/spring/imports.xml | 12 - .../META-INF/spring/launch.xml | 48 -- .../META-INF/spring/osgi.xml | 11 - .../org.argeo.slc.demo.detached/pom.xml | 11 - .../modules/org.argeo.slc.demo.maven/.project | 22 - .../.settings/org.eclipse.pde.core.prefs | 4 - .../META-INF/spring/imports.xml | 8 - .../META-INF/spring/maven.xml | 21 - .../META-INF/spring/osgi.xml | 10 - .../org.argeo.slc.demo.maven/build.properties | 1 - demo/modules/org.argeo.slc.demo.maven/pom.xml | 11 - demo/modules/pom.xml | 3 - lib/org.argeo.slc.lib.build/.gitignore | 1 - lib/org.argeo.slc.lib.build/.project | 22 - .../META-INF/.gitignore | 1 - .../META-INF/spring/lxc.xml | 23 - .../META-INF/spring/mvn.xml | 35 -- .../META-INF/spring/osgi.xml | 22 - .../META-INF/spring/standardBuilds.xml | 33 -- lib/org.argeo.slc.lib.build/bnd.bnd | 0 lib/org.argeo.slc.lib.build/pom.xml | 12 - lib/org.argeo.slc.lib.jcr/.gitignore | 1 - lib/org.argeo.slc.lib.jcr/.project | 22 - .../.settings/org.eclipse.pde.core.prefs | 3 - lib/org.argeo.slc.lib.jcr/META-INF/.gitignore | 1 - .../META-INF/spring/backup.xml | 32 -- .../META-INF/spring/osgi.xml | 16 - lib/org.argeo.slc.lib.jcr/bnd.bnd | 0 lib/org.argeo.slc.lib.jcr/build.properties | 1 - lib/org.argeo.slc.lib.jcr/pom.xml | 12 - lib/org.argeo.slc.lib.repo/.gitignore | 1 - lib/org.argeo.slc.lib.repo/.project | 22 - .../META-INF/.gitignore | 1 - .../META-INF/spring/helloworld.xml | 25 -- .../META-INF/spring/importZip.xml | 23 - .../META-INF/spring/osgi.xml | 18 - .../META-INF/spring/sync.xml | 35 -- lib/org.argeo.slc.lib.repo/bnd.bnd | 0 lib/org.argeo.slc.lib.repo/build.properties | 1 - lib/org.argeo.slc.lib.repo/pom.xml | 12 - lib/org.argeo.slc.lib.rpmfactory/.gitignore | 1 - lib/org.argeo.slc.lib.rpmfactory/.project | 22 - .../META-INF/.gitignore | 1 - .../META-INF/spring/helloworld.xml | 25 -- .../META-INF/spring/osgi.xml | 15 - lib/org.argeo.slc.lib.rpmfactory/bnd.bnd | 0 .../build.properties | 1 - lib/org.argeo.slc.lib.rpmfactory/pom.xml | 12 - lib/pom.xml | 20 - 104 files changed, 3113 deletions(-) delete mode 100644 cms/org.argeo.slc.client.rcp/.classpath delete mode 100644 cms/org.argeo.slc.client.rcp/.gitignore delete mode 100644 cms/org.argeo.slc.client.rcp/.project delete mode 100644 cms/org.argeo.slc.client.rcp/.settings/org.eclipse.jdt.core.prefs delete mode 100644 cms/org.argeo.slc.client.rcp/META-INF/.gitignore delete mode 100644 cms/org.argeo.slc.client.rcp/META-INF/spring/commands.xml delete mode 100644 cms/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml delete mode 100644 cms/org.argeo.slc.client.rcp/bnd.bnd delete mode 100644 cms/org.argeo.slc.client.rcp/build.properties delete mode 100644 cms/org.argeo.slc.client.rcp/icons/argeo-icon-256.png delete mode 100644 cms/org.argeo.slc.client.rcp/icons/argeo-trayIcon-256.png delete mode 100644 cms/org.argeo.slc.client.rcp/plugin.xml delete mode 100644 cms/org.argeo.slc.client.rcp/plugin_customization.ini delete mode 100644 cms/org.argeo.slc.client.rcp/pom.xml delete mode 100644 cms/org.argeo.slc.client.rcp/splash.bmp delete mode 100644 cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcRcpPlugin.java delete mode 100644 cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureClientApplication.java delete mode 100644 cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java delete mode 100644 cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java delete mode 100644 cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java delete mode 100644 cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/ui/specific/OpenJcrFileCmdId.java delete mode 100644 cms/org.argeo.slc.e4/.classpath delete mode 100644 cms/org.argeo.slc.e4/.gitignore delete mode 100644 cms/org.argeo.slc.e4/.project delete mode 100644 cms/org.argeo.slc.e4/META-INF/.gitignore delete mode 100644 cms/org.argeo.slc.e4/bnd.bnd delete mode 100644 cms/org.argeo.slc.e4/build.properties delete mode 100644 cms/org.argeo.slc.e4/pom.xml delete mode 100644 cms/org.argeo.slc.e4/src/org/argeo/slc/e4/SlcImages.java delete mode 100644 cms/org.argeo.slc.e4/src/org/argeo/slc/e4/parts/JcrExecutionModulesView.java delete mode 100644 cms/org.argeo.slc.support.maven/.classpath delete mode 100644 cms/org.argeo.slc.support.maven/.classpath.old delete mode 100644 cms/org.argeo.slc.support.maven/.gitignore delete mode 100644 cms/org.argeo.slc.support.maven/.project delete mode 100644 cms/org.argeo.slc.support.maven/MANIFEST.MF delete mode 100644 cms/org.argeo.slc.support.maven/META-INF/.gitignore delete mode 100644 cms/org.argeo.slc.support.maven/META-INF/spring/maven-osgi.xml delete mode 100644 cms/org.argeo.slc.support.maven/META-INF/spring/maven.xml delete mode 100644 cms/org.argeo.slc.support.maven/bnd.bnd delete mode 100644 cms/org.argeo.slc.support.maven/lib/.gitignore delete mode 100644 cms/org.argeo.slc.support.maven/pom.xml delete mode 100644 cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/CustomCli.java delete mode 100644 cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/DependencyFileLoader.java delete mode 100644 cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/ManualWagonProvider.java delete mode 100644 cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenCall.java delete mode 100644 cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenDeployEnvironment.java delete mode 100644 cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenFile.java delete mode 100644 cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenManager.java delete mode 100644 cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenToUrl.java delete mode 100644 cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/RemoteRepo.java delete mode 100644 cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/build.xml delete mode 100644 demo/modules/org.argeo.slc.demo.det/META-INF/spring/det.xml delete mode 100644 demo/modules/org.argeo.slc.demo.det/META-INF/spring/osgi.xml delete mode 100644 demo/modules/org.argeo.slc.demo.det/pom.xml delete mode 100644 demo/modules/org.argeo.slc.demo.detached/META-INF/spring/detached.xml delete mode 100644 demo/modules/org.argeo.slc.demo.detached/META-INF/spring/imports.xml delete mode 100644 demo/modules/org.argeo.slc.demo.detached/META-INF/spring/launch.xml delete mode 100644 demo/modules/org.argeo.slc.demo.detached/META-INF/spring/osgi.xml delete mode 100644 demo/modules/org.argeo.slc.demo.detached/pom.xml delete mode 100644 demo/modules/org.argeo.slc.demo.maven/.project delete mode 100644 demo/modules/org.argeo.slc.demo.maven/.settings/org.eclipse.pde.core.prefs delete mode 100644 demo/modules/org.argeo.slc.demo.maven/META-INF/spring/imports.xml delete mode 100644 demo/modules/org.argeo.slc.demo.maven/META-INF/spring/maven.xml delete mode 100644 demo/modules/org.argeo.slc.demo.maven/META-INF/spring/osgi.xml delete mode 100644 demo/modules/org.argeo.slc.demo.maven/build.properties delete mode 100644 demo/modules/org.argeo.slc.demo.maven/pom.xml delete mode 100644 lib/org.argeo.slc.lib.build/.gitignore delete mode 100644 lib/org.argeo.slc.lib.build/.project delete mode 100644 lib/org.argeo.slc.lib.build/META-INF/.gitignore delete mode 100644 lib/org.argeo.slc.lib.build/META-INF/spring/lxc.xml delete mode 100644 lib/org.argeo.slc.lib.build/META-INF/spring/mvn.xml delete mode 100644 lib/org.argeo.slc.lib.build/META-INF/spring/osgi.xml delete mode 100644 lib/org.argeo.slc.lib.build/META-INF/spring/standardBuilds.xml delete mode 100644 lib/org.argeo.slc.lib.build/bnd.bnd delete mode 100644 lib/org.argeo.slc.lib.build/pom.xml delete mode 100644 lib/org.argeo.slc.lib.jcr/.gitignore delete mode 100644 lib/org.argeo.slc.lib.jcr/.project delete mode 100644 lib/org.argeo.slc.lib.jcr/.settings/org.eclipse.pde.core.prefs delete mode 100644 lib/org.argeo.slc.lib.jcr/META-INF/.gitignore delete mode 100644 lib/org.argeo.slc.lib.jcr/META-INF/spring/backup.xml delete mode 100644 lib/org.argeo.slc.lib.jcr/META-INF/spring/osgi.xml delete mode 100644 lib/org.argeo.slc.lib.jcr/bnd.bnd delete mode 100644 lib/org.argeo.slc.lib.jcr/build.properties delete mode 100644 lib/org.argeo.slc.lib.jcr/pom.xml delete mode 100644 lib/org.argeo.slc.lib.repo/.gitignore delete mode 100644 lib/org.argeo.slc.lib.repo/.project delete mode 100644 lib/org.argeo.slc.lib.repo/META-INF/.gitignore delete mode 100644 lib/org.argeo.slc.lib.repo/META-INF/spring/helloworld.xml delete mode 100644 lib/org.argeo.slc.lib.repo/META-INF/spring/importZip.xml delete mode 100644 lib/org.argeo.slc.lib.repo/META-INF/spring/osgi.xml delete mode 100644 lib/org.argeo.slc.lib.repo/META-INF/spring/sync.xml delete mode 100644 lib/org.argeo.slc.lib.repo/bnd.bnd delete mode 100644 lib/org.argeo.slc.lib.repo/build.properties delete mode 100644 lib/org.argeo.slc.lib.repo/pom.xml delete mode 100644 lib/org.argeo.slc.lib.rpmfactory/.gitignore delete mode 100644 lib/org.argeo.slc.lib.rpmfactory/.project delete mode 100644 lib/org.argeo.slc.lib.rpmfactory/META-INF/.gitignore delete mode 100644 lib/org.argeo.slc.lib.rpmfactory/META-INF/spring/helloworld.xml delete mode 100644 lib/org.argeo.slc.lib.rpmfactory/META-INF/spring/osgi.xml delete mode 100644 lib/org.argeo.slc.lib.rpmfactory/bnd.bnd delete mode 100644 lib/org.argeo.slc.lib.rpmfactory/build.properties delete mode 100644 lib/org.argeo.slc.lib.rpmfactory/pom.xml diff --git a/cms/org.argeo.slc.client.rcp/.classpath b/cms/org.argeo.slc.client.rcp/.classpath deleted file mode 100644 index e2063a19c..000000000 --- a/cms/org.argeo.slc.client.rcp/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/cms/org.argeo.slc.client.rcp/.gitignore b/cms/org.argeo.slc.client.rcp/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/cms/org.argeo.slc.client.rcp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/cms/org.argeo.slc.client.rcp/.project b/cms/org.argeo.slc.client.rcp/.project deleted file mode 100644 index 75fcdba86..000000000 --- a/cms/org.argeo.slc.client.rcp/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.argeo.slc.client.rcp - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/cms/org.argeo.slc.client.rcp/.settings/org.eclipse.jdt.core.prefs b/cms/org.argeo.slc.client.rcp/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 5eb7b030a..000000000 --- a/cms/org.argeo.slc.client.rcp/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Wed Aug 04 16:32:22 CEST 2010 -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/cms/org.argeo.slc.client.rcp/META-INF/.gitignore b/cms/org.argeo.slc.client.rcp/META-INF/.gitignore deleted file mode 100644 index 4854a41b9..000000000 --- a/cms/org.argeo.slc.client.rcp/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/cms/org.argeo.slc.client.rcp/META-INF/spring/commands.xml b/cms/org.argeo.slc.client.rcp/META-INF/spring/commands.xml deleted file mode 100644 index 7bd302c86..000000000 --- a/cms/org.argeo.slc.client.rcp/META-INF/spring/commands.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cms/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml b/cms/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml deleted file mode 100644 index b7dcfafca..000000000 --- a/cms/org.argeo.slc.client.rcp/META-INF/spring/osgi.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - SLC UI RCP - - - - - - diff --git a/cms/org.argeo.slc.client.rcp/bnd.bnd b/cms/org.argeo.slc.client.rcp/bnd.bnd deleted file mode 100644 index f02227257..000000000 --- a/cms/org.argeo.slc.client.rcp/bnd.bnd +++ /dev/null @@ -1,13 +0,0 @@ -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,\ -org.osgi.*;version=0.0.0,\ -* - \ No newline at end of file diff --git a/cms/org.argeo.slc.client.rcp/build.properties b/cms/org.argeo.slc.client.rcp/build.properties deleted file mode 100644 index 8b65761d0..000000000 --- a/cms/org.argeo.slc.client.rcp/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = plugin.xml,\ - META-INF/,\ - .,\ - icons/,\ - splash.bmp,\ - plugin_customization.ini diff --git a/cms/org.argeo.slc.client.rcp/icons/argeo-icon-256.png b/cms/org.argeo.slc.client.rcp/icons/argeo-icon-256.png deleted file mode 100644 index a9af08836dc8d229623613658ddbe78a7f5b8230..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10716 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 BfZPB8 diff --git a/cms/org.argeo.slc.client.rcp/plugin.xml b/cms/org.argeo.slc.client.rcp/plugin.xml deleted file mode 100644 index 73bfa838e..000000000 --- a/cms/org.argeo.slc.client.rcp/plugin.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cms/org.argeo.slc.client.rcp/plugin_customization.ini b/cms/org.argeo.slc.client.rcp/plugin_customization.ini deleted file mode 100644 index ed3f69f32..000000000 --- a/cms/org.argeo.slc.client.rcp/plugin_customization.ini +++ /dev/null @@ -1,5 +0,0 @@ -org.eclipse.ui/DOCK_PERSPECTIVE_BAR=topRight -org.eclipse.ui/SHOW_TEXT_ON_PERSPECTIVE_BAR=false -org.eclipse.ui/PERSPECTIVE_BAR_SIZE=100 -org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=true -org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = false diff --git a/cms/org.argeo.slc.client.rcp/pom.xml b/cms/org.argeo.slc.client.rcp/pom.xml deleted file mode 100644 index 1098fcaf9..000000000 --- a/cms/org.argeo.slc.client.rcp/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - 4.0.0 - - org.argeo.commons.rcp - argeo-rcp - 2.1.16-SNAPSHOT - .. - - - - - - - - org.argeo.slc - org.argeo.slc.client.rcp - SLC Client RCP - jar - - - - - - - - - - - - - - - - - - - - - - - - - - - org.argeo.slc - org.argeo.slc.repo - 2.1.8-SNAPSHOT - - - - org.argeo.commons.rcp - org.argeo.cms.ui.workbench.rcp - ${version.argeo-rcp} - - - - - org.argeo.commons.rcp - org.argeo.dep.cms.rcp - - - - diff --git a/cms/org.argeo.slc.client.rcp/splash.bmp b/cms/org.argeo.slc.client.rcp/splash.bmp deleted file mode 100644 index ee502f3094cee88bb2264f444ce54d6aa4c5b030..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 403614 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 KAfpg~SN}hRcX|Z? diff --git a/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcRcpPlugin.java b/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcRcpPlugin.java deleted file mode 100644 index d61b315ca..000000000 --- a/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcRcpPlugin.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.argeo.slc.client.rcp; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.resource.ImageRegistry; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class SlcRcpPlugin extends AbstractUIPlugin { - public static final String PLUGIN_ID = "org.argeo.slc.client.rcp"; - private static SlcRcpPlugin plugin; - - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - public static SlcRcpPlugin getDefault() { - return plugin; - } - - @Override - protected void initializeImageRegistry(ImageRegistry reg) { - // TODO make it configurable - reg.put("argeoTrayIcon", - getImageDescriptor("icons/argeo-trayIcon-256.png")); - } - - public static ImageDescriptor getImageDescriptor(String path) { - return imageDescriptorFromPlugin(PLUGIN_ID, path); - } -} diff --git a/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureClientApplication.java b/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureClientApplication.java deleted file mode 100644 index ddd310e58..000000000 --- a/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureClientApplication.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.argeo.slc.client.rcp; - -import org.argeo.cms.ui.workbench.rcp.SecureRcp; -import org.eclipse.jface.window.Window; -import org.eclipse.jface.window.Window.IExceptionHandler; -import org.eclipse.ui.application.WorkbenchAdvisor; - -/** - * This class controls all aspects of the application's execution - */ -public class SlcSecureClientApplication extends SecureRcp { - - @Override - protected WorkbenchAdvisor createWorkbenchAdvisor(String username) { - Window.setExceptionHandler(new IExceptionHandler() { - - public void handleException(Throwable t) { - System.err.println("Unexpected SLC UI exception: " + t); - - } - }); - - return new SlcSecureWorkbenchAdvisor(username); - } - -} diff --git a/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java b/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java deleted file mode 100644 index 04d142764..000000000 --- a/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchAdvisor.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.argeo.slc.client.rcp; - -import org.argeo.cms.ui.workbench.rcp.SecureWorkbenchAdvisor; -import org.eclipse.ui.application.IWorkbenchWindowConfigurer; -import org.eclipse.ui.application.WorkbenchWindowAdvisor; - -/** - * Custom {@link SecureWorkbenchAdvisor} in order to create a - * {@link SlcSecureWorkbenchWindowAdvisor}. - */ -public class SlcSecureWorkbenchAdvisor extends SecureWorkbenchAdvisor { - public SlcSecureWorkbenchAdvisor(String username) { - super(username); - } - - public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor( - IWorkbenchWindowConfigurer configurer) { - return new SlcSecureWorkbenchWindowAdvisor(configurer, getUsername()); - } -} diff --git a/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java b/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java deleted file mode 100644 index 44e8a8a71..000000000 --- a/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/SlcSecureWorkbenchWindowAdvisor.java +++ /dev/null @@ -1,146 +0,0 @@ -package org.argeo.slc.client.rcp; - -import org.argeo.cms.ui.workbench.rcp.SecureWorkbenchWindowAdvisor; -import org.eclipse.swt.SWT; -import org.eclipse.swt.dnd.DropTargetAdapter; -import org.eclipse.swt.dnd.DropTargetEvent; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.swt.widgets.MenuItem; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Tray; -import org.eclipse.swt.widgets.TrayItem; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.application.IWorkbenchWindowConfigurer; -import org.eclipse.ui.part.EditorInputTransfer; - -/** - * Custom {@link SecureWorkbenchWindowAdvisor} which can add a tray. TODO: to - * be factorized in Argeo Commons and made more generic. - */ -public class SlcSecureWorkbenchWindowAdvisor extends - SecureWorkbenchWindowAdvisor { - public final static String IN_TRAY_PROPERTY = "org.argeo.slc.ui.inTray"; - - private TrayItem trayItem; - - public SlcSecureWorkbenchWindowAdvisor( - IWorkbenchWindowConfigurer configurer, String username) { - super(configurer, username); - } - - public void postWindowOpen() { - String inTray = System.getProperty(IN_TRAY_PROPERTY); - if (inTray != null && inTray.equals("true")) { - initTray(); - } - } - - @Override - public void preWindowOpen() { - getWindowConfigurer().addEditorAreaTransfer( - EditorInputTransfer.getInstance()); - getWindowConfigurer().configureEditorAreaDropListener( - new DropTargetAdapter() { - - @Override - public void dragEnter(DropTargetEvent event) { - System.out.println("DROP enter!!! " + event); - } - - @Override - public void dragLeave(DropTargetEvent event) { - System.out.println("DROP leave!!! " + event); - } - - public void drop(DropTargetEvent event) { - System.out.println("DROP drop!!! " + event); - - } - - @Override - public void dropAccept(DropTargetEvent event) { - System.out.println("DROP accept!!! " + event); - super.dropAccept(event); - } - - }); - super.preWindowOpen(); - } - - @Override - public boolean preWindowShellClose() { - // hide but do not dispose if tray is supported - if (trayItem != null) { - getWindowConfigurer().getWindow().getShell().setVisible(false); - return false; - } else - return true; - } - - /** Init tray support */ - protected void initTray() { - IWorkbenchWindow window = getWindowConfigurer().getWindow(); - Shell shell = window.getShell(); - final Tray tray = shell.getDisplay().getSystemTray(); - trayItem = new TrayItem(tray, SWT.NONE); - if (trayItem == null) - return; - - // image - Image trayImage = SlcRcpPlugin.getDefault().getImageRegistry() - .get("argeoTrayIcon"); - trayItem.setImage(trayImage); - trayItem.setToolTipText("Argeo SLC"); - - // add pop-menu - // TODO: contribute more commands - trayItem.addListener(SWT.MenuDetect, new Listener() { - public void handleEvent(Event event) { - IWorkbenchWindow window = getWindowConfigurer().getWindow(); - Menu menu = new Menu(window.getShell(), SWT.POP_UP); - MenuItem exit = new MenuItem(menu, SWT.NONE); - exit.setText("Exit"); - exit.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - getWindowConfigurer().getWorkbenchConfigurer() - .getWorkbench().close(); - } - }); - menu.setVisible(true); - } - }); - - // add behavior when clicked upon - trayItem.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event event) { - Shell shell = getWindowConfigurer().getWindow().getShell(); - if (shell.isVisible()) { - if (shell.getMinimized()) - shell.setMinimized(false); - else { - shell.setVisible(false); - shell.setMinimized(true); - } - } else { - shell.setVisible(true); - shell.setActive(); - shell.setFocus(); - shell.setMinimized(false); - } - } - }); - - // start hidden - // shell.setVisible(false); - } - - @Override - public void dispose() { - if (trayItem != null) - trayItem.dispose(); - } - -} diff --git a/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java b/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java deleted file mode 100644 index 495fed522..000000000 --- a/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/ui/specific/OpenJcrFile.java +++ /dev/null @@ -1,135 +0,0 @@ -package org.argeo.slc.client.ui.specific; - -import java.awt.Desktop; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import javax.jcr.Node; -import javax.jcr.Property; -import javax.jcr.RepositoryException; -import javax.jcr.Session; -import javax.jcr.nodetype.NodeType; - -import org.apache.commons.io.IOUtils; -import org.argeo.jcr.JcrUtils; -import org.argeo.slc.SlcException; -import org.argeo.slc.repo.RepoService; -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; - -/** - * RCP specific command handler to open a file retrieved from a local or distant - * JCR Repository. - */ -public class OpenJcrFile extends AbstractHandler { - // private final static Log log = LogFactory.getLog(OpenJcrFile.class); - - // Here is the trick that enable single sourcing: the ID is determined at - // runtime so use (new OpenJcrFileCmdId()).getCmdId() instead of the usual - // public final String ID = SlcRcpPlugin.PLUGIN_ID + ".openJcrFile"; - - public final static String PARAM_REPO_NODE_PATH = "param.repoNodePath"; - public final static String PARAM_REPO_URI = "param.repoUri"; - public final static String PARAM_WORKSPACE_NAME = "param.workspaceName"; - public final static String PARAM_FILE_PATH = "param.filePath"; - - /* DEPENDENCY INJECTION */ - private RepoService repoService; - - public Object execute(ExecutionEvent event) throws ExecutionException { - - String repoNodePath = event.getParameter(PARAM_REPO_NODE_PATH); - String repoUri = event.getParameter(PARAM_REPO_URI); - String wkspName = event.getParameter(PARAM_WORKSPACE_NAME); - String filePath = event.getParameter(PARAM_FILE_PATH); - - // TODO sanity check - if (filePath == null || "".equals(filePath.trim())) - return null; - retrieveAndOpen(repoNodePath, repoUri, wkspName, filePath); - - return null; - } - - protected void retrieveAndOpen(String repoNodePath, String repoUri, - String wkspName, String filePath) { - Session businessSession = null; - try { - businessSession = repoService.getRemoteSession(repoNodePath, - repoUri, wkspName); - Node result = businessSession.getNode(filePath); - - boolean isValid = true; - Node child = null; - if (!result.isNodeType(NodeType.NT_FILE)) - isValid = false; - else { - child = result.getNode(Property.JCR_CONTENT); - if (!(child.isNodeType(NodeType.NT_RESOURCE) || child - .hasProperty(Property.JCR_DATA))) - isValid = false; - } - - if (!isValid) - return; - - InputStream fis = null; - String prefix = "", extension = ""; - String fileName = JcrUtils.lastPathElement(filePath); - int ind = fileName.lastIndexOf('.'); - if (ind > 0) { - prefix = fileName.substring(0, ind); - extension = fileName.substring(ind); - } - try { - - fis = (InputStream) child.getProperty(Property.JCR_DATA) - .getBinary().getStream(); - File file = createTmpFile(prefix, extension, fis); - Desktop desktop = null; - if (Desktop.isDesktopSupported()) { - desktop = Desktop.getDesktop(); - } - desktop.open(file); - } catch (Exception e) { - throw new SlcException( - "Stream error while opening file " + filePath - + " from repo " + repoUri == null ? repoNodePath - : repoUri, e); - } finally { - IOUtils.closeQuietly(fis); - } - } catch (RepositoryException e) { - throw new SlcException("Unexpected error while " - + "getting repoNode info for repoNode at path " - + repoNodePath, e); - } finally { - JcrUtils.logoutQuietly(businessSession); - } - } - - private File createTmpFile(String prefix, String suffix, InputStream is) { - File tmpFile = null; - OutputStream os = null; - try { - tmpFile = File.createTempFile(prefix, suffix); - os = new FileOutputStream(tmpFile); - IOUtils.copy(is, os); - } catch (IOException e) { - throw new SlcException("Cannot open file " + prefix + "." + suffix, - e); - } finally { - IOUtils.closeQuietly(os); - } - return tmpFile; - } - - /* DEPENDENCY INJECTION */ - public void setRepoService(RepoService repoService) { - this.repoService = repoService; - } -} \ No newline at end of file diff --git a/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/ui/specific/OpenJcrFileCmdId.java b/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/ui/specific/OpenJcrFileCmdId.java deleted file mode 100644 index fb0ad74f9..000000000 --- a/cms/org.argeo.slc.client.rcp/src/org/argeo/slc/client/ui/specific/OpenJcrFileCmdId.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.argeo.slc.client.ui.specific; - -import org.argeo.slc.client.rcp.SlcRcpPlugin; - -/** - * Workaround a single sourcing problem: - * - * final static variable are imported at compilation time (we build against RCP) - * and we still must have a different ID (the prefix must be the PLUGIN ID) for - * RAP and RCP in order to be able to inject beans in the corresponding commands - */ -public class OpenJcrFileCmdId { - - public String getCmdId() { - return SlcRcpPlugin.PLUGIN_ID + ".openJcrFile"; - } -} diff --git a/cms/org.argeo.slc.e4/.classpath b/cms/org.argeo.slc.e4/.classpath deleted file mode 100644 index eca7bdba8..000000000 --- a/cms/org.argeo.slc.e4/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/cms/org.argeo.slc.e4/.gitignore b/cms/org.argeo.slc.e4/.gitignore deleted file mode 100644 index e0e1cc490..000000000 --- a/cms/org.argeo.slc.e4/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/bin/ -/target diff --git a/cms/org.argeo.slc.e4/.project b/cms/org.argeo.slc.e4/.project deleted file mode 100644 index f3db2ea9a..000000000 --- a/cms/org.argeo.slc.e4/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.argeo.slc.e4 - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/cms/org.argeo.slc.e4/META-INF/.gitignore b/cms/org.argeo.slc.e4/META-INF/.gitignore deleted file mode 100644 index 4854a41b9..000000000 --- a/cms/org.argeo.slc.e4/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/cms/org.argeo.slc.e4/bnd.bnd b/cms/org.argeo.slc.e4/bnd.bnd deleted file mode 100644 index d7e5df417..000000000 --- a/cms/org.argeo.slc.e4/bnd.bnd +++ /dev/null @@ -1,9 +0,0 @@ -Import-Package: org.eclipse.swt,\ -org.eclipse.e4.ui.model.application.ui,\ -org.eclipse.e4.ui.model.application,\ -org.eclipse.swt.events,\ -javax.jcr.nodetype,\ -org.argeo.slc.jcr,\ -org.eclipse.core.commands.common,\ -org.eclipse.jface.window,\ -* diff --git a/cms/org.argeo.slc.e4/build.properties b/cms/org.argeo.slc.e4/build.properties deleted file mode 100644 index 34d2e4d2d..000000000 --- a/cms/org.argeo.slc.e4/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/cms/org.argeo.slc.e4/pom.xml b/cms/org.argeo.slc.e4/pom.xml deleted file mode 100644 index 67418748b..000000000 --- a/cms/org.argeo.slc.e4/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - 4.0.0 - - org.argeo.slc - argeo-slc-cms - 2.1.18-SNAPSHOT - .. - - org.argeo.slc.e4 - SLC E4 - jar - - - - org.argeo.slc - org.argeo.slc.jcr - 2.1.18-SNAPSHOT - - - - - org.argeo.commons - org.argeo.eclipse.ui - ${version.argeo-commons} - - - org.argeo.commons - org.argeo.eclipse.ui.rap - ${version.argeo-commons} - provided - - - org.argeo.commons - org.argeo.cms.e4 - ${version.argeo-commons} - - - - - org.argeo.tp - argeo-tp-rap-e4 - ${version.argeo-tp} - pom - provided - - - - diff --git a/cms/org.argeo.slc.e4/src/org/argeo/slc/e4/SlcImages.java b/cms/org.argeo.slc.e4/src/org/argeo/slc/e4/SlcImages.java deleted file mode 100644 index a201bb1ab..000000000 --- a/cms/org.argeo.slc.e4/src/org/argeo/slc/e4/SlcImages.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.argeo.slc.e4; - - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.graphics.Image; - -/** Shared images. */ -public class SlcImages { - public final static Image AGENT = img("icons/agent.gif"); - public final static Image AGENT_FACTORY = img("icons/agentFactory.gif"); - public final static Image MODULE = img("icons/module.png"); - public final static Image MODULE_STOPPED = img("icons/module_stopped.gif"); - public final static Image FOLDER = img("icons/folder.gif"); - public final static Image MY_RESULTS_FOLDER = img("icons/myResult.png"); - public final static Image RENAME = img("icons/rename.png"); - public final static Image FLOW = img("icons/flow.png"); - public final static Image PROCESSES = img("icons/processes.gif"); - public final static Image PASSED = img("icons/passed.gif"); - public final static Image ERROR = img("icons/error.gif"); - public final static Image LAUNCH = img("icons/launch.gif"); - public final static Image RELAUNCH = img("icons/relaunch.gif"); - public final static Image KILL = img("icons/kill.png"); - public final static Image REMOVE_ONE = img("icons/remove_one.gif"); - public final static Image REMOVE_ALL = img("icons/removeAll.png"); - public final static Image EXECUTION_SPECS = img("icons/executionSpecs.gif"); - public final static Image EXECUTION_SPEC = img("icons/executionSpec.gif"); - public final static Image EXECUTION_SPEC_ATTRIBUTE = img("icons/executionSpecAttribute.gif"); - public final static Image CHOICES = img("icons/choices.gif"); - public final static Image PROCESS_ERROR = img("icons/process_error.png"); - public final static Image PROCESS_SCHEDULED = img("icons/process_scheduled.gif"); - public final static Image PROCESS_RUNNING = img("icons/process_running.png"); - public final static Image PROCESS_COMPLETED = img("icons/process_completed.png"); - - // Decorators - public final static ImageDescriptor EXECUTION_ERROR = getImageDescriptor("icons/executionError.gif"); - public final static ImageDescriptor EXECUTION_PASSED = getImageDescriptor("icons/executionPassed.gif"); - - /** Creates the image */ - public static Image img(String path) { - return getImageDescriptor(path).createImage(); - } - - public static ImageDescriptor getImageDescriptor(String path) { - return imageDescriptorFromPlugin("", path); - } - - public static ImageDescriptor imageDescriptorFromPlugin(String pluginId, - String imageFilePath) { - return null; - } - -} diff --git a/cms/org.argeo.slc.e4/src/org/argeo/slc/e4/parts/JcrExecutionModulesView.java b/cms/org.argeo.slc.e4/src/org/argeo/slc/e4/parts/JcrExecutionModulesView.java deleted file mode 100644 index fa4b8f663..000000000 --- a/cms/org.argeo.slc.e4/src/org/argeo/slc/e4/parts/JcrExecutionModulesView.java +++ /dev/null @@ -1,411 +0,0 @@ -package org.argeo.slc.e4.parts; - -import java.util.Arrays; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.SortedSet; -import java.util.TreeSet; - -import javax.jcr.Node; -import javax.jcr.NodeIterator; -import javax.jcr.Property; -import javax.jcr.Repository; -import javax.jcr.RepositoryException; -import javax.jcr.Session; -import javax.jcr.nodetype.NodeType; -import javax.jcr.observation.Event; -import javax.jcr.query.Query; -import javax.jcr.query.QueryManager; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.eclipse.ui.jcr.AsyncUiEventListener; -import org.argeo.eclipse.ui.jcr.DefaultNodeLabelProvider; -import org.argeo.eclipse.ui.jcr.NodeElementComparer; -import org.argeo.eclipse.ui.jcr.SimpleNodeContentProvider; -import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils; -import org.argeo.jcr.JcrUtils; -import org.argeo.slc.SlcException; -import org.argeo.slc.SlcNames; -import org.argeo.slc.SlcTypes; -import org.argeo.slc.e4.SlcImages; -import org.argeo.slc.execution.ExecutionModulesManager; -import org.argeo.slc.jcr.SlcJcrConstants; -import org.eclipse.jface.viewers.DoubleClickEvent; -import org.eclipse.jface.viewers.IDoubleClickListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.dnd.DND; -import org.eclipse.swt.dnd.DragSourceAdapter; -import org.eclipse.swt.dnd.DragSourceEvent; -import org.eclipse.swt.dnd.TextTransfer; -import org.eclipse.swt.dnd.Transfer; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; - -/** JCR based view of the execution modules. */ -public class JcrExecutionModulesView implements SlcTypes, SlcNames { - private final static Log log = LogFactory.getLog(JcrExecutionModulesView.class); - -// public static final String ID = ClientUiPlugin.ID + ".jcrExecutionModulesView"; - - private TreeViewer viewer; - -// private ServerPushSession pushSession; - - /* DEPENDENCY INJECTION */ - private Repository repository; - private Session session; - private ExecutionModulesManager modulesManager; - - public void createPartControl(Composite parent) { -// pushSession = new ServerPushSession(); -// pushSession.start(); - - try { - session = repository.login(); - } catch (RepositoryException e1) { - throw new SlcException("Cannot log in to repository"); - } - - viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); - EclipseUiSpecificUtils.enableToolTipSupport(viewer); - ViewContentProvider contentProvider = new ViewContentProvider(session); - viewer.setContentProvider(contentProvider); - viewer.setComparer(new NodeElementComparer()); - final ViewLabelProvider viewLabelProvider = new ViewLabelProvider(); - viewer.setLabelProvider(viewLabelProvider); - viewer.setInput(modulesManager); -// viewer.setInput(getViewSite()); - viewer.addDoubleClickListener(new ViewDoubleClickListener()); - // context menu - // addContextMenu(viewer); - -// getViewSite().setSelectionProvider(viewer); - - Transfer[] tt = new Transfer[] { TextTransfer.getInstance() }; - // Transfer[] tt = new Transfer[] { EditorInputTransfer.getInstance() }; - int operations = DND.DROP_COPY | DND.DROP_MOVE; - viewer.addDragSupport(operations, tt, new ViewDragListener()); - - try { - String[] nodeTypes = { SlcTypes.SLC_AGENT, SlcTypes.SLC_AGENT_FACTORY, SlcTypes.SLC_EXECUTION_MODULE }; - session.getWorkspace().getObservationManager().addEventListener( - new VmAgentObserver(viewer.getTree().getDisplay()), - Event.NODE_ADDED | Event.NODE_REMOVED | Event.NODE_MOVED, SlcJcrConstants.VM_AGENT_FACTORY_PATH, - true, null, nodeTypes, false); - } catch (RepositoryException e) { - throw new SlcException("Cannot add observer", e); - } - } - - public void setFocus() { - viewer.getControl().setFocus(); - } - - public TreeViewer getViewer() { - return viewer; - } - - public void refreshView() { -// viewer.setInput(getViewSite()); - viewer.setInput(modulesManager); - } - - // Controllers - class ViewContentProvider extends SimpleNodeContentProvider { - private static final long serialVersionUID = 5117887833174813672L; - - public ViewContentProvider(Session session) { - super(session, new String[] { SlcJcrConstants.VM_AGENT_FACTORY_PATH }); - } - - @Override - protected Object[] sort(Object parent, Object[] children) { - Object[] sorted = new Object[children.length]; - System.arraycopy(children, 0, sorted, 0, children.length); - Arrays.sort(sorted, new ViewComparator()); - return sorted; - } - - @Override - protected List filterChildren(List children) throws RepositoryException { - for (Iterator it = children.iterator(); it.hasNext();) { - Node node = it.next(); - // execution spec definitions - if (node.getName().equals(SLC_EXECUTION_SPECS)) - it.remove(); - // flow values - else if (node.getParent().isNodeType(SlcTypes.SLC_EXECUTION_FLOW)) - it.remove(); - } - return super.filterChildren(children); - } - - @Override - public boolean hasChildren(Object element) { - if (element instanceof Node) { - Node node = (Node) element; - try { - if (node.isNodeType(SlcTypes.SLC_EXECUTION_FLOW)) - return false; - } catch (RepositoryException e) { - throw new SlcException("Cannot check has children", e); - } - } - return super.hasChildren(element); - } - } - - static class ViewComparator implements Comparator { - - public int compare(Object o1, Object o2) { - try { - if (o1 instanceof Node && o2 instanceof Node) { - Node node1 = (Node) o1; - Node node2 = (Node) o2; - - if (node1.getName().equals(SLC_EXECUTION_SPECS)) - return -100; - if (node2.getName().equals(SLC_EXECUTION_SPECS)) - return 100; - - if (node1.isNodeType(SLC_EXECUTION_FLOW) && node2.isNodeType(SLC_EXECUTION_FLOW)) { - return node1.getName().compareTo(node2.getName()); - } else if (node1.isNodeType(SLC_EXECUTION_FLOW) && !node2.isNodeType(SLC_EXECUTION_FLOW)) { - return 1; - } else if (!node1.isNodeType(SLC_EXECUTION_FLOW) && node2.isNodeType(SLC_EXECUTION_FLOW)) { - return -1; - } else { - // TODO: check title - return node1.getName().compareTo(node2.getName()); - } - } - } catch (RepositoryException e) { - throw new SlcException("Cannot compare " + o1 + " and " + o2, e); - } - return 0; - } - - } - - // private void addContextMenu(TreeViewer flowsViewer) { - // - // final MenuManager menuMgr = new MenuManager(); - // menuMgr.setRemoveAllWhenShown(true); - // menuMgr.addMenuListener(new IMenuListener() { - // - // public void menuAboutToShow(IMenuManager manager) { - // menuMgr.add(new Action("Test") { - // public void run() { - // log.debug("do something"); - // } - // }); - // } - // }); - // Menu menu = menuMgr.createContextMenu(flowsViewer.getControl()); - // flowsViewer.getTree().setMenu(menu); - // getSite().registerContextMenu(menuMgr, flowsViewer); - // } - - class VmAgentObserver extends AsyncUiEventListener { - - public VmAgentObserver(Display display) { - super(display); - } - - protected void onEventInUiThread(List events) { - for (Event event : events) { - try { - String path = event.getPath(); - - if (session.itemExists(path)) { - Node parentNode = session.getNode(path);// .getParent(); - if (log.isTraceEnabled()) - log.trace("Refresh " + parentNode + " after event " + event); - viewer.refresh(parentNode); - } - } catch (RepositoryException e) { - log.warn("Cannot process event " + event + ": " + e); - } - } - - // TODO: optimize based on event - viewer.refresh(); - } - } - - class ViewLabelProvider extends DefaultNodeLabelProvider implements ITableLabelProvider { - private static final long serialVersionUID = 2410754425574656399L; - - @Override - protected String getText(Node node) throws RepositoryException { - if (node.isNodeType(NodeType.MIX_TITLE) && node.hasProperty(Property.JCR_TITLE)) - return node.getProperty(Property.JCR_TITLE).getString(); - else if (node.getName().equals(SLC_EXECUTION_SPECS)) - return "Execution Specifications"; - else if (node.getPath().equals(SlcJcrConstants.VM_AGENT_FACTORY_PATH)) - return "Internal Agents"; - return super.getText(node); - } - - @Override - public Image getImage(Node node) throws RepositoryException { - // we try to optimize a bit by putting deeper nodes first - if (node.getParent().isNodeType(SlcTypes.SLC_EXECUTION_SPEC_ATTRIBUTE)) - return SlcImages.CHOICES; - else if (node.isNodeType(SlcTypes.SLC_EXECUTION_SPEC_ATTRIBUTE)) - return SlcImages.EXECUTION_SPEC_ATTRIBUTE; - else if (node.isNodeType(SlcTypes.SLC_EXECUTION_SPEC)) - return SlcImages.EXECUTION_SPEC; - else if (node.getName().equals(SLC_EXECUTION_SPECS)) - return SlcImages.EXECUTION_SPECS; - else if (node.isNodeType(SlcTypes.SLC_EXECUTION_FLOW)) - return SlcImages.FLOW; - else if (node.isNodeType(SlcTypes.SLC_MODULE)) { - if (node.getProperty(SLC_STARTED).getBoolean()) - return SlcImages.MODULE; - else - return SlcImages.MODULE_STOPPED; - } else if (node.isNodeType(SlcTypes.SLC_AGENT)) - return SlcImages.AGENT; - else if (node.isNodeType(SlcTypes.SLC_AGENT_FACTORY)) - return SlcImages.AGENT_FACTORY; - else - return SlcImages.FOLDER; - } - - public String getToolTipText(Node node) throws RepositoryException { - if (node.isNodeType(NodeType.MIX_TITLE) && node.hasProperty(Property.JCR_DESCRIPTION)) - return node.getProperty(Property.JCR_DESCRIPTION).getString(); - return super.getToolTipText(node); - } - - public String getColumnText(Object obj, int index) { - return getText(obj); - } - - public Image getColumnImage(Object obj, int index) { - return getImage(obj); - } - - } - - class ViewDoubleClickListener implements IDoubleClickListener { - public void doubleClick(DoubleClickEvent evt) { - Object obj = ((IStructuredSelection) evt.getSelection()).getFirstElement(); - try { - if (obj instanceof Node) { - Node node = (Node) obj; - if (node.isNodeType(SLC_EXECUTION_MODULE)) { - //ClientUiPlugin.startStopExecutionModule(modulesManager, node); - } else { - String path = node.getPath(); - // TODO factorize with editor - QueryManager qm = node.getSession().getWorkspace().getQueryManager(); - String statement = "SELECT * FROM [" + SlcTypes.SLC_EXECUTION_FLOW - + "] WHERE ISDESCENDANTNODE(['" + path + "']) OR ISSAMENODE(['" + path + "'])"; - // log.debug(statement); - Query query = qm.createQuery(statement, Query.JCR_SQL2); - - // order paths - SortedSet paths = new TreeSet(); - for (NodeIterator nit = query.execute().getNodes(); nit.hasNext();) { - paths.add(nit.nextNode().getPath()); - } - -// IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow() -// .getActivePage(); -// activePage.openEditor(new ProcessEditorInput(new ArrayList(paths), true), -// ProcessEditor.ID); - } - } - } catch (Exception e) { - throw new SlcException("Cannot open " + obj, e); - } - } - - } - - /** Listen to drags */ - class ViewDragListener extends DragSourceAdapter { - private static final long serialVersionUID = 250270504802674171L; - - // Check if the drag action should start. - public void dragStart(DragSourceEvent event) { - // we only start drag if at least one of the selected elements is - // valid - boolean doIt = false; - IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); - @SuppressWarnings("rawtypes") - Iterator it = selection.iterator(); - try { - while (it.hasNext()) { - Object obj = it.next(); - if (obj instanceof Node) { - Node node = (Node) obj; - if (node.isNodeType(SlcTypes.SLC_EXECUTION_FLOW) - || node.isNodeType(SlcTypes.SLC_EXECUTION_MODULE)) { - doIt = true; - } - } - } - } catch (RepositoryException e) { - throw new SlcException("Cannot read node to set drag data", e); - } - event.doit = doIt; - } - - public void dragSetData(DragSourceEvent event) { - IStructuredSelection selection = (IStructuredSelection) viewer.getSelection(); - StringBuilder buf = new StringBuilder(); - @SuppressWarnings("rawtypes") - Iterator it = selection.iterator(); - try { - - while (it.hasNext()) { - Object obj = it.next(); - - if (obj instanceof Node) { - Node node = (Node) obj; - if ((node.isNodeType(SlcTypes.SLC_EXECUTION_FLOW) - || node.isNodeType(SlcTypes.SLC_EXECUTION_MODULE)) - && TextTransfer.getInstance().isSupportedType(event.dataType)) { - buf.append(node.getPath()).append('\n'); - } - } - } - } catch (RepositoryException e) { - throw new SlcException("Cannot read node to set drag data", e); - } - - if (buf.length() > 0) { - if (buf.charAt(buf.length() - 1) == '\n') - buf.deleteCharAt(buf.length() - 1); - event.data = buf.toString(); - log.debug("data set to : " + buf.toString()); - } - } - } - - public void dispose() { - JcrUtils.logoutQuietly(session); -// if (pushSession != null) -// pushSession.stop(); -// super.dispose(); - } - - // DEPENDENCY INJECTION - - public void setModulesManager(ExecutionModulesManager modulesManager) { - this.modulesManager = modulesManager; - } - - public void setRepository(Repository repository) { - this.repository = repository; - } -} \ No newline at end of file diff --git a/cms/org.argeo.slc.support.maven/.classpath b/cms/org.argeo.slc.support.maven/.classpath deleted file mode 100644 index 3e26ac1a9..000000000 --- a/cms/org.argeo.slc.support.maven/.classpath +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cms/org.argeo.slc.support.maven/.classpath.old b/cms/org.argeo.slc.support.maven/.classpath.old deleted file mode 100644 index 6420ef7eb..000000000 --- a/cms/org.argeo.slc.support.maven/.classpath.old +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/cms/org.argeo.slc.support.maven/.gitignore b/cms/org.argeo.slc.support.maven/.gitignore deleted file mode 100644 index 0f630157f..000000000 --- a/cms/org.argeo.slc.support.maven/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target/ -/bin/ diff --git a/cms/org.argeo.slc.support.maven/.project b/cms/org.argeo.slc.support.maven/.project deleted file mode 100644 index be03f8af7..000000000 --- a/cms/org.argeo.slc.support.maven/.project +++ /dev/null @@ -1,21 +0,0 @@ - - - org.argeo.slc.support.maven - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - org.eclipse.jdt.core.javabuilder - - - org.eclipse.pde.ManifestBuilder - - - org.eclipse.pde.SchemaBuilder - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - \ No newline at end of file diff --git a/cms/org.argeo.slc.support.maven/MANIFEST.MF b/cms/org.argeo.slc.support.maven/MANIFEST.MF deleted file mode 100644 index cdf3f8a72..000000000 --- a/cms/org.argeo.slc.support.maven/MANIFEST.MF +++ /dev/null @@ -1,74 +0,0 @@ -Manifest-Version: 1.0 -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-ManifestVersion: 2 -Bundle-Name: SLC Third Party Support -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-SymbolicName: org.argeo.slc.support.maven -Bundle-Version: 2.1.8.SNAPSHOT-r201703070941 -Import-Package: com.jcraft.jsch;version="[0.1,1)", - javax.jcr;version="[2.0,3)", - javax.mail;version="[1.5,2)", - javax.mail.internet;version="[1.5,2)", - javax.security.auth, - javax.security.auth.callback, - javax.security.auth.login, - javax.sql, - javax.swing, - javax.swing.plaf.metal, - junit.framework;version="[4.11,5)";resolution:=optional, - org.apache.commons.exec;version="[1.3,2)", - org.apache.commons.io;version="[2.4,3)", - org.apache.commons.logging;version="[1.1,2)", - org.apache.commons.vfs2;version="[2.0,3)", - org.apache.commons.vfs2.impl;version="[2.0,3)", - org.apache.log4j;version="[1.2,2)", - org.apache.log4j.spi;version="[1.2,2)", - org.argeo.jcr;version="[2.1,3)", - org.argeo.node;version="[2.1,3)", - org.argeo.slc;version="[2.1,3)", - org.argeo.slc.aether.osgi, - org.argeo.slc.aether, - org.eclipse.aether.util.graph.visitor, - org.eclipse.aether.spi.locator, - org.argeo.slc.build;version="[2.1,3)", - org.argeo.slc.core.deploy;version="[2.1,3)", - org.argeo.slc.core.execution;version="[2.1,3)", - org.argeo.slc.core.execution.tasks;version="[2.1,3)", - org.argeo.slc.deploy;version="[2.1,3)", - org.argeo.slc.execution;version="[2.1,3)", - org.argeo.slc.jsch, - org.eclipse.aether;version="[1.0,2)", - org.eclipse.aether.artifact;version="[1.0,2)", - org.eclipse.aether.collection;version="[1.0,2)", - org.eclipse.aether.graph;version="[1.0,2)", - org.eclipse.aether.impl;version="[1.0,2)", - org.eclipse.aether.metadata;version="[1.0,2)", - org.eclipse.aether.repository;version="[1.0,2)", - org.eclipse.aether.resolution;version="[1.0,2)", - org.eclipse.aether.transfer;version="[1.0,2)", - org.eclipse.aether.util.repository;version="[1.0,2)", - org.eclipse.aether.version;version="[1.0,2)", - org.osgi.framework;version="[1.8,2)", - org.springframework.beans.factory;version="[3.2,4)", - org.springframework.core.io;version="[3.2,4)", - org.springframework.util;version="[3.2,4)", - org.tmatesoft.svn.core;version="[1.8,2)", - org.tmatesoft.svn.core.internal.io.dav;version="[1.8,2)", - org.tmatesoft.svn.core.internal.io.fs;version="[1.8,2)", - org.tmatesoft.svn.core.io;version="[1.8,2)", - org.tmatesoft.svn.core.wc;version="[1.8,2)", - org.tmatesoft.svn.core.wc.admin;version="[1.8,2)" -Include-Resource: org/argeo/slc/lib/linux/redhat.xml=src/org/argeo/slc/l - ib/linux/redhat.xml,org/argeo/slc/lib/linux/lxc-init-host.sh=src/org/ar - geo/slc/lib/linux/lxc-init-host.sh,org/argeo/slc/lib/linux/lxc-init-gue - st.sh=src/org/argeo/slc/lib/linux/lxc-init-guest.sh,org/argeo/slc/diff/ - package.html=src/org/argeo/slc/diff/package.html,org/argeo/slc/jsch/jaa - s.cfg=src/org/argeo/slc/jsch/jaas.cfg -Private-Package: org.argeo.slc.lib.linux,org.argeo.slc.lib.linux.rpmfact - ory,org.argeo.slc.lib.vbox,org.argeo.slc.lib.jcr,org.argeo.slc.lib.svn, - org.argeo.slc.support.deploy,org.argeo.slc.support.deploy.db,org.argeo. - slc.aether.spring,org.argeo.slc.aether,org.argeo.slc.aether.osgi,org.ar - geo.slc.log4j,org.argeo.slc.diff,org.argeo.slc.mail,org.argeo.slc.vfs,o - rg.argeo.slc.jsch -Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))" -SLC-Category: org.argeo.slc diff --git a/cms/org.argeo.slc.support.maven/META-INF/.gitignore b/cms/org.argeo.slc.support.maven/META-INF/.gitignore deleted file mode 100644 index 4854a41b9..000000000 --- a/cms/org.argeo.slc.support.maven/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/cms/org.argeo.slc.support.maven/META-INF/spring/maven-osgi.xml b/cms/org.argeo.slc.support.maven/META-INF/spring/maven-osgi.xml deleted file mode 100644 index ffc3117c9..000000000 --- a/cms/org.argeo.slc.support.maven/META-INF/spring/maven-osgi.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cms/org.argeo.slc.support.maven/META-INF/spring/maven.xml b/cms/org.argeo.slc.support.maven/META-INF/spring/maven.xml deleted file mode 100644 index 6c21a5e91..000000000 --- a/cms/org.argeo.slc.support.maven/META-INF/spring/maven.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/cms/org.argeo.slc.support.maven/bnd.bnd b/cms/org.argeo.slc.support.maven/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/cms/org.argeo.slc.support.maven/lib/.gitignore b/cms/org.argeo.slc.support.maven/lib/.gitignore deleted file mode 100644 index 0557829bf..000000000 --- a/cms/org.argeo.slc.support.maven/lib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.jar diff --git a/cms/org.argeo.slc.support.maven/pom.xml b/cms/org.argeo.slc.support.maven/pom.xml deleted file mode 100644 index 78102b674..000000000 --- a/cms/org.argeo.slc.support.maven/pom.xml +++ /dev/null @@ -1,277 +0,0 @@ - - - 4.0.0 - - org.argeo.slc - argeo-slc - 2.1.10-SNAPSHOT - .. - - org.argeo.slc.support.maven - bundle - SLC Support Maven - - 1.0.1.v20141111 - 1.0 - - - - - org.apache.felix - maven-bundle-plugin - - - - - org.argeo.slc.maven.* - - - org.w3c.dom.*;version="0.0.0", - org.xml.sax.*;version="0.0.0", - com.google.*;resolution:=optional, - javax.*;resolution:=optional, - com.sun.*;resolution:=optional, - org.objectweb.asm.*;resolution:=optional, - *;resolution:=optional - - <_exportcontents> - org.apache.maven.*;version=${version.maven}, - - org.apache.xbean.* - true - lib - *;scope=compile;inline=false - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - process-resources - - copy-dependencies - - - provided - lib - - - - - - - - - org.argeo.slc - org.argeo.slc.api - 2.1.10-SNAPSHOT - provided - - - org.argeo.slc - org.argeo.slc.support - 2.1.10-SNAPSHOT - provided - - - - - - - - - - - - - - - - - - - org.apache.maven - maven-embedder - ${version.maven} - true - compile - - - org.slf4j - slf4j-api - - - commons-logging - commons-logging - - - commons-cli - commons-cli - - - org.eclipse.aether - aether-spi - - - org.eclipse.aether - aether-api - - - org.eclipse.aether - aether-util - - - org.eclipse.aether - aether-impl - - - - - org.eclipse.aether - aether-transport-wagon - ${version.aether} - true - compile - - - commons-logging - commons-logging - - - commons-logging - commons-logging-api - - - log4j - log4j - - - javax.inject - javax.inject - - - junit - junit - - - aopalliance - aopalliance - - - com.google.guava - guava - - - org.eclipse.aether - aether-spi - - - org.eclipse.aether - aether-api - - - org.eclipse.aether - aether-util - - - - - org.apache.maven.wagon - wagon-provider-api - ${version.wagon} - true - compile - - - commons-logging - commons-logging - - - - - org.apache.maven.wagon - wagon-file - ${version.wagon} - true - compile - - - commons-logging - commons-logging - - - - - org.apache.maven.wagon - wagon-http-lightweight - ${version.wagon} - true - compile - - - nekohtml - xercesMinimal - - - commons-logging - commons-logging - - - commons-io - commons-io - - - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - ${version.wagon} - true - compile - - - org.slf4j - slf4j-nop - - - org.apache.jackrabbit - jackrabbit-webdav - - - - - - - - - - - - - - - - - - - - - - - - - central - https://repo1.maven.org/maven2/ - - true - - - false - - - - \ No newline at end of file diff --git a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/CustomCli.java b/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/CustomCli.java deleted file mode 100644 index 36db90f1c..000000000 --- a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/CustomCli.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.argeo.slc.maven; - -import org.apache.maven.cli.MavenCli; -import org.codehaus.plexus.PlexusContainer; - -/** Custom Maven CLI, giving access to the underlying Plexus container. */ -class CustomCli extends MavenCli { - private PlexusContainer container; - - @Override - protected void customizeContainer(PlexusContainer container) { - this.container = container; - } - - public PlexusContainer getContainer() { - return container; - } - -} diff --git a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/DependencyFileLoader.java b/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/DependencyFileLoader.java deleted file mode 100644 index 658b702c6..000000000 --- a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/DependencyFileLoader.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.argeo.slc.maven; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.slc.SlcException; -import org.springframework.beans.factory.FactoryBean; -import org.springframework.core.io.Resource; - -public class DependencyFileLoader implements FactoryBean{ - private final static Log log = LogFactory.getLog(DependencyFileLoader.class); - - private Resource dependenciesResource; - - @SuppressWarnings("unchecked") - public List loadMavenFiles() { - try { - List mavenFiles = new ArrayList(); - - List lines = IOUtils.readLines(dependenciesResource - .getInputStream()); - for (String line : lines) { - try { - line = line.trim(); - if (line.equals("") - || line - .startsWith("The following files have been resolved:")) - continue;// skip - - mavenFiles.add(convert(line)); - } catch (Exception e) { - log.warn("Could not load line " + line); - } - } - - return mavenFiles; - } catch (IOException e) { - throw new SlcException("Could not read dependencies resource " - + dependenciesResource, e); - } - } - - protected MavenFile convert(String str) { - StringTokenizer st = new StringTokenizer(str, ":"); - MavenFile component = new MavenFile(); - component.setGroupId(st.nextToken()); - component.setArtifactId(st.nextToken()); - component.setType(st.nextToken()); - component.setVersion(st.nextToken()); - component.setScope(st.nextToken()); - return component; - } - - public void setDependenciesResource(Resource dependenciesResource) { - this.dependenciesResource = dependenciesResource; - } - - public Object getObject() throws Exception { - return loadMavenFiles(); - } - - @SuppressWarnings("unchecked") - public Class getObjectType() { - return List.class; - } - - public boolean isSingleton() { - return false; - } - - -} diff --git a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/ManualWagonProvider.java b/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/ManualWagonProvider.java deleted file mode 100644 index 30dec4906..000000000 --- a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/ManualWagonProvider.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.argeo.slc.maven; - -/******************************************************************************* - * Copyright (c) 2010 Sonatype, Inc. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - *******************************************************************************/ - -import org.apache.maven.wagon.Wagon; -import org.apache.maven.wagon.providers.file.FileWagon; -import org.apache.maven.wagon.providers.http.LightweightHttpWagon; -import org.apache.maven.wagon.providers.webdav.WebDavWagon; -import org.eclipse.aether.transport.wagon.WagonProvider; - -public class ManualWagonProvider implements WagonProvider { - - public Wagon lookup(String roleHint) throws Exception { - if ("file".equals(roleHint)) { - return new FileWagon(); - } else if ("http".equals(roleHint)) { - return new LightweightHttpWagon(); - } else if ("webdav".equals(roleHint)) { - return new WebDavWagon(); - } - return null; - } - - public void release(Wagon wagon) { - - } - -} diff --git a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenCall.java b/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenCall.java deleted file mode 100644 index 8e8499db9..000000000 --- a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenCall.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.argeo.slc.maven; - -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.slc.SlcException; -import org.codehaus.plexus.PlexusContainer; - -/** A Maven execution. */ -public class MavenCall implements Runnable { - private final static Log log = LogFactory.getLog(MavenCall.class); - private String basedir; - private String settings; - /** Raw command lines arguments */ - private String cl; - private List goals; - private List profiles; - private Map properties; - - private Boolean success = null; - - public void run() { - Thread.currentThread().setContextClassLoader( - getClass().getClassLoader()); - List args = new ArrayList(); - args.add("-e"); - if (settings != null && !settings.trim().equals("")) { - args.add("--settings"); - args.add(settings); - } - args.add("-f"); - args.add(getBasedirFile().getPath() + "/pom.xml"); - // FIXME manages \" \". Use Commons CLI? - if (cl != null) { - String[] clArgs = cl.split(" "); - args.addAll(Arrays.asList(clArgs)); - } - - if (goals != null) - args.addAll(goals); - if (profiles != null) - for (String profile : profiles) - args.add("-P" + profile); - if (properties != null) - for (String key : properties.keySet()) - args.add("-D" + key + "=\"" + properties.get(key) + "\""); - - // String[] goals = { "-o", "-e", "-f", basedir + "/pom.xml", "clean", - // "install" }; - - // String m2Home = "/opt/apache-maven-3.0.1"; - // System.setProperty("classworlds.conf", m2Home + "/bin/m2.conf"); - // System.setProperty("maven.home", m2Home); - // - // Launcher.main(goals); - log.info("Maven call: " + args); - - CustomCli mavenCli = new CustomCli(); - int exitCode = mavenCli.doMain(args.toArray(new String[args.size()]), - getBasedirFile().getPath(), System.out, System.err); - if (log.isDebugEnabled()) - log.debug("Maven exit code: " + exitCode); - if (exitCode == 0) - success = true; - else - success = false; - - PlexusContainer plexusContainer = mavenCli.getContainer(); - if (log.isDebugEnabled()) - log.debug(plexusContainer.getContext().getContextData()); - plexusContainer.dispose(); - } - - /** Removes 'file:' prefix if present */ - protected File getBasedirFile() { - if (basedir == null) - throw new SlcException("basedir not set"); - File dir; - if (basedir.startsWith("file:")) - dir = new File(basedir.substring("file:".length())); - else - dir = new File(basedir); - return dir; - } - - public void setBasedir(String basedir) { - this.basedir = basedir; - } - - public void setSettings(String settings) { - this.settings = settings; - } - - public void setGoals(List goals) { - this.goals = goals; - } - - public void setProfiles(List profiles) { - this.profiles = profiles; - } - - public void setProperties(Map properties) { - this.properties = properties; - } - - public void setCl(String cl) { - this.cl = cl; - } - - public Boolean getSuccess() { - return success == null ? false : success; - } - -} diff --git a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenDeployEnvironment.java b/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenDeployEnvironment.java deleted file mode 100644 index cf2f591ac..000000000 --- a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenDeployEnvironment.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.argeo.slc.maven; - -import java.io.File; -import java.net.URL; -import java.util.Map; -import java.util.Properties; -import java.util.UUID; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.slc.SlcException; -import org.argeo.slc.deploy.DeployEnvironment; - -public abstract class MavenDeployEnvironment implements DeployEnvironment { - private static final Log log = LogFactory - .getLog(MavenDeployEnvironment.class); - private MavenManager mavenManager; - - public void unpackTo(Object packg, File targetLocation, - Map filter) { - File packageLocation=null; - String type = null; - String removeRootDir = "enabled"; -// if (packg instanceof MavenFile) { -// packageLocation = mavenManager -// .getPackageLocation((MavenFile) packg); -// type = ((MavenFile) packg).getType(); -// } else - if (packg instanceof File) { - packageLocation = (File) packg; - // TODO: type based on extension - } else { - throw new SlcException("Unrecognized package type " - + packg.getClass()); - } - if (log.isDebugEnabled()) { - log.debug("Unpack " + packageLocation + " of type " + type + " to " - + targetLocation); - } - - try { - File tempDir = new File("/tmp/" + UUID.randomUUID().toString()); - tempDir.mkdirs(); - targetLocation.mkdirs(); - Properties props = new Properties(); - props.setProperty("dest", targetLocation.getAbsolutePath()); - props.setProperty("src", packageLocation.getAbsolutePath()); - props.setProperty("tempDir", tempDir.getAbsolutePath()); - props.setProperty("removeRootDir", removeRootDir); - - URL antUrl = getClass().getClassLoader().getResource( - "org/argeo/slc/support/deploy/ant/build.xml"); - - // if (type == null || type.equals("zip")) { - // new AntRunner(antUrl, "deployZip", props).run(); - // } else if (type.equals("tar.gz")) { - // new AntRunner(antUrl, "deployTarGz", props).run(); - // } else { - // throw new SlcException("Unknow package type " + type); - // } - throw new SlcException("Not implemented."); - } catch (SlcException e) { - throw e; - } catch (Exception e) { - throw new SlcException("Cannot unpack package " + packg + " to " - + targetLocation, e); - } - } - - public void setMavenManager(MavenManager mavenManager) { - this.mavenManager = mavenManager; - } - -} diff --git a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenFile.java b/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenFile.java deleted file mode 100644 index 210f3af93..000000000 --- a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenFile.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.argeo.slc.maven; - -import org.argeo.slc.build.Distribution; -import org.argeo.slc.deploy.DeploymentData; - -public class MavenFile implements Distribution, DeploymentData { - private String groupId; - private String artifactId; - private String version; - private String type; - private String classifier; - private String scope; - - public String getScope() { - return scope; - } - - public void setScope(String scope) { - this.scope = scope; - } - - private String distributionId; - - public String getDistributionId() { - return distributionId; - } - - public void setDistributionId(String distributionId) { - this.distributionId = distributionId; - } - - public String getGroupId() { - return groupId; - } - - public void setGroupId(String groupId) { - this.groupId = groupId; - } - - public String getArtifactId() { - return artifactId; - } - - public void setArtifactId(String artifactId) { - this.artifactId = artifactId; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getClassifier() { - return classifier; - } - - public void setClassifier(String classifier) { - this.classifier = classifier; - } - -} diff --git a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenManager.java b/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenManager.java deleted file mode 100644 index e4355ecf8..000000000 --- a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenManager.java +++ /dev/null @@ -1,161 +0,0 @@ -package org.argeo.slc.maven; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.maven.repository.internal.MavenRepositorySystemUtils; -import org.argeo.slc.SlcException; -import org.argeo.slc.aether.AetherUtils; -import org.argeo.slc.aether.ConsoleRepositoryListener; -import org.argeo.slc.aether.ConsoleTransferListener; -import org.codehaus.plexus.PlexusContainer; -import org.eclipse.aether.DefaultRepositorySystemSession; -import org.eclipse.aether.RepositorySystem; -import org.eclipse.aether.RepositorySystemSession; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.collection.CollectRequest; -import org.eclipse.aether.graph.Dependency; -import org.eclipse.aether.graph.DependencyNode; -import org.eclipse.aether.impl.DefaultServiceLocator; -import org.eclipse.aether.repository.LocalRepository; -import org.eclipse.aether.repository.RemoteRepository; -import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator; - -public class MavenManager { - private final static Log log = LogFactory.getLog(MavenManager.class); - - public void init() { - try { - testMaven(); - testAether(); - // List> lst = plexusContainer - // .discoverComponents(plexusContainer.getContainerRealm()); - // for (ComponentDescriptor cd : lst) { - // log.debug(cd); - // } - // ArtifactHandler artifactHandler = plexusContainer - // .lookup(ArtifactHandler.class); - // ArtifactRepository localRepository = new - // DefaultArtifactRepositoryFactory().createArtifactRepository("local", - // , layoutId, snapshots, releases); - // Maven maven = mavenCli.getContainer().lookup(Maven.class); - // Artifact artifact = new DefaultArtifact("org.argeo.slc.dist", - // "org.argeo.slc.sdk", "0.13.1-SNAPSHOT", "compile", "pom", - // null, artifactHandler); - // ArtifactResolutionRequest req = new ArtifactResolutionRequest(); - // req.setLocalRepository(localRepository); - // req.setResolveTransitively(true); - // req.setArtifact(artifact); - // ArtifactResolver artifactResolver = plexusContainer - // .lookup(ArtifactResolver.class); - // ArtifactResolutionResult res = artifactResolver.resolve(req); - // Set artifacts = res.getArtifacts(); - // for (Artifact art : artifacts) { - // log.debug(art); - // } - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - public void testMaven() { - Thread.currentThread().setContextClassLoader( - getClass().getClassLoader()); - String[] goals = { "-o", "-e", "-f", - "/home/mbaudier/dev/src/slc/dist/org.argeo.slc.sdk/pom.xml", - "dependency:tree" }; - - // String m2Home = "/opt/apache-maven-3.0.1"; - // System.setProperty("classworlds.conf", m2Home + "/bin/m2.conf"); - // System.setProperty("maven.home", m2Home); - // - // Launcher.main(goals); - - CustomCli mavenCli = new CustomCli(); - mavenCli.doMain(goals, - "/home/mbaudier/dev/src/slc/dist/org.argeo.slc.sdk", - System.out, System.err); - - PlexusContainer plexusContainer = mavenCli.getContainer(); - log.debug(plexusContainer.getContext().getContextData()); - plexusContainer.dispose(); - } - - public void testAether() { - try { - RepositorySystem repoSystem = createRepositorySystem(); - - RepositorySystemSession session = createRepositorySystemSession(repoSystem); - - Dependency dependency = new Dependency(new DefaultArtifact( - "org.argeo.slc.dep:org.argeo.slc.dep.sdk:0.13.1-SNAPSHOT"), - "compile"); -// RemoteRepository argeo = new RemoteRepository("argeo", "default", -// "http://maven.argeo.org/argeo/"); -// RemoteRepository argeoSnapshots = new RemoteRepository( -// "argeo-snapshots", "default", -// "http://dev.argeo.org/maven/argeo-snapshots/"); - RemoteRepository argeo =null; - RemoteRepository argeoSnapshots =null; - - CollectRequest collectRequest = new CollectRequest(); - collectRequest.setRoot(dependency); - collectRequest.addRepository(argeo); - collectRequest.addRepository(argeoSnapshots); - DependencyNode node = repoSystem.collectDependencies(session, - collectRequest).getRoot(); - -// repoSystem.resolveDependencies(session, node, null); - - PreorderNodeListGenerator nlg = new PreorderNodeListGenerator(); - node.accept(nlg); - - for (Artifact artifact : nlg.getArtifacts(true)) { - log.debug(artifact); - } - - AetherUtils.logDependencyNode(0, node); - // System.out.println(nlg.getClassPath()); - - } catch (Exception e) { - throw new SlcException("Cannot resolve", e); - } - - } - - /** Creates a Maven {@link RepositorySystem}. */ - public static RepositorySystem createRepositorySystem() { - try { - DefaultServiceLocator locator = new DefaultServiceLocator(); - -// locator.setServices(WagonProvider.class, new ManualWagonProvider()); -// locator.addService(RepositoryConnectorFactory.class, -// WagonRepositoryConnectorFactory.class); - - return locator.getService(RepositorySystem.class); - } catch (Exception e) { - throw new SlcException("Cannot lookup repository system", e); - } - } - - public static RepositorySystemSession createRepositorySystemSession( - RepositorySystem system) { -// MavenRepositorySystemSession session = new MavenRepositorySystemSession(); - DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession(); - - LocalRepository localRepo = new LocalRepository( - System.getProperty("user.home") + "/.m2/repository"); - session.setLocalRepositoryManager( system.newLocalRepositoryManager( session, localRepo ) ); -// session.setLocalRepositoryManager(system -// .newLocalRepositoryManager(localRepo)); - session.setTransferListener(new ConsoleTransferListener(System.out)); - session.setRepositoryListener(new ConsoleRepositoryListener()); - return session; - } - - public static void main(String[] args) { - new MavenManager().init(); - } - -} diff --git a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenToUrl.java b/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenToUrl.java deleted file mode 100644 index da1ac71dc..000000000 --- a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenToUrl.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.argeo.slc.maven; - -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.FactoryBean; - -public class MavenToUrl implements FactoryBean { - private List mavenFiles; - private String baseUrl; - - public List asUrls() { - List urls = new ArrayList(); - for (MavenFile mf : mavenFiles) - urls.add(convertToUrl(mf)); - return urls; - } - - public String convertToUrl(MavenFile mf) { - return baseUrl + mf.getGroupId().replace('.', '/') + '/' - + mf.getArtifactId() + '/' + mf.getVersion() + '/' - + mf.getArtifactId() + '-' + mf.getVersion() + '.' - + mf.getType(); - } - - public void setMavenFiles(List mavenFiles) { - this.mavenFiles = mavenFiles; - } - - public void setBaseUrl(String baseUrl) { - this.baseUrl = baseUrl; - } - - public Object getObject() throws Exception { - return asUrls(); - } - - public Class getObjectType() { - return List.class; - } - - public boolean isSingleton() { - return false; - } - -} diff --git a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/RemoteRepo.java b/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/RemoteRepo.java deleted file mode 100644 index a3f3bc87c..000000000 --- a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/RemoteRepo.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.argeo.slc.maven; - -public class RemoteRepo { - private String id; - private String url; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - -} diff --git a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/build.xml b/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/build.xml deleted file mode 100644 index d344444d7..000000000 --- a/cms/org.argeo.slc.support.maven/src/org/argeo/slc/maven/build.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/demo/modules/org.argeo.slc.demo.det/META-INF/spring/det.xml b/demo/modules/org.argeo.slc.demo.det/META-INF/spring/det.xml deleted file mode 100644 index 144b822c8..000000000 --- a/demo/modules/org.argeo.slc.demo.det/META-INF/spring/det.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - SYSTEM_PROPERTIES_MODE_OVERRIDE - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/demo/modules/org.argeo.slc.demo.det/META-INF/spring/osgi.xml b/demo/modules/org.argeo.slc.demo.det/META-INF/spring/osgi.xml deleted file mode 100644 index cffe1c3d7..000000000 --- a/demo/modules/org.argeo.slc.demo.det/META-INF/spring/osgi.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/demo/modules/org.argeo.slc.demo.det/pom.xml b/demo/modules/org.argeo.slc.demo.det/pom.xml deleted file mode 100644 index 44f9a3620..000000000 --- a/demo/modules/org.argeo.slc.demo.det/pom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - 4.0.0 - - org.argeo.slc.demo - modules - 2.1.1-SNAPSHOT - .. - - org.argeo.slc.demo.det - SLC Demo Det(ached) - \ No newline at end of file diff --git a/demo/modules/org.argeo.slc.demo.detached/META-INF/spring/detached.xml b/demo/modules/org.argeo.slc.demo.detached/META-INF/spring/detached.xml deleted file mode 100644 index 6e13d1833..000000000 --- a/demo/modules/org.argeo.slc.demo.detached/META-INF/spring/detached.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - org.argeo.slc.demo.det - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/demo/modules/org.argeo.slc.demo.detached/META-INF/spring/imports.xml b/demo/modules/org.argeo.slc.demo.detached/META-INF/spring/imports.xml deleted file mode 100644 index 0e44c20fd..000000000 --- a/demo/modules/org.argeo.slc.demo.detached/META-INF/spring/imports.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/demo/modules/org.argeo.slc.demo.detached/META-INF/spring/launch.xml b/demo/modules/org.argeo.slc.demo.detached/META-INF/spring/launch.xml deleted file mode 100644 index c0ec16a57..000000000 --- a/demo/modules/org.argeo.slc.demo.detached/META-INF/spring/launch.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${osgi.framework} - file:@{detachedLauncherJar} - - - - - \ No newline at end of file diff --git a/demo/modules/org.argeo.slc.demo.detached/META-INF/spring/osgi.xml b/demo/modules/org.argeo.slc.demo.detached/META-INF/spring/osgi.xml deleted file mode 100644 index 65c65afef..000000000 --- a/demo/modules/org.argeo.slc.demo.detached/META-INF/spring/osgi.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/demo/modules/org.argeo.slc.demo.detached/pom.xml b/demo/modules/org.argeo.slc.demo.detached/pom.xml deleted file mode 100644 index 36d67996a..000000000 --- a/demo/modules/org.argeo.slc.demo.detached/pom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - 4.0.0 - - org.argeo.slc.demo - modules - 2.1.1-SNAPSHOT - .. - - org.argeo.slc.demo.detached - SLC Demo Detached - \ No newline at end of file diff --git a/demo/modules/org.argeo.slc.demo.maven/.project b/demo/modules/org.argeo.slc.demo.maven/.project deleted file mode 100644 index 0f0cc36cb..000000000 --- a/demo/modules/org.argeo.slc.demo.maven/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.slc.demo.maven - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/demo/modules/org.argeo.slc.demo.maven/.settings/org.eclipse.pde.core.prefs b/demo/modules/org.argeo.slc.demo.maven/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index fd871b4a7..000000000 --- a/demo/modules/org.argeo.slc.demo.maven/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Wed Jan 06 20:27:20 CET 2010 -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/demo/modules/org.argeo.slc.demo.maven/META-INF/spring/imports.xml b/demo/modules/org.argeo.slc.demo.maven/META-INF/spring/imports.xml deleted file mode 100644 index 3428e8b85..000000000 --- a/demo/modules/org.argeo.slc.demo.maven/META-INF/spring/imports.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/demo/modules/org.argeo.slc.demo.maven/META-INF/spring/maven.xml b/demo/modules/org.argeo.slc.demo.maven/META-INF/spring/maven.xml deleted file mode 100644 index 1a4c42117..000000000 --- a/demo/modules/org.argeo.slc.demo.maven/META-INF/spring/maven.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/demo/modules/org.argeo.slc.demo.maven/META-INF/spring/osgi.xml b/demo/modules/org.argeo.slc.demo.maven/META-INF/spring/osgi.xml deleted file mode 100644 index f50522973..000000000 --- a/demo/modules/org.argeo.slc.demo.maven/META-INF/spring/osgi.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - \ No newline at end of file diff --git a/demo/modules/org.argeo.slc.demo.maven/build.properties b/demo/modules/org.argeo.slc.demo.maven/build.properties deleted file mode 100644 index 5f22cdd44..000000000 --- a/demo/modules/org.argeo.slc.demo.maven/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = META-INF/ diff --git a/demo/modules/org.argeo.slc.demo.maven/pom.xml b/demo/modules/org.argeo.slc.demo.maven/pom.xml deleted file mode 100644 index 240536fa6..000000000 --- a/demo/modules/org.argeo.slc.demo.maven/pom.xml +++ /dev/null @@ -1,11 +0,0 @@ - - 4.0.0 - - org.argeo.slc.demo - modules - 2.1.1-SNAPSHOT - .. - - org.argeo.slc.demo.maven - SLC Demo Maven - \ No newline at end of file diff --git a/demo/modules/pom.xml b/demo/modules/pom.xml index 8912f6614..105634e93 100644 --- a/demo/modules/pom.xml +++ b/demo/modules/pom.xml @@ -13,9 +13,6 @@ org.argeo.slc.demo.ant org.argeo.slc.demo.basic - - - org.argeo.slc.demo.minimal diff --git a/lib/org.argeo.slc.lib.build/.gitignore b/lib/org.argeo.slc.lib.build/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/lib/org.argeo.slc.lib.build/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/lib/org.argeo.slc.lib.build/.project b/lib/org.argeo.slc.lib.build/.project deleted file mode 100644 index 6e7c038dc..000000000 --- a/lib/org.argeo.slc.lib.build/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.slc.lib.build - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/lib/org.argeo.slc.lib.build/META-INF/.gitignore b/lib/org.argeo.slc.lib.build/META-INF/.gitignore deleted file mode 100644 index 4854a41b9..000000000 --- a/lib/org.argeo.slc.lib.build/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/lib/org.argeo.slc.lib.build/META-INF/spring/lxc.xml b/lib/org.argeo.slc.lib.build/META-INF/spring/lxc.xml deleted file mode 100644 index c9e3a3034..000000000 --- a/lib/org.argeo.slc.lib.build/META-INF/spring/lxc.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - Init an LXC container - - - - - - - - - - - \ No newline at end of file diff --git a/lib/org.argeo.slc.lib.build/META-INF/spring/mvn.xml b/lib/org.argeo.slc.lib.build/META-INF/spring/mvn.xml deleted file mode 100644 index 70a5e12a1..000000000 --- a/lib/org.argeo.slc.lib.build/META-INF/spring/mvn.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - Pure Maven call - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/org.argeo.slc.lib.build/META-INF/spring/osgi.xml b/lib/org.argeo.slc.lib.build/META-INF/spring/osgi.xml deleted file mode 100644 index 593cf1d9c..000000000 --- a/lib/org.argeo.slc.lib.build/META-INF/spring/osgi.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/org.argeo.slc.lib.build/META-INF/spring/standardBuilds.xml b/lib/org.argeo.slc.lib.build/META-INF/spring/standardBuilds.xml deleted file mode 100644 index bedfd0f5b..000000000 --- a/lib/org.argeo.slc.lib.build/META-INF/spring/standardBuilds.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - Argeo Developer Build - - - - - - - - - - Argeo Full Developer Build - - - - - - - - - - \ No newline at end of file diff --git a/lib/org.argeo.slc.lib.build/bnd.bnd b/lib/org.argeo.slc.lib.build/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/org.argeo.slc.lib.build/pom.xml b/lib/org.argeo.slc.lib.build/pom.xml deleted file mode 100644 index 974bd4977..000000000 --- a/lib/org.argeo.slc.lib.build/pom.xml +++ /dev/null @@ -1,12 +0,0 @@ - - 4.0.0 - - org.argeo.slc - lib - 2.3-SNAPSHOT - .. - - org.argeo.slc.lib.build - SLC Lib - Build - Perform builds according to Argeo conventions - diff --git a/lib/org.argeo.slc.lib.jcr/.gitignore b/lib/org.argeo.slc.lib.jcr/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/lib/org.argeo.slc.lib.jcr/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/lib/org.argeo.slc.lib.jcr/.project b/lib/org.argeo.slc.lib.jcr/.project deleted file mode 100644 index 8162314cd..000000000 --- a/lib/org.argeo.slc.lib.jcr/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.slc.lib.jcr - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/lib/org.argeo.slc.lib.jcr/.settings/org.eclipse.pde.core.prefs b/lib/org.argeo.slc.lib.jcr/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index f29e940a0..000000000 --- a/lib/org.argeo.slc.lib.jcr/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/lib/org.argeo.slc.lib.jcr/META-INF/.gitignore b/lib/org.argeo.slc.lib.jcr/META-INF/.gitignore deleted file mode 100644 index 4854a41b9..000000000 --- a/lib/org.argeo.slc.lib.jcr/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/lib/org.argeo.slc.lib.jcr/META-INF/spring/backup.xml b/lib/org.argeo.slc.lib.jcr/META-INF/spring/backup.xml deleted file mode 100644 index 7f33f5417..000000000 --- a/lib/org.argeo.slc.lib.jcr/META-INF/spring/backup.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - Backups a JCR repository - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/org.argeo.slc.lib.jcr/META-INF/spring/osgi.xml b/lib/org.argeo.slc.lib.jcr/META-INF/spring/osgi.xml deleted file mode 100644 index 1266686c5..000000000 --- a/lib/org.argeo.slc.lib.jcr/META-INF/spring/osgi.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/lib/org.argeo.slc.lib.jcr/bnd.bnd b/lib/org.argeo.slc.lib.jcr/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/org.argeo.slc.lib.jcr/build.properties b/lib/org.argeo.slc.lib.jcr/build.properties deleted file mode 100644 index 5f22cdd44..000000000 --- a/lib/org.argeo.slc.lib.jcr/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = META-INF/ diff --git a/lib/org.argeo.slc.lib.jcr/pom.xml b/lib/org.argeo.slc.lib.jcr/pom.xml deleted file mode 100644 index 216ed3f54..000000000 --- a/lib/org.argeo.slc.lib.jcr/pom.xml +++ /dev/null @@ -1,12 +0,0 @@ - - 4.0.0 - - org.argeo.slc - lib - 2.3-SNAPSHOT - .. - - org.argeo.slc.lib.jcr - SLC Lib - JCR Utilities - Utilities to transfer, convert, manage software repositories - diff --git a/lib/org.argeo.slc.lib.repo/.gitignore b/lib/org.argeo.slc.lib.repo/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/lib/org.argeo.slc.lib.repo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/lib/org.argeo.slc.lib.repo/.project b/lib/org.argeo.slc.lib.repo/.project deleted file mode 100644 index 1a9a2c8af..000000000 --- a/lib/org.argeo.slc.lib.repo/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.slc.lib.repo - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/lib/org.argeo.slc.lib.repo/META-INF/.gitignore b/lib/org.argeo.slc.lib.repo/META-INF/.gitignore deleted file mode 100644 index 4854a41b9..000000000 --- a/lib/org.argeo.slc.lib.repo/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/lib/org.argeo.slc.lib.repo/META-INF/spring/helloworld.xml b/lib/org.argeo.slc.lib.repo/META-INF/spring/helloworld.xml deleted file mode 100644 index 8e04d7ed0..000000000 --- a/lib/org.argeo.slc.lib.repo/META-INF/spring/helloworld.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - Print Hello World! - - - - - - Print Hello World! with variable - - - - - - - - - \ No newline at end of file diff --git a/lib/org.argeo.slc.lib.repo/META-INF/spring/importZip.xml b/lib/org.argeo.slc.lib.repo/META-INF/spring/importZip.xml deleted file mode 100644 index 58d44e2aa..000000000 --- a/lib/org.argeo.slc.lib.repo/META-INF/spring/importZip.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/org.argeo.slc.lib.repo/META-INF/spring/osgi.xml b/lib/org.argeo.slc.lib.repo/META-INF/spring/osgi.xml deleted file mode 100644 index 56f3b350e..000000000 --- a/lib/org.argeo.slc.lib.repo/META-INF/spring/osgi.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/org.argeo.slc.lib.repo/META-INF/spring/sync.xml b/lib/org.argeo.slc.lib.repo/META-INF/spring/sync.xml deleted file mode 100644 index b346e436f..000000000 --- a/lib/org.argeo.slc.lib.repo/META-INF/spring/sync.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/org.argeo.slc.lib.repo/bnd.bnd b/lib/org.argeo.slc.lib.repo/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/org.argeo.slc.lib.repo/build.properties b/lib/org.argeo.slc.lib.repo/build.properties deleted file mode 100644 index 5f22cdd44..000000000 --- a/lib/org.argeo.slc.lib.repo/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = META-INF/ diff --git a/lib/org.argeo.slc.lib.repo/pom.xml b/lib/org.argeo.slc.lib.repo/pom.xml deleted file mode 100644 index c19d0a5d0..000000000 --- a/lib/org.argeo.slc.lib.repo/pom.xml +++ /dev/null @@ -1,12 +0,0 @@ - - 4.0.0 - - org.argeo.slc - lib - 2.3-SNAPSHOT - .. - - org.argeo.slc.lib.repo - SLC Lib - Repository Utilities - Utilities related to JCR repositories - diff --git a/lib/org.argeo.slc.lib.rpmfactory/.gitignore b/lib/org.argeo.slc.lib.rpmfactory/.gitignore deleted file mode 100644 index b83d22266..000000000 --- a/lib/org.argeo.slc.lib.rpmfactory/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/lib/org.argeo.slc.lib.rpmfactory/.project b/lib/org.argeo.slc.lib.rpmfactory/.project deleted file mode 100644 index 845f3916f..000000000 --- a/lib/org.argeo.slc.lib.rpmfactory/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.slc.lib.rpmfactory - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/lib/org.argeo.slc.lib.rpmfactory/META-INF/.gitignore b/lib/org.argeo.slc.lib.rpmfactory/META-INF/.gitignore deleted file mode 100644 index 4854a41b9..000000000 --- a/lib/org.argeo.slc.lib.rpmfactory/META-INF/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/MANIFEST.MF diff --git a/lib/org.argeo.slc.lib.rpmfactory/META-INF/spring/helloworld.xml b/lib/org.argeo.slc.lib.rpmfactory/META-INF/spring/helloworld.xml deleted file mode 100644 index 8e04d7ed0..000000000 --- a/lib/org.argeo.slc.lib.rpmfactory/META-INF/spring/helloworld.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - Print Hello World! - - - - - - Print Hello World! with variable - - - - - - - - - \ No newline at end of file diff --git a/lib/org.argeo.slc.lib.rpmfactory/META-INF/spring/osgi.xml b/lib/org.argeo.slc.lib.rpmfactory/META-INF/spring/osgi.xml deleted file mode 100644 index 1b2b5bb33..000000000 --- a/lib/org.argeo.slc.lib.rpmfactory/META-INF/spring/osgi.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/lib/org.argeo.slc.lib.rpmfactory/bnd.bnd b/lib/org.argeo.slc.lib.rpmfactory/bnd.bnd deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/org.argeo.slc.lib.rpmfactory/build.properties b/lib/org.argeo.slc.lib.rpmfactory/build.properties deleted file mode 100644 index 5f22cdd44..000000000 --- a/lib/org.argeo.slc.lib.rpmfactory/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = META-INF/ diff --git a/lib/org.argeo.slc.lib.rpmfactory/pom.xml b/lib/org.argeo.slc.lib.rpmfactory/pom.xml deleted file mode 100644 index c6edc5c70..000000000 --- a/lib/org.argeo.slc.lib.rpmfactory/pom.xml +++ /dev/null @@ -1,12 +0,0 @@ - - 4.0.0 - - org.argeo.slc - lib - 2.3-SNAPSHOT - .. - - org.argeo.slc.lib.rpmfactory - SLC Lib - RPM Factory Utilities - Utilities related to RPM Factory - diff --git a/lib/pom.xml b/lib/pom.xml index d2a9168e6..9e0423217 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -10,12 +10,6 @@ pom SLC Standard Libs SLC execution modules for generic tasks, to be used as parent pom - - org.argeo.slc.lib.build - org.argeo.slc.lib.jcr - org.argeo.slc.lib.repo - org.argeo.slc.lib.rpmfactory - com.jcraft.jsch;resolution:=optional, @@ -23,20 +17,6 @@ - - - - - - - - - - - - - - org.apache.felix -- 2.30.2