From 5ff5e6e4b4e0928b9bae0da27a502b6a1885079f Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 7 Mar 2017 13:10:35 +0100 Subject: [PATCH] Reactivate: - SLC Libs - SLC Launcher - SLC Maven Support Clean up legacy --- demo/slc_demo_cli.properties | 16 +- dist/pom.xml | 2 +- .../slc-maven}/.gitignore | 0 dist/slc-maven/pom.xml | 9 +- dist/slc/pom.xml | 90 ++++++----- dist/slc/src/main/rpm/etc/slc-cl/config.ini | 12 +- dist/slc/src/main/rpm/usr/bin/slc | 4 +- legacy/doc/site/apt/gettingStarted.apt | 3 - .../doc/site/apt/howtos/howto-attachments.apt | 94 ----------- .../apt/howtos/howto-executionResources.apt | 92 ----------- .../site/apt/howtos/howto-migrateTo0_11_4.apt | 26 --- legacy/doc/site/apt/index.apt | 3 - legacy/doc/site/fml/faq.fml | 38 ----- legacy/doc/site/site.xml | 47 ------ .../META-INF/spring/cli-osgi.xml | 24 --- .../META-INF/spring/cli.xml | 23 --- .../modules/org.argeo.slc.agent.cli/pom.xml | 26 --- .../org.argeo.slc.server.repo.webapp/.project | 22 --- .../WEB-INF/applicationContext.xml | 11 -- .../WEB-INF/maven-servlet.xml | 28 ---- .../WEB-INF/osgi.xml | 24 --- .../WEB-INF/rpm-servlet.xml | 28 ---- .../WEB-INF/security.xml | 107 ------------- .../WEB-INF/web.xml | 67 -------- .../howto.html | 27 ---- .../org.argeo.slc.server.repo.webapp/pom.xml | 53 ------ .../style.css | 151 ------------------ legacy/modules/pom.xml | 37 ----- .../.settings/org.eclipse.jdt.core.prefs | 12 -- .../org.argeo.slc.launcher/log4j.properties | 21 --- legacy/runtime/org.argeo.slc.launcher/pom.xml | 71 -------- .../src/assembly/base.xml | 49 ------ .../src/main/base/launch.bat | 10 -- .../src/main/base/launch.sh | 27 ---- .../main/base/work/default/conf/config.ini | 7 - .../resources/org/argeo/slc/cli/jaas.config | 7 - .../src/site/apt/index.apt | 1 - .../org.argeo.slc.support.equinox/.classpath | 9 -- .../org.argeo.slc.support.equinox/.project | 28 ---- .../.settings/org.eclipse.jdt.core.prefs | 11 -- .../META-INF/spring/commandProvider.xml | 41 ----- .../META-INF/spring/osgi.xml | 24 --- .../build.properties | 9 -- .../equinox.properties | 4 - .../org.argeo.slc.support.equinox/pom.xml | 64 -------- .../org/argeo/slc/equinox/EquinoxRuntime.java | 35 ---- .../slc/equinox/ExecutionCommandProvider.java | 60 ------- .../java/org/argeo/slc/equinox/cli/Main.java | 34 ---- .../META-INF/MANIFEST.MF | 2 - .../META-INF/spring/hello.xml | 38 ----- .../org/argeo/slc/osgi/test/HelloTest.java | 51 ------ .../slc/osgi/test/PlatformStartStopTest.java | 34 ---- .../src/test/resources/META-INF/MANIFEST.MF | 2 - .../org.argeo.slc.support.jemmy/.classpath | 10 -- .../org.argeo.slc.support.jemmy/.project | 28 ---- .../.settings/org.eclipse.jdt.core.prefs | 12 -- .../build.properties | 4 - .../org.argeo.slc.support.jemmy/pom.xml | 50 ------ .../slc/jemmy/AbstractComponentWrapper.java | 125 --------------- .../java/org/argeo/slc/jemmy/Accessor.java | 22 --- .../java/org/argeo/slc/jemmy/Actuator.java | 22 --- .../org/argeo/slc/jemmy/ComponentWrapper.java | 36 ----- .../slc/jemmy/ConfigRuntimeException.java | 35 ---- .../slc/jemmy/FictiveComponentWrapper.java | 51 ------ .../argeo/slc/jemmy/PopupMenuActuator.java | 24 --- .../org/argeo/slc/jemmy/ReadAccessor.java | 23 --- .../argeo/slc/jemmy/UIRuntimeException.java | 35 ---- .../org/argeo/slc/jemmy/WrapperLocator.java | 23 --- .../org/argeo/slc/jemmy/WriteAccessor.java | 23 --- .../org.argeo.slc.support.maven/.project | 28 ---- .../.settings/org.eclipse.jdt.core.prefs | 12 -- .../src/test/resources/log4j.properties | 12 -- legacy/runtime/pom.xml | 32 ---- .../org.argeo.slc.lib.build}/.gitignore | 0 .../META-INF/.gitignore | 1 + lib/org.argeo.slc.lib.build/bnd.bnd | 0 lib/org.argeo.slc.lib.build/pom.xml | 5 +- lib/org.argeo.slc.lib.jcr/.gitignore | 1 + lib/org.argeo.slc.lib.jcr/META-INF/.gitignore | 1 + .../META-INF/spring/osgi.xml | 2 +- lib/org.argeo.slc.lib.jcr/bnd.bnd | 0 lib/org.argeo.slc.lib.jcr/pom.xml | 5 +- lib/org.argeo.slc.lib.repo/.gitignore | 1 + .../META-INF/.gitignore | 1 + lib/org.argeo.slc.lib.repo/bnd.bnd | 0 lib/org.argeo.slc.lib.repo/pom.xml | 5 +- lib/org.argeo.slc.lib.rpmfactory/.gitignore | 1 + .../META-INF/.gitignore | 1 + lib/org.argeo.slc.lib.rpmfactory/bnd.bnd | 0 lib/org.argeo.slc.lib.rpmfactory/pom.xml | 5 +- lib/pom.xml | 36 ++--- .../.classpath | 3 +- org.argeo.slc.launcher/.gitignore | 1 + .../.project | 0 org.argeo.slc.launcher/META-INF/.gitignore | 1 + org.argeo.slc.launcher/bnd.bnd | 1 + .../build.properties | 0 org.argeo.slc.launcher/pom.xml | 71 ++++++++ .../src}/org/argeo/slc/cli/SlcMain.java | 26 +-- .../src/org/argeo/slc/cli}/jaas.config | 0 .../src}/org/argeo/slc/cli/log4j.properties | 0 org.argeo.slc.support.maven/.classpath | 36 +++++ .../.classpath.old | 9 +- org.argeo.slc.support.maven/.gitignore | 2 + org.argeo.slc.support.maven/.project | 21 +++ org.argeo.slc.support.maven/MANIFEST.MF | 74 +++++++++ .../META-INF/.gitignore | 1 + .../META-INF/spring/maven-osgi.xml | 0 .../META-INF/spring/maven.xml | 0 org.argeo.slc.support.maven/bnd.bnd | 0 org.argeo.slc.support.maven/lib/.gitignore | 1 + .../pom.xml | 143 +++++++++++------ .../src}/org/argeo/slc/maven/CustomCli.java | 0 .../argeo/slc/maven/DependencyFileLoader.java | 0 .../argeo/slc/maven/ManualWagonProvider.java | 2 +- .../src}/org/argeo/slc/maven/MavenCall.java | 0 .../slc/maven/MavenDeployEnvironment.java | 0 .../src}/org/argeo/slc/maven/MavenFile.java | 0 .../org/argeo/slc/maven/MavenManager.java | 45 +++--- .../src}/org/argeo/slc/maven/MavenToUrl.java | 0 .../src}/org/argeo/slc/maven/RemoteRepo.java | 0 .../src/org/argeo/slc/maven}/build.xml | 0 pom.xml | 5 +- 123 files changed, 458 insertions(+), 2371 deletions(-) rename {legacy/runtime/org.argeo.slc.launcher => dist/slc-maven}/.gitignore (100%) delete mode 100644 legacy/doc/site/apt/gettingStarted.apt delete mode 100644 legacy/doc/site/apt/howtos/howto-attachments.apt delete mode 100644 legacy/doc/site/apt/howtos/howto-executionResources.apt delete mode 100644 legacy/doc/site/apt/howtos/howto-migrateTo0_11_4.apt delete mode 100644 legacy/doc/site/apt/index.apt delete mode 100644 legacy/doc/site/fml/faq.fml delete mode 100644 legacy/doc/site/site.xml delete mode 100644 legacy/modules/org.argeo.slc.agent.cli/META-INF/spring/cli-osgi.xml delete mode 100644 legacy/modules/org.argeo.slc.agent.cli/META-INF/spring/cli.xml delete mode 100644 legacy/modules/org.argeo.slc.agent.cli/pom.xml delete mode 100644 legacy/modules/org.argeo.slc.server.repo.webapp/.project delete mode 100644 legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/applicationContext.xml delete mode 100644 legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/maven-servlet.xml delete mode 100644 legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/osgi.xml delete mode 100644 legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/rpm-servlet.xml delete mode 100644 legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/security.xml delete mode 100644 legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/web.xml delete mode 100644 legacy/modules/org.argeo.slc.server.repo.webapp/howto.html delete mode 100644 legacy/modules/org.argeo.slc.server.repo.webapp/pom.xml delete mode 100644 legacy/modules/org.argeo.slc.server.repo.webapp/style.css delete mode 100644 legacy/modules/pom.xml delete mode 100644 legacy/runtime/org.argeo.slc.launcher/.settings/org.eclipse.jdt.core.prefs delete mode 100644 legacy/runtime/org.argeo.slc.launcher/log4j.properties delete mode 100644 legacy/runtime/org.argeo.slc.launcher/pom.xml delete mode 100644 legacy/runtime/org.argeo.slc.launcher/src/assembly/base.xml delete mode 100644 legacy/runtime/org.argeo.slc.launcher/src/main/base/launch.bat delete mode 100644 legacy/runtime/org.argeo.slc.launcher/src/main/base/launch.sh delete mode 100644 legacy/runtime/org.argeo.slc.launcher/src/main/base/work/default/conf/config.ini delete mode 100644 legacy/runtime/org.argeo.slc.launcher/src/main/resources/org/argeo/slc/cli/jaas.config delete mode 100644 legacy/runtime/org.argeo.slc.launcher/src/site/apt/index.apt delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/.classpath delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/.project delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/META-INF/spring/commandProvider.xml delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/META-INF/spring/osgi.xml delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/build.properties delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/equinox.properties delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/pom.xml delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/EquinoxRuntime.java delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/cli/Main.java delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/src/test/bundles/org.argeo.slc.support.osgi.test.hello/META-INF/MANIFEST.MF delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/src/test/bundles/org.argeo.slc.support.osgi.test.hello/META-INF/spring/hello.xml delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/PlatformStartStopTest.java delete mode 100644 legacy/runtime/org.argeo.slc.support.equinox/src/test/resources/META-INF/MANIFEST.MF delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/.classpath delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/.project delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/.settings/org.eclipse.jdt.core.prefs delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/build.properties delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/pom.xml delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/AbstractComponentWrapper.java delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/Accessor.java delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/Actuator.java delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/ComponentWrapper.java delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/ConfigRuntimeException.java delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/FictiveComponentWrapper.java delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/PopupMenuActuator.java delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/ReadAccessor.java delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/UIRuntimeException.java delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/WrapperLocator.java delete mode 100644 legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/WriteAccessor.java delete mode 100644 legacy/runtime/org.argeo.slc.support.maven/.project delete mode 100644 legacy/runtime/org.argeo.slc.support.maven/.settings/org.eclipse.jdt.core.prefs delete mode 100644 legacy/runtime/org.argeo.slc.support.maven/src/test/resources/log4j.properties delete mode 100644 legacy/runtime/pom.xml rename {legacy/runtime/org.argeo.slc.support.equinox => lib/org.argeo.slc.lib.build}/.gitignore (100%) create mode 100644 lib/org.argeo.slc.lib.build/META-INF/.gitignore create mode 100644 lib/org.argeo.slc.lib.build/bnd.bnd create mode 100644 lib/org.argeo.slc.lib.jcr/.gitignore create mode 100644 lib/org.argeo.slc.lib.jcr/META-INF/.gitignore create mode 100644 lib/org.argeo.slc.lib.jcr/bnd.bnd create mode 100644 lib/org.argeo.slc.lib.repo/.gitignore create mode 100644 lib/org.argeo.slc.lib.repo/META-INF/.gitignore create mode 100644 lib/org.argeo.slc.lib.repo/bnd.bnd create mode 100644 lib/org.argeo.slc.lib.rpmfactory/.gitignore create mode 100644 lib/org.argeo.slc.lib.rpmfactory/META-INF/.gitignore create mode 100644 lib/org.argeo.slc.lib.rpmfactory/bnd.bnd rename {legacy/runtime/org.argeo.slc.launcher => org.argeo.slc.launcher}/.classpath (68%) create mode 100644 org.argeo.slc.launcher/.gitignore rename {legacy/runtime/org.argeo.slc.launcher => org.argeo.slc.launcher}/.project (100%) create mode 100644 org.argeo.slc.launcher/META-INF/.gitignore create mode 100644 org.argeo.slc.launcher/bnd.bnd rename {legacy/runtime/org.argeo.slc.launcher => org.argeo.slc.launcher}/build.properties (100%) create mode 100644 org.argeo.slc.launcher/pom.xml rename {legacy/runtime/org.argeo.slc.launcher/src/main/java => org.argeo.slc.launcher/src}/org/argeo/slc/cli/SlcMain.java (94%) rename {legacy/runtime/org.argeo.slc.launcher => org.argeo.slc.launcher/src/org/argeo/slc/cli}/jaas.config (100%) rename {legacy/runtime/org.argeo.slc.launcher/src/main/resources => org.argeo.slc.launcher/src}/org/argeo/slc/cli/log4j.properties (100%) create mode 100644 org.argeo.slc.support.maven/.classpath rename legacy/runtime/org.argeo.slc.support.maven/.classpath => org.argeo.slc.support.maven/.classpath.old (87%) create mode 100644 org.argeo.slc.support.maven/.gitignore create mode 100644 org.argeo.slc.support.maven/.project create mode 100644 org.argeo.slc.support.maven/MANIFEST.MF create mode 100644 org.argeo.slc.support.maven/META-INF/.gitignore rename {legacy/runtime/org.argeo.slc.support.maven => org.argeo.slc.support.maven}/META-INF/spring/maven-osgi.xml (100%) rename {legacy/runtime/org.argeo.slc.support.maven => org.argeo.slc.support.maven}/META-INF/spring/maven.xml (100%) create mode 100644 org.argeo.slc.support.maven/bnd.bnd create mode 100644 org.argeo.slc.support.maven/lib/.gitignore rename {legacy/runtime/org.argeo.slc.support.maven => org.argeo.slc.support.maven}/pom.xml (61%) rename {legacy/runtime/org.argeo.slc.support.maven/src/main/java => org.argeo.slc.support.maven/src}/org/argeo/slc/maven/CustomCli.java (100%) rename {legacy/runtime/org.argeo.slc.support.maven/src/main/java => org.argeo.slc.support.maven/src}/org/argeo/slc/maven/DependencyFileLoader.java (100%) rename {legacy/runtime/org.argeo.slc.support.maven/src/main/java => org.argeo.slc.support.maven/src}/org/argeo/slc/maven/ManualWagonProvider.java (96%) rename {legacy/runtime/org.argeo.slc.support.maven/src/main/java => org.argeo.slc.support.maven/src}/org/argeo/slc/maven/MavenCall.java (100%) rename {legacy/runtime/org.argeo.slc.support.maven/src/main/java => org.argeo.slc.support.maven/src}/org/argeo/slc/maven/MavenDeployEnvironment.java (100%) rename {legacy/runtime/org.argeo.slc.support.maven/src/main/java => org.argeo.slc.support.maven/src}/org/argeo/slc/maven/MavenFile.java (100%) rename {legacy/runtime/org.argeo.slc.support.maven/src/main/java => org.argeo.slc.support.maven/src}/org/argeo/slc/maven/MavenManager.java (79%) rename {legacy/runtime/org.argeo.slc.support.maven/src/main/java => org.argeo.slc.support.maven/src}/org/argeo/slc/maven/MavenToUrl.java (100%) rename {legacy/runtime/org.argeo.slc.support.maven/src/main/java => org.argeo.slc.support.maven/src}/org/argeo/slc/maven/RemoteRepo.java (100%) rename {legacy/runtime/org.argeo.slc.support.maven/src/main/resources/org/argeo/slc/support/deploy/ant => org.argeo.slc.support.maven/src/org/argeo/slc/maven}/build.xml (100%) diff --git a/demo/slc_demo_cli.properties b/demo/slc_demo_cli.properties index 816be5f46..a0d31c7d3 100644 --- a/demo/slc_demo_cli.properties +++ b/demo/slc_demo_cli.properties @@ -1,15 +1,19 @@ argeo.osgi.start=\ -org.springframework.osgi.extender,\ -org.argeo.node.repo.jackrabbit,\ -org.argeo.security.dao.os,\ -org.argeo.slc.node.jackrabbit,\ +org.eclipse.equinox.cm,\ +org.argeo.cms,\ +org.eclipse.gemini.blueprint.extender,\ org.argeo.slc.agent,\ org.argeo.slc.agent.jcr,\ -org.argeo.slc.support.equinox,\ -org.argeo.slc.support.maven,\ + +#org.argeo.slc.support.maven,\ slc.executionModules=org.argeo.slc.demo.ant,\ org.argeo.slc.demo.basic,\ org.argeo.slc.demo.minimal,\ +argeo.node.repo.type=localfs + log4j.configuration=file:../../log4j.properties + +org.osgi.framework.security=osgi +java.security.policy=file:../../all.policy diff --git a/dist/pom.xml b/dist/pom.xml index 3c95a3544..2a9b85db1 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -12,7 +12,7 @@ SLC Distribution slc - + slc-maven diff --git a/legacy/runtime/org.argeo.slc.launcher/.gitignore b/dist/slc-maven/.gitignore similarity index 100% rename from legacy/runtime/org.argeo.slc.launcher/.gitignore rename to dist/slc-maven/.gitignore diff --git a/dist/slc-maven/pom.xml b/dist/slc-maven/pom.xml index 922ef1017..526c45a37 100644 --- a/dist/slc-maven/pom.xml +++ b/dist/slc-maven/pom.xml @@ -3,7 +3,8 @@ org.argeo.slc dist - 2.1.1-SNAPSHOT + 2.1.8-SNAPSHOT + .. slc-maven pom @@ -12,12 +13,12 @@ org.argeo.slc org.argeo.slc.support.maven - 2.1.1-SNAPSHOT + 2.1.8-SNAPSHOT org.argeo.slc org.argeo.slc.lib.build - 2.1.1-SNAPSHOT + 2.1.8-SNAPSHOT @@ -54,7 +55,7 @@ - slc-libs + slc-platform diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml index 90aa87780..b96cf8124 100644 --- a/dist/slc/pom.xml +++ b/dist/slc/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 org.argeo.slc dist 2.1.8-SNAPSHOT + .. slc pom @@ -66,19 +68,19 @@ org.argeo.slc org.argeo.slc.lib.jcr - 2.1.1-SNAPSHOT + 2.1.8-SNAPSHOT org.argeo.slc org.argeo.slc.lib.repo - 2.1.1-SNAPSHOT + 2.1.8-SNAPSHOT org.argeo.slc org.argeo.slc.launcher - 2.1.1-SNAPSHOT + 2.1.8-SNAPSHOT @@ -88,31 +90,31 @@ rpmbuild - - - - - - - - - - - - - - - - - - - - - - - - - + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies-rpm + package + + copy + + + jar + true + ${project.build.directory}/boot + + + org.argeo.slc + org.argeo.slc.launcher + ${project.version} + + + + + + org.codehaus.mojo rpm-maven-plugin @@ -175,21 +177,21 @@ - - - - - - - - - - - - - - - + + /usr/share/osgi/boot + root + root + 644 + false + + + ${project.build.directory}/boot + + org.argeo.slc.launcher.jar + + + + /var/lib/slc/.m2 diff --git a/dist/slc/src/main/rpm/etc/slc-cl/config.ini b/dist/slc/src/main/rpm/etc/slc-cl/config.ini index 46da9b666..31e805ae1 100644 --- a/dist/slc/src/main/rpm/etc/slc-cl/config.ini +++ b/dist/slc/src/main/rpm/etc/slc-cl/config.ini @@ -1,11 +1,11 @@ argeo.osgi.start=\ -org.springframework.osgi.extender,\ -org.argeo.node.repofactory.jackrabbit,\ -org.argeo.node.repo.jackrabbit,\ -org.argeo.security.dao.os,\ -org.argeo.slc.node.jackrabbit,\ +org.eclipse.equinox.cm,\ +org.argeo.cms,\ +org.eclipse.gemini.blueprint.extender,\ org.argeo.slc.agent,\ -org.argeo.slc.agent.jcr +org.argeo.slc.agent.jcr,\ + +argeo.node.repo.type=localfs # DO NOT CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING diff --git a/dist/slc/src/main/rpm/usr/bin/slc b/dist/slc/src/main/rpm/usr/bin/slc index 89425aa23..2ffee589f 100644 --- a/dist/slc/src/main/rpm/usr/bin/slc +++ b/dist/slc/src/main/rpm/usr/bin/slc @@ -3,7 +3,7 @@ JAVA_CMD=/usr/lib/jvm/java-1.8.0/bin/java JAVA_OPTS="-client -Xmx256m" -SLC_HOME_DIR=${HOME}/.slc/ +SLC_HOME_DIR=${HOME}/.local/share/slc/ if [ -f $SLC_HOME_DIR/settings.sh ];then . $SLC_HOME_DIR/settings.sh fi @@ -19,6 +19,8 @@ for i in "${OSGI_INSTALL_AREA}"/*.jar $JAVA_CMD $JAVA_OPTS \ "-Dargeo.osgi.bundles=$ARGEO_OSGI_BUNDLES" \ + -Dorg.osgi.framework.security=osgi \ + -Djava.security.policy="file:/etc/osgiboot/all.policy" \ -cp "$CLASSPATH" \ org.argeo.slc.cli.SlcMain "$@" \ No newline at end of file diff --git a/legacy/doc/site/apt/gettingStarted.apt b/legacy/doc/site/apt/gettingStarted.apt deleted file mode 100644 index 87d5a5c09..000000000 --- a/legacy/doc/site/apt/gettingStarted.apt +++ /dev/null @@ -1,3 +0,0 @@ -Development Environment - - First, you need to create a development environment. \ No newline at end of file diff --git a/legacy/doc/site/apt/howtos/howto-attachments.apt b/legacy/doc/site/apt/howtos/howto-attachments.apt deleted file mode 100644 index 1df2adcb7..000000000 --- a/legacy/doc/site/apt/howtos/howto-attachments.apt +++ /dev/null @@ -1,94 +0,0 @@ -Upload of attachments to a test result - - This allows to attach ANY Spring resource (for example the one created above but not only, since it can also be classpath: or osgibundle: Resources or ANY file on the file system where the agent is running (e.g. Mx *.mxres files on a server...)) - - In order to use it: - - [[1]] First reference an attachment uploader service via OSGi (it is provided by the standard agent): - -+-------------------------------+ - -+-------------------------------+ - - [[1]] Then use an UploadAttachment task: - -+-------------------------------+ - - - - - - - - - - - - - - -+-------------------------------+ - - You have to specify an Attachment object with at least a 'name', you can also specify a 'contentType', but the server will recognize common extension of the name. - You have to specify a (Spring) Resource, for example the one that you created before (the name of the attachment doesn't have to be the name of the file). - Just doing this will already upload a file to the server, but if you want to access it you need to bind it to some object, typically a TreeTestResult. You can provide a list of AttachmentEnabled objects (only TreeTestResult implements it so far). - - You could use directly Spring Resource URL, e.g.: - -+-------------------------------+ - -+-------------------------------+ - - You can also upload and attach many attachments in one shot. In that case provide a Map with the keys being Attachment objects and the values Resource objects. E.g.: - -+-------------------------------+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -+-------------------------------+ - - Retrieving the resources from this bean: - -+-------------------------------+ - - - - - -+-------------------------------+ - - [[1]] You can access the attachments from the Web UI by selecting a result in the list in the results perspective. - You will see that a new button 'Attachment' in the toolbar get activated (if there are any attachments). diff --git a/legacy/doc/site/apt/howtos/howto-executionResources.apt b/legacy/doc/site/apt/howtos/howto-executionResources.apt deleted file mode 100644 index a73cd5525..000000000 --- a/legacy/doc/site/apt/howtos/howto-executionResources.apt +++ /dev/null @@ -1,92 +0,0 @@ -Management of writable files within tests - - This provides an abstraction for files generated by the test. - - The files are stored in the standard osgi instance area (argument -data to an OSGi launch, default is a ./data directory in the execution directory) under a ${osgi.instance.area}/executionResources directory. - - A subdirectory is created for each execution, thus avoiding that the files override each other. - - The format of this directory is yyyyMMdd_HHmmss_ - - In order to use it: - - [[1]] First declare a ResourcesManager in your application context. It has to reference the SLC Execution Context (always available): - -+-------------------------------+ - - - -+-------------------------------+ - - [[1]] Then you can retrieve Spring Resources via a call to this manager. For example (it could also be an inner bean): - -+-------------------------------+ - - - - -+-------------------------------+ - - The "constructor argument" (just a Spring notation in this case) is a relative path that you want to give to this file. - Within a given execution, repeated calls on the manager with the same relative path will always point to the same file. - - [[1]] Then simply use this standard Spring Resource where required: - -+-------------------------------+ - - - - -+-------------------------------+ - - Underlying calls to the getFile() method of this resource won't fail (since they are writable). - -Factory bean for execution resources - - Here is an enhancement to declare execution resources: - -+-------------------------------+ - - - - - - - - - - - - - - - - - -+-------------------------------+ - - This allows to pass @{} execution parameters. - - The other form WON'T WORK if you try to passe @{} in the constructor-arg tag (but still works if the relative path does not contain a @{}): - -+-------------------------------+ - - - - - - - - - - - - - - - - -+-------------------------------+ - diff --git a/legacy/doc/site/apt/howtos/howto-migrateTo0_11_4.apt b/legacy/doc/site/apt/howtos/howto-migrateTo0_11_4.apt deleted file mode 100644 index a2493ffb8..000000000 --- a/legacy/doc/site/apt/howtos/howto-migrateTo0_11_4.apt +++ /dev/null @@ -1,26 +0,0 @@ -New naming for Argeo Maven Plugins - - Update your maven plugin shortcut in ~/.m2/settings.xml - -+-------------------------------+ - - - org.argeo.maven.plugins - - - -+-------------------------------+ - -Execution Modules Setup - - The following modules needs to be renamed in the Required-Bundle header of the MANIFEST.MF : -*-----------------------------------+-------------------------------+ -|0.11.3 |0.11.4 | -*-----------------------------------+-------------------------------+ -|org.argeo.slc.support.simple |org.argeo.slc.core | -*-----------------------------------+-------------------------------+ -|org.argeoslc.support.equinox |org.argeo.slc.support.osgi | -*-----------------------------------+-------------------------------+ diff --git a/legacy/doc/site/apt/index.apt b/legacy/doc/site/apt/index.apt deleted file mode 100644 index ae28f3bca..000000000 --- a/legacy/doc/site/apt/index.apt +++ /dev/null @@ -1,3 +0,0 @@ -Systems Life Cycle (SLC) - - SLC provides systems management and QA tools. diff --git a/legacy/doc/site/fml/faq.fml b/legacy/doc/site/fml/faq.fml deleted file mode 100644 index f367f7159..000000000 --- a/legacy/doc/site/fml/faq.fml +++ /dev/null @@ -1,38 +0,0 @@ - - - General - - - What is SLC for? - -

- It provides QA tools. -

- - - - - - Technical - - How do I start the demo? - -

- From the demo directory ( - cd demo - ) of the source distribution (or workingcopy) run: -
- mvn argeo-osgi:equinox -Pserver -
- then, in another console, also in the demo directory: -
- mvn argeo-osgi:equinox -Pagent -
- Then open - http://localhost:7070/org.argeo.slc.ria - -

- - - - \ No newline at end of file diff --git a/legacy/doc/site/site.xml b/legacy/doc/site/site.xml deleted file mode 100644 index aa8ebfd0f..000000000 --- a/legacy/doc/site/site.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - org.apache.maven.skins - maven-default-skin - 1.0 - - diff --git a/legacy/modules/org.argeo.slc.agent.cli/META-INF/spring/cli-osgi.xml b/legacy/modules/org.argeo.slc.agent.cli/META-INF/spring/cli-osgi.xml deleted file mode 100644 index 0e80b8e3f..000000000 --- a/legacy/modules/org.argeo.slc.agent.cli/META-INF/spring/cli-osgi.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/legacy/modules/org.argeo.slc.agent.cli/META-INF/spring/cli.xml b/legacy/modules/org.argeo.slc.agent.cli/META-INF/spring/cli.xml deleted file mode 100644 index 5c5759285..000000000 --- a/legacy/modules/org.argeo.slc.agent.cli/META-INF/spring/cli.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/legacy/modules/org.argeo.slc.agent.cli/pom.xml b/legacy/modules/org.argeo.slc.agent.cli/pom.xml deleted file mode 100644 index 1782441f7..000000000 --- a/legacy/modules/org.argeo.slc.agent.cli/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - 4.0.0 - - org.argeo.slc - modules - 2.1.1-SNAPSHOT - .. - - org.argeo.slc.agent.cli - SLC Agent CLI - - - - org.apache.felix - maven-bundle-plugin - - - - *, - - - - - - - \ No newline at end of file diff --git a/legacy/modules/org.argeo.slc.server.repo.webapp/.project b/legacy/modules/org.argeo.slc.server.repo.webapp/.project deleted file mode 100644 index 19a2b2fb1..000000000 --- a/legacy/modules/org.argeo.slc.server.repo.webapp/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.slc.server.repo.webapp - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/applicationContext.xml b/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/applicationContext.xml deleted file mode 100644 index a45053fd5..000000000 --- a/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/applicationContext.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/maven-servlet.xml b/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/maven-servlet.xml deleted file mode 100644 index 4ed9eb6bd..000000000 --- a/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/maven-servlet.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - mavenProxyServlet - - - - - - - - \ No newline at end of file diff --git a/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/osgi.xml b/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/osgi.xml deleted file mode 100644 index af8b4407e..000000000 --- a/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/osgi.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/rpm-servlet.xml b/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/rpm-servlet.xml deleted file mode 100644 index adb909acb..000000000 --- a/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/rpm-servlet.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - rpmProxyServlet - - - - - - - - \ No newline at end of file diff --git a/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/security.xml b/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/security.xml deleted file mode 100644 index 948d935c5..000000000 --- a/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/security.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - CONVERT_URL_TO_LOWERCASE_BEFORE_COMPARISON - PATTERN_TYPE_APACHE_ANT - /private/**=ROLE_USER - /**=IS_AUTHENTICATED_ANONYMOUSLY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Argeo Repository - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/web.xml b/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/web.xml deleted file mode 100644 index 3f58e7dde..000000000 --- a/legacy/modules/org.argeo.slc.server.repo.webapp/WEB-INF/web.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - index.jsp - - - Argeo SLC Repo Webapp - - - - contextConfigLocation - /WEB-INF/applicationContext.xml - - - - Spring Context - org.springframework.web.context.ContextLoaderListener - - - contextClass - org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext - - - - - rpm - org.springframework.web.servlet.DispatcherServlet - - contextClass - org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext - - 1 - - - rpm - /rpm/* - - - - - - - - - - - - - - - - - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - springSecurityFilterChain - /* - - - diff --git a/legacy/modules/org.argeo.slc.server.repo.webapp/howto.html b/legacy/modules/org.argeo.slc.server.repo.webapp/howto.html deleted file mode 100644 index ef88129ba..000000000 --- a/legacy/modules/org.argeo.slc.server.repo.webapp/howto.html +++ /dev/null @@ -1,27 +0,0 @@ - - - -SLC Repository - - - -

SLC Repository

-

This is a repository of OSGi bundles, which is compatible with Maven conventions. -

-

The first level refers to products, the second one to version branches of these products. -

-

When clicking on a version branch, an editors opens which allows to efficiently browse the available bundles. -

- -

Usage with maven repository compatible tools

-

There is one maven-style repository per branch. -

-

It is accessible anonymously at the following URL (if public access has been explicitly given to this branch):
-

http://[host]/data/public/java/[org.example.product]-[major.minor.x]
-

-

Or as an authenticated user (BASIC auth) belonging to ROLE_SLC, with read/write WebDav access:
-

https://[host]/data/files/java/[org.example.product]-[major.minor.x]
-

- - - \ No newline at end of file diff --git a/legacy/modules/org.argeo.slc.server.repo.webapp/pom.xml b/legacy/modules/org.argeo.slc.server.repo.webapp/pom.xml deleted file mode 100644 index 85c2fca03..000000000 --- a/legacy/modules/org.argeo.slc.server.repo.webapp/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - 4.0.0 - - org.argeo.slc - modules - 2.1.1-SNAPSHOT - .. - - org.argeo.slc.server.repo.webapp - SLC Repo Web App - - - - org.apache.felix - maven-bundle-plugin - - - repo - - - *, - javax.jcr, - javax.servlet, - javax.servlet.http, - javax.servlet.resources, - org.argeo.jcr.mvc, - org.argeo.security.core, - org.argeo.security.jcr, - org.argeo.slc.aether.spring, - org.argeo.slc.repo, - org.argeo.slc.rpmfactory, - org.springframework.osgi.web.context.support, - org.springframework.security, - org.springframework.security.context, - org.springframework.security.intercept.web, - org.springframework.security.providers.anonymous, - org.springframework.security.ui, - org.springframework.security.ui.basicauth, - org.springframework.security.ui.logout, - org.springframework.security.util, - org.springframework.security.vote, - org.springframework.security.wrapper, - org.springframework.web.context, - org.springframework.web.filter, - org.springframework.web.servlet, - org.springframework.web.servlet.handler - - - - - - - \ No newline at end of file diff --git a/legacy/modules/org.argeo.slc.server.repo.webapp/style.css b/legacy/modules/org.argeo.slc.server.repo.webapp/style.css deleted file mode 100644 index d7e7730bc..000000000 --- a/legacy/modules/org.argeo.slc.server.repo.webapp/style.css +++ /dev/null @@ -1,151 +0,0 @@ -/* Generic Selectors */ -body { - font-family: sans-serif; - font-size: 12px; - color: black; - background-color: white; -} - -li { - list-style-type: none; -} - -h1 { - font-family: sans-serif; - font-size: 16px; - font-weight: bold; - color: #000000; - padding: 0px 0px 5px 0px; - margin: 0px; -} - -h2 { - font-family: sans-serif; - font-size: 14px; - font-weight: bold; - color: #000000; - padding: 5px 0px 5px 0px; - margin: 0px; - margin-top: 5px; -} - -table,form { - margin: 0px; -} - -img { - border: none; -} - -div { - font-size: 100%; -} - -tr.list:hover { - background-color: lightgrey; -} - -td.list { - border-top: 1px solid lighgrey; - padding: 2px 20px 2px 2px; - padding-right: 15px; -} - -th { - font-size: 12px; - padding: 2px 20px 2px 2px; - vertical-align: top; - text-align: left; -} - -td { - font-size: 12px; - padding: 1px; - vertical-align: middle; - text-align: left; -} - -/**************** Navigation ****************/ -td.nav1 { - padding: 5px 0px 0px 0px; - font-size: 12px; - font-weight: bold; -} - -td.nav2 { - padding: 0px 0px 0px 5px; - font-size: 12px; -} - -/**************** Forms ****************/ -input.submit { - border: solid 1px grey; - background-color: lightgrey; - align: right; -} - -input.submit:hover { - border: solid 1px #3399FF; - background-color: white; - color: #3399FF; -} - -input.std { - border: solid 1px lightgrey; - padding: 1px; - margin: 2px; -} - -.formError { - color: red; - padding: 1px; - margin: 2px; - font-weight: bold; -} - -/**************** Pseudo classes ****************/ -a:link { - color: #0066CC; - text-decoration: none; -} - -a:visited { - color: #0066CC; - text-decoration: none; -} - -a:hover { - color: #3399FF; - text-decoration: none; -} - -/************************* ID's *************************/ -#main { - position: absolute; - margin-left: 180px; - padding-top: 65px; -} - -#navigation { - position: absolute; - width: 150px; - height: 800px; - border-right: 1px solid #0066CC; - font-weight: normal; - margin-top: 60px; - margin-left: 10px; -} - -#banner { - position: absolute; - width: 400px; - height: 50px; -} - -#upperRight { - position: absolute; - top: 0; - right: 0; - margin-top: 20px; - margin-right: 10px; -} \ No newline at end of file diff --git a/legacy/modules/pom.xml b/legacy/modules/pom.xml deleted file mode 100644 index e3906710c..000000000 --- a/legacy/modules/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - 4.0.0 - - org.argeo.slc - argeo-slc - 2.1.1-SNAPSHOT - .. - - modules - SLC Modules - pom - - org.argeo.slc.ext.castor - org.argeo.slc.agent - org.argeo.slc.agent.jcr - org.argeo.slc.agent.cli - org.argeo.slc.node.jackrabbit - org.argeo.slc.server.repo - org.argeo.slc.server.repo.webapp - - - - - . - - ** - - - .* - .*/** - pom.xml - build.properties - - - - - diff --git a/legacy/runtime/org.argeo.slc.launcher/.settings/org.eclipse.jdt.core.prefs b/legacy/runtime/org.argeo.slc.launcher/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 964778b0e..000000000 --- a/legacy/runtime/org.argeo.slc.launcher/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Fri Aug 29 11:31:46 CEST 2008 -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.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -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/legacy/runtime/org.argeo.slc.launcher/log4j.properties b/legacy/runtime/org.argeo.slc.launcher/log4j.properties deleted file mode 100644 index 92553a61a..000000000 --- a/legacy/runtime/org.argeo.slc.launcher/log4j.properties +++ /dev/null @@ -1,21 +0,0 @@ -log4j.rootLogger=WARN, console -#log4j.rootLogger=DEBUG, development - -## Levels -log4j.logger.org.argeo=INFO - -log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR -log4j.logger.org.apache.jackrabbit.core.config.ConfigurationErrorHandler=ERROR -log4j.logger.org.apache.jackrabbit.core.util.db.DbUtility=FATAL - -## Appenders -# default appender -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} %m%n - -# development appender -log4j.appender.development=org.apache.log4j.ConsoleAppender -log4j.appender.development.layout=org.apache.log4j.PatternLayout -#log4j.appender.development.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%16.16t] %5p %m (%F:%L) %c%n -log4j.appender.development.layout.ConversionPattern=%d{HH:mm:ss,SSS} %5p %m [%16.16t] %c%n diff --git a/legacy/runtime/org.argeo.slc.launcher/pom.xml b/legacy/runtime/org.argeo.slc.launcher/pom.xml deleted file mode 100644 index c175c7456..000000000 --- a/legacy/runtime/org.argeo.slc.launcher/pom.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - 4.0.0 - - org.argeo.slc - runtime - 2.1.1-SNAPSHOT - .. - - org.argeo.slc.launcher - jar - SLC Launcher - - - - org.apache.maven.plugins - maven-assembly-plugin - - - src/assembly/base.xml - - - - - assembly-base - package - - single - - - - - - org.apache.felix - maven-bundle-plugin - - - org.argeo.slc.cli.SlcMain - - - - - maven-resources-plugin - - - validate - - copy-resources - - - ${basedir}/target/base - - - src/main/base - true - - - - - - - - - - - org.argeo.commons.base - org.argeo.osgi.boot - ${version.argeo-commons} - - - \ No newline at end of file diff --git a/legacy/runtime/org.argeo.slc.launcher/src/assembly/base.xml b/legacy/runtime/org.argeo.slc.launcher/src/assembly/base.xml deleted file mode 100644 index b0f4a625b..000000000 --- a/legacy/runtime/org.argeo.slc.launcher/src/assembly/base.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - base - false - - tar.gz - - - - target/base - - 0755 - - *.sh - - - - target/base - - - *.bat - - - - target/base - - - work/** - - - - \ No newline at end of file diff --git a/legacy/runtime/org.argeo.slc.launcher/src/main/base/launch.bat b/legacy/runtime/org.argeo.slc.launcher/src/main/base/launch.bat deleted file mode 100644 index c76e95278..000000000 --- a/legacy/runtime/org.argeo.slc.launcher/src/main/base/launch.bat +++ /dev/null @@ -1,10 +0,0 @@ -@echo off -set ROOT_DIR=%~dp0 -set LIB_DIR=%ROOT_DIR%\lib -set WORK_DIR=%ROOT_DIR%\work\%1 - -TITLE %1 - -cd %WORK_DIR% - -java %JAVA_OPTS% -jar "%LIB_DIR%\org.eclipse.osgi-${version.equinox}.jar" -clean -console -configuration "%WORK_DIR%\conf" -data "%WORK_DIR%\data" \ No newline at end of file diff --git a/legacy/runtime/org.argeo.slc.launcher/src/main/base/launch.sh b/legacy/runtime/org.argeo.slc.launcher/src/main/base/launch.sh deleted file mode 100644 index ead337f32..000000000 --- a/legacy/runtime/org.argeo.slc.launcher/src/main/base/launch.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -INSTANCE=$1 - -ROOT_DIR=`pwd` -LIB_DIR=$ROOT_DIR/lib - -# Defaults -if [ -z "$INSTANCE" ]; then - INSTANCE=agent -fi - -echo "Using configuration: $INSTANCE" - -WORK_DIR=$ROOT_DIR/work/$INSTANCE -if [ -z "$JAVA_OPTS" ]; then - JAVA_OPTS=-Xmx256m -fi - -if [ -d "$WORK_DIR" ]; then -cd $WORK_DIR -java $JAVA_OPTS -jar $LIB_DIR/org.eclipse.osgi-${version.equinox}.jar \ - -clean -console \ - -configuration $WORK_DIR/conf \ - -data $WORK_DIR/data -else - echo "$WORK_DIR does not exist. Please specify a proper configuration name." -fi diff --git a/legacy/runtime/org.argeo.slc.launcher/src/main/base/work/default/conf/config.ini b/legacy/runtime/org.argeo.slc.launcher/src/main/base/work/default/conf/config.ini deleted file mode 100644 index cc32c30f7..000000000 --- a/legacy/runtime/org.argeo.slc.launcher/src/main/base/work/default/conf/config.ini +++ /dev/null @@ -1,7 +0,0 @@ -osgi.bundles=org.argeo.osgi.boot-${version.argeo-commons}.jar@start -argeo.osgi.bundles=${osgi.install.area};in=*.jar -argeo.osgi.start=org.springframework.osgi.extender,\ - org.argeo.slc.agent,\ - org.argeo.slc.agent.jms,\ - org.argeo.slc.support.equinox - diff --git a/legacy/runtime/org.argeo.slc.launcher/src/main/resources/org/argeo/slc/cli/jaas.config b/legacy/runtime/org.argeo.slc.launcher/src/main/resources/org/argeo/slc/cli/jaas.config deleted file mode 100644 index 2fc119839..000000000 --- a/legacy/runtime/org.argeo.slc.launcher/src/main/resources/org/argeo/slc/cli/jaas.config +++ /dev/null @@ -1,7 +0,0 @@ -NIX { - com.sun.security.auth.module.UnixLoginModule required; -}; - -WINDOWS { - com.sun.security.auth.module.NTLoginModule required; -}; diff --git a/legacy/runtime/org.argeo.slc.launcher/src/site/apt/index.apt b/legacy/runtime/org.argeo.slc.launcher/src/site/apt/index.apt deleted file mode 100644 index f414460db..000000000 --- a/legacy/runtime/org.argeo.slc.launcher/src/site/apt/index.apt +++ /dev/null @@ -1 +0,0 @@ -Argeo SLC Site \ No newline at end of file diff --git a/legacy/runtime/org.argeo.slc.support.equinox/.classpath b/legacy/runtime/org.argeo.slc.support.equinox/.classpath deleted file mode 100644 index af0543918..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - >> - - - diff --git a/legacy/runtime/org.argeo.slc.support.equinox/.project b/legacy/runtime/org.argeo.slc.support.equinox/.project deleted file mode 100644 index 19404bc7a..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.argeo.slc.support.equinox - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/legacy/runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs b/legacy/runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8000cd6ca..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/legacy/runtime/org.argeo.slc.support.equinox/META-INF/spring/commandProvider.xml b/legacy/runtime/org.argeo.slc.support.equinox/META-INF/spring/commandProvider.xml deleted file mode 100644 index 92b5e0ee0..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/META-INF/spring/commandProvider.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/legacy/runtime/org.argeo.slc.support.equinox/META-INF/spring/osgi.xml b/legacy/runtime/org.argeo.slc.support.equinox/META-INF/spring/osgi.xml deleted file mode 100644 index cb7f0ae4b..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/META-INF/spring/osgi.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/legacy/runtime/org.argeo.slc.support.equinox/build.properties b/legacy/runtime/org.argeo.slc.support.equinox/build.properties deleted file mode 100644 index d8c27f722..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/build.properties +++ /dev/null @@ -1,9 +0,0 @@ -additional.bundles = org.argeo.slc.core,\ - org.springframework.context,\ - org.argeo.slc.unit,\ - junit,\ - org.argeo.osgi.boot,\ - org.eclipse.osgi -source.. = src/main/java/,\ - src/test/java/,\ - src/test/resources/ diff --git a/legacy/runtime/org.argeo.slc.support.equinox/equinox.properties b/legacy/runtime/org.argeo.slc.support.equinox/equinox.properties deleted file mode 100644 index dae8b2e67..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/equinox.properties +++ /dev/null @@ -1,4 +0,0 @@ -# Timeout for the SLC command in the OSGi console (in ms) -slc.equinox.commandTimeout=10000 -# Polling period for synchronous OSGi commands (in ms) -slc.equinox.commandPollingPeriod=100 \ No newline at end of file diff --git a/legacy/runtime/org.argeo.slc.support.equinox/pom.xml b/legacy/runtime/org.argeo.slc.support.equinox/pom.xml deleted file mode 100644 index e2cd18d69..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - 4.0.0 - - org.argeo.slc - runtime - 2.1.1-SNAPSHOT - .. - - org.argeo.slc.support.equinox - SLC Support Equinox - jar - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - true - - - - org.apache.felix - maven-bundle-plugin - - - - org.argeo.slc.* - - *, - org.springframework.beans.factory.config, - org.springframework.osgi.context.event, - org.springframework.core.io - - - - - - - - - org.argeo.slc - org.argeo.slc.support.osgi - 2.1.1-SNAPSHOT - - - - org.argeo.tp - org.eclipse.osgi - - - - - org.argeo.slc - org.argeo.slc.unit - test - 2.1.1-SNAPSHOT - - - \ No newline at end of file diff --git a/legacy/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/EquinoxRuntime.java b/legacy/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/EquinoxRuntime.java deleted file mode 100644 index 134bdfa2b..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/EquinoxRuntime.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.equinox; - -import org.argeo.slc.SlcException; -import org.argeo.slc.osgi.OsgiRuntime; -import org.eclipse.core.runtime.adaptor.EclipseStarter; - -/** OSGi runtime with shutdown capability implemented. */ -@SuppressWarnings("restriction") -@Deprecated -public class EquinoxRuntime extends OsgiRuntime { - - public void shutdown() { - try { - EclipseStarter.shutdown(); - } catch (Exception e) { - throw new SlcException("Cannot shutdown Equinox runtime.", e); - } - } - -} diff --git a/legacy/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java b/legacy/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java deleted file mode 100644 index 94ccf2649..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.equinox; - -import java.util.ArrayList; -import java.util.List; - -import org.argeo.slc.SlcException; -import org.argeo.slc.execution.SlcAgentCli; -import org.eclipse.osgi.framework.console.CommandInterpreter; -import org.eclipse.osgi.framework.console.CommandProvider; - -public class ExecutionCommandProvider implements CommandProvider { - private SlcAgentCli agentCli; - - private String lastProcessUuid; - - public Object _slc(CommandInterpreter ci) { - List args = new ArrayList(); - String arg = null; - while ((arg = ci.nextArgument()) != null) - args.add(arg); - if (args.size() == 0) { - // TODO relaunch last process - ci.execute("help"); - throw new SlcException("Command not properly formatted"); - } - - lastProcessUuid = agentCli - .process(args.toArray(new String[args.size()])); - return lastProcessUuid; - } - - public String getHelp() { - StringBuffer buf = new StringBuffer(); - buf.append("---SLC Execution Commands---\n"); - buf.append("\tslc [[ --arg value | --booleanArg ]]" - + " - executes an execution flow\n"); - return buf.toString(); - - } - - public void setAgentCli(SlcAgentCli agentCli) { - this.agentCli = agentCli; - } - -} diff --git a/legacy/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/cli/Main.java b/legacy/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/cli/Main.java deleted file mode 100644 index 4258b8aae..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/cli/Main.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.equinox.cli; - -import org.eclipse.core.runtime.adaptor.EclipseStarter; - -@SuppressWarnings("restriction") -public class Main { - - public static void main(String[] args) { - try { - String confDir = ""; - String[] equinoxArgs = { "-console", "-conf", confDir }; - EclipseStarter.startup(equinoxArgs, null); - - } catch (Exception e) { - e.printStackTrace(); - } - - } -} diff --git a/legacy/runtime/org.argeo.slc.support.equinox/src/test/bundles/org.argeo.slc.support.osgi.test.hello/META-INF/MANIFEST.MF b/legacy/runtime/org.argeo.slc.support.equinox/src/test/bundles/org.argeo.slc.support.osgi.test.hello/META-INF/MANIFEST.MF deleted file mode 100644 index 59453934b..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/src/test/bundles/org.argeo.slc.support.osgi.test.hello/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-SymbolicName: org.argeo.slc.support.osgi.test.hello -Bundle-Version: 0.1.0 diff --git a/legacy/runtime/org.argeo.slc.support.equinox/src/test/bundles/org.argeo.slc.support.osgi.test.hello/META-INF/spring/hello.xml b/legacy/runtime/org.argeo.slc.support.equinox/src/test/bundles/org.argeo.slc.support.osgi.test.hello/META-INF/spring/hello.xml deleted file mode 100644 index d1303ea43..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/src/test/bundles/org.argeo.slc.support.osgi.test.hello/META-INF/spring/hello.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/legacy/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java b/legacy/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java deleted file mode 100644 index b519e0f5d..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.osgi.test; - -import java.util.ArrayList; -import java.util.List; - -import org.argeo.slc.equinox.unit.AbstractOsgiRuntimeTestCase; -import org.argeo.osgi.boot.OsgiBoot; - -public class HelloTest extends AbstractOsgiRuntimeTestCase { - public void testHello() throws Exception { - Thread.sleep(2000); - } - - protected void installBundles() throws Exception { - // System.out.println("java.class.path=" - // + System.getProperty("java.class.path")); - - osgiBoot.installUrls(osgiBoot.getLocationsUrls( - OsgiBoot.DEFAULT_BASE_URL, - System.getProperty("java.class.path"))); - osgiBoot.installUrls(osgiBoot.getBundlesUrls("src/test/bundles;in=*")); - - // Map sysProps = new TreeMap(System.getProperties()); - // for (String key : sysProps.keySet()) { - // System.out.println(key + "=" + sysProps.get(key)); - // } - } - - protected List getBundlesToStart() { - List bundlesToStart = new ArrayList(); - // bundlesToStart.add("org.springframework.osgi.extender"); - bundlesToStart.add("org.argeo.slc.support.osgi.test.hello"); - return bundlesToStart; - } - -} diff --git a/legacy/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/PlatformStartStopTest.java b/legacy/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/PlatformStartStopTest.java deleted file mode 100644 index 579c7eda3..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/PlatformStartStopTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.osgi.test; - -import org.argeo.slc.equinox.unit.AbstractOsgiRuntimeTestCase; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; - -public class PlatformStartStopTest extends AbstractOsgiRuntimeTestCase { - - public void testStartStop() { - BundleContext bundleContext = osgiBoot.getBundleContext(); - System.out.println(bundleContext - .getProperty(Constants.FRAMEWORK_VENDOR)); - System.out.println(bundleContext - .getProperty(Constants.FRAMEWORK_VERSION)); - System.out.println(bundleContext - .getProperty(Constants.FRAMEWORK_EXECUTIONENVIRONMENT)); - - } -} diff --git a/legacy/runtime/org.argeo.slc.support.equinox/src/test/resources/META-INF/MANIFEST.MF b/legacy/runtime/org.argeo.slc.support.equinox/src/test/resources/META-INF/MANIFEST.MF deleted file mode 100644 index e67d3f8dc..000000000 --- a/legacy/runtime/org.argeo.slc.support.equinox/src/test/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Bundle-SymbolicName: org.argeo.slc.support.osgi.tests -Fragment-Host: org.argeo.slc.support.osgi \ No newline at end of file diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/.classpath b/legacy/runtime/org.argeo.slc.support.jemmy/.classpath deleted file mode 100644 index e7acc2254..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/.project b/legacy/runtime/org.argeo.slc.support.jemmy/.project deleted file mode 100644 index 057f24f1d..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.argeo.slc.support.jemmy - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/.settings/org.eclipse.jdt.core.prefs b/legacy/runtime/org.argeo.slc.support.jemmy/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index af1c19dae..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Tue Jul 21 11:27:46 CEST 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/build.properties b/legacy/runtime/org.argeo.slc.support.jemmy/build.properties deleted file mode 100644 index 7c51e9efe..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/main/java/,\ - src/main/resources/,\ - src/test/java/,\ - src/test/resources/ diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/pom.xml b/legacy/runtime/org.argeo.slc.support.jemmy/pom.xml deleted file mode 100644 index db6bce362..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - 4.0.0 - - org.argeo.slc - runtime - 2.1.1-SNAPSHOT - .. - - org.argeo.slc.support.jemmy - SLC Support Jemmy - Helper classes for the Jemmy framework - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - - - org.apache.felix - maven-bundle-plugin - - - - J2SE-1.4 - - org.argeo.slc.jemmy - - org.netbeans.jemmy, - org.netbeans.jemmy.operators, - org.netbeans.jemmy.util - - - - - - - - - - - org.argeo.tp - org.argeo.dep.jemmy.nb61 - - - - \ No newline at end of file diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/AbstractComponentWrapper.java b/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/AbstractComponentWrapper.java deleted file mode 100644 index 65e64f5ff..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/AbstractComponentWrapper.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.jemmy; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.netbeans.jemmy.operators.ComponentOperator; - -public class AbstractComponentWrapper implements ComponentWrapper { - - protected ComponentWrapper parent; - - /** - * List of children ComponentWrapper - */ - protected List children = new ArrayList(); - - protected WrapperLocator locator; - - protected String prefix; - - public ComponentOperator find() { - return locator.find(this); - } - - protected String createNewKey(String oldKey) { - return (prefix == null) ? oldKey : (prefix + "." + oldKey); - } - - protected void addToAccessorMap(Map accessors, String oldKey, - Object accessor) { - String newKey = createNewKey(oldKey); - if (accessors.containsKey(newKey)) { - throw new ConfigRuntimeException("An Accessor with key '" + newKey - + "' was already registered"); - } - accessors.put(newKey, accessor); - } - - public Map getAccessors(Class accessorClass) { - Map accessors = new HashMap(); - if (accessorClass.isInstance(this)) { - addToAccessorMap(accessors, ((Accessor) this).getFieldName(), this); - } - for (int i = 0; i < children.size(); i++) { - Map childAccessors = ((ComponentWrapper) children.get(i)) - .getAccessors(accessorClass); - - Set entries = childAccessors.entrySet(); - Iterator it = entries.iterator(); - - while (it.hasNext()) { - Map.Entry keyValue = (Map.Entry) it.next(); - addToAccessorMap(accessors, keyValue.getKey().toString(), - keyValue.getValue()); - } - } - return accessors; - } - - public ComponentWrapper getParent() { - return parent; - } - - public void setParent(ComponentWrapper parent) { - if (this.parent != null) { - throw new ConfigRuntimeException("Parent already set"); - } - this.parent = parent; - } - - public List getChildren() { - return children; - } - - public void setChildren(List children) { - this.children = children; - - // check that all elements of the list are ComponentWrapper - // and set their parent - for (int i = 0; i < this.children.size(); i++) { - ComponentWrapper wrapper = (ComponentWrapper) this.children.get(i); - if (wrapper == null) { - throw new ConfigRuntimeException( - "Children of ComponentWrappers must be ComponentWrappers"); - } - wrapper.setParent(this); - } - } - - public WrapperLocator getLocator() { - return locator; - } - - public void setLocator(WrapperLocator locator) { - this.locator = locator; - } - - public String getPrefix() { - return prefix; - } - - public void setPrefix(String prefix) { - this.prefix = prefix; - } - -} diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/Accessor.java b/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/Accessor.java deleted file mode 100644 index c4d74a1bb..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/Accessor.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.jemmy; - -public interface Accessor { - - public String getFieldName(); - -} diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/Actuator.java b/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/Actuator.java deleted file mode 100644 index 93734fe03..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/Actuator.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.jemmy; - - -public interface Actuator extends Accessor { - - void perform(); -} diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/ComponentWrapper.java b/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/ComponentWrapper.java deleted file mode 100644 index 69e5bfedf..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/ComponentWrapper.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.jemmy; - -import java.util.Map; - -import org.netbeans.jemmy.operators.ComponentOperator; - -public interface ComponentWrapper { - - /** - * Finds the component described by the ComponentWrapper - * in the GUI - * @return a Jemmy ComponentOperator for the found component - */ - public ComponentOperator find(); - - public void setParent(ComponentWrapper parent); - - public ComponentWrapper getParent(); - - public Map getAccessors(Class accessorClass); -} diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/ConfigRuntimeException.java b/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/ConfigRuntimeException.java deleted file mode 100644 index 1be2cd1ba..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/ConfigRuntimeException.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.jemmy; - -public class ConfigRuntimeException extends UIRuntimeException{ - /** - * - */ - private static final long serialVersionUID = 1L; - public ConfigRuntimeException(){ - super(); - } - public ConfigRuntimeException(String s){ - super(s); - } - public ConfigRuntimeException(Throwable t){ - super(t); - } - public ConfigRuntimeException(String s, Throwable t){ - super(s,t); - } -} diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/FictiveComponentWrapper.java b/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/FictiveComponentWrapper.java deleted file mode 100644 index f2bc9a5a3..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/FictiveComponentWrapper.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.jemmy; - -import java.util.HashMap; -import java.util.Map; - -import org.netbeans.jemmy.operators.ComponentOperator; - -public class FictiveComponentWrapper implements ComponentWrapper { - - protected ComponentWrapper parent; - - public ComponentOperator find() { - // just ask the parent - return parent.find(); - } - - /** - * Return only itself (if the class matches) - */ - public Map getAccessors(Class accessorClass) { - Map accessors = new HashMap(); - if (accessorClass.isInstance(this)) { - accessors.put(((Accessor) this).getFieldName(), this); - } - return accessors; - } - - public ComponentWrapper getParent() { - return parent; - } - - public void setParent(ComponentWrapper parent) { - this.parent = parent; - } - -} diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/PopupMenuActuator.java b/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/PopupMenuActuator.java deleted file mode 100644 index ebe0738d3..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/PopupMenuActuator.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.jemmy; - -public interface PopupMenuActuator extends Accessor { - /** - * Popup the context menu and optionally select an item. - * @param menu - A list of items to choose on each menu level, separated by '|' - */ - void select(String menu); -} diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/ReadAccessor.java b/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/ReadAccessor.java deleted file mode 100644 index bf845db7e..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/ReadAccessor.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.jemmy; - - -public interface ReadAccessor extends Accessor { - - public String get(); - -} diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/UIRuntimeException.java b/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/UIRuntimeException.java deleted file mode 100644 index cee325aab..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/UIRuntimeException.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.jemmy; - -public class UIRuntimeException extends RuntimeException { - /** - * - */ - private static final long serialVersionUID = 1L; - public UIRuntimeException(){ - super(); - } - public UIRuntimeException(String s){ - super(s); - } - public UIRuntimeException(Throwable t){ - super(t); - } - public UIRuntimeException(String s, Throwable t){ - super(s,t); - } -} diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/WrapperLocator.java b/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/WrapperLocator.java deleted file mode 100644 index 5e2dec101..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/WrapperLocator.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.jemmy; - -import org.netbeans.jemmy.operators.ComponentOperator; - -public interface WrapperLocator { - - public ComponentOperator find(ComponentWrapper wrapper); -} diff --git a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/WriteAccessor.java b/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/WriteAccessor.java deleted file mode 100644 index 109e21781..000000000 --- a/legacy/runtime/org.argeo.slc.support.jemmy/src/main/java/org/argeo/slc/jemmy/WriteAccessor.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.argeo.slc.jemmy; - - -public interface WriteAccessor extends Accessor { - - public void set(String value); - -} diff --git a/legacy/runtime/org.argeo.slc.support.maven/.project b/legacy/runtime/org.argeo.slc.support.maven/.project deleted file mode 100644 index 6d444af5a..000000000 --- a/legacy/runtime/org.argeo.slc.support.maven/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.argeo.slc.support.maven - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/legacy/runtime/org.argeo.slc.support.maven/.settings/org.eclipse.jdt.core.prefs b/legacy/runtime/org.argeo.slc.support.maven/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 964778b0e..000000000 --- a/legacy/runtime/org.argeo.slc.support.maven/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Fri Aug 29 11:31:46 CEST 2008 -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.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -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/legacy/runtime/org.argeo.slc.support.maven/src/test/resources/log4j.properties b/legacy/runtime/org.argeo.slc.support.maven/src/test/resources/log4j.properties deleted file mode 100644 index a912c0c65..000000000 --- a/legacy/runtime/org.argeo.slc.support.maven/src/test/resources/log4j.properties +++ /dev/null @@ -1,12 +0,0 @@ -# Set root logger level to DEBUG and its only appender to A1. -log4j.rootLogger=WARN, console - -## Levels -log4j.logger.org.argeo=DEBUG -log4j.logger.org.argeo.slc.osgi.FileSystemBundleRegister=DEBUG - -## Appenders -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n - diff --git a/legacy/runtime/pom.xml b/legacy/runtime/pom.xml deleted file mode 100644 index 0f6aa43ed..000000000 --- a/legacy/runtime/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - 4.0.0 - - org.argeo.slc - argeo-slc - 2.1.1-SNAPSHOT - .. - - org.argeo.slc - runtime - pom - SLC Runtime - - org.argeo.slc.specs - org.argeo.slc.core - org.argeo.slc.unit - org.argeo.slc.support.simple - org.argeo.slc.support.osgi - org.argeo.slc.support.equinox - org.argeo.slc.support.ant - org.argeo.slc.support.aether - org.argeo.slc.support.maven - org.argeo.slc.support.jemmy - org.argeo.slc.support.jcr - org.argeo.slc.detached - org.argeo.slc.detached.launcher - org.argeo.slc.launcher - org.argeo.slc.lib.detached - org.argeo.slc.repo - org.argeo.slc.rpmfactory - - diff --git a/legacy/runtime/org.argeo.slc.support.equinox/.gitignore b/lib/org.argeo.slc.lib.build/.gitignore similarity index 100% rename from legacy/runtime/org.argeo.slc.support.equinox/.gitignore rename to lib/org.argeo.slc.lib.build/.gitignore diff --git a/lib/org.argeo.slc.lib.build/META-INF/.gitignore b/lib/org.argeo.slc.lib.build/META-INF/.gitignore new file mode 100644 index 000000000..4854a41b9 --- /dev/null +++ b/lib/org.argeo.slc.lib.build/META-INF/.gitignore @@ -0,0 +1 @@ +/MANIFEST.MF diff --git a/lib/org.argeo.slc.lib.build/bnd.bnd b/lib/org.argeo.slc.lib.build/bnd.bnd new file mode 100644 index 000000000..e69de29bb diff --git a/lib/org.argeo.slc.lib.build/pom.xml b/lib/org.argeo.slc.lib.build/pom.xml index 435444e0a..44e34956a 100644 --- a/lib/org.argeo.slc.lib.build/pom.xml +++ b/lib/org.argeo.slc.lib.build/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 org.argeo.slc lib - 2.1.1-SNAPSHOT + 2.1.8-SNAPSHOT .. org.argeo.slc.lib.build diff --git a/lib/org.argeo.slc.lib.jcr/.gitignore b/lib/org.argeo.slc.lib.jcr/.gitignore new file mode 100644 index 000000000..b83d22266 --- /dev/null +++ b/lib/org.argeo.slc.lib.jcr/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/lib/org.argeo.slc.lib.jcr/META-INF/.gitignore b/lib/org.argeo.slc.lib.jcr/META-INF/.gitignore new file mode 100644 index 000000000..4854a41b9 --- /dev/null +++ b/lib/org.argeo.slc.lib.jcr/META-INF/.gitignore @@ -0,0 +1 @@ +/MANIFEST.MF 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 index 23ffca89c..1266686c5 100644 --- a/lib/org.argeo.slc.lib.jcr/META-INF/spring/osgi.xml +++ b/lib/org.argeo.slc.lib.jcr/META-INF/spring/osgi.xml @@ -12,5 +12,5 @@ - + \ 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 new file mode 100644 index 000000000..e69de29bb diff --git a/lib/org.argeo.slc.lib.jcr/pom.xml b/lib/org.argeo.slc.lib.jcr/pom.xml index 79e498b53..a280b90f9 100644 --- a/lib/org.argeo.slc.lib.jcr/pom.xml +++ b/lib/org.argeo.slc.lib.jcr/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 org.argeo.slc lib - 2.1.1-SNAPSHOT + 2.1.8-SNAPSHOT .. org.argeo.slc.lib.jcr diff --git a/lib/org.argeo.slc.lib.repo/.gitignore b/lib/org.argeo.slc.lib.repo/.gitignore new file mode 100644 index 000000000..b83d22266 --- /dev/null +++ b/lib/org.argeo.slc.lib.repo/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/lib/org.argeo.slc.lib.repo/META-INF/.gitignore b/lib/org.argeo.slc.lib.repo/META-INF/.gitignore new file mode 100644 index 000000000..4854a41b9 --- /dev/null +++ b/lib/org.argeo.slc.lib.repo/META-INF/.gitignore @@ -0,0 +1 @@ +/MANIFEST.MF diff --git a/lib/org.argeo.slc.lib.repo/bnd.bnd b/lib/org.argeo.slc.lib.repo/bnd.bnd new file mode 100644 index 000000000..e69de29bb diff --git a/lib/org.argeo.slc.lib.repo/pom.xml b/lib/org.argeo.slc.lib.repo/pom.xml index cc8e39b28..c655d7712 100644 --- a/lib/org.argeo.slc.lib.repo/pom.xml +++ b/lib/org.argeo.slc.lib.repo/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 org.argeo.slc lib - 2.1.1-SNAPSHOT + 2.1.8-SNAPSHOT .. org.argeo.slc.lib.repo diff --git a/lib/org.argeo.slc.lib.rpmfactory/.gitignore b/lib/org.argeo.slc.lib.rpmfactory/.gitignore new file mode 100644 index 000000000..b83d22266 --- /dev/null +++ b/lib/org.argeo.slc.lib.rpmfactory/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/lib/org.argeo.slc.lib.rpmfactory/META-INF/.gitignore b/lib/org.argeo.slc.lib.rpmfactory/META-INF/.gitignore new file mode 100644 index 000000000..4854a41b9 --- /dev/null +++ b/lib/org.argeo.slc.lib.rpmfactory/META-INF/.gitignore @@ -0,0 +1 @@ +/MANIFEST.MF diff --git a/lib/org.argeo.slc.lib.rpmfactory/bnd.bnd b/lib/org.argeo.slc.lib.rpmfactory/bnd.bnd new file mode 100644 index 000000000..e69de29bb diff --git a/lib/org.argeo.slc.lib.rpmfactory/pom.xml b/lib/org.argeo.slc.lib.rpmfactory/pom.xml index 5d08ea191..e9735d57f 100644 --- a/lib/org.argeo.slc.lib.rpmfactory/pom.xml +++ b/lib/org.argeo.slc.lib.rpmfactory/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 org.argeo.slc lib - 2.1.1-SNAPSHOT + 2.1.8-SNAPSHOT .. org.argeo.slc.lib.rpmfactory diff --git a/lib/pom.xml b/lib/pom.xml index 66b708f36..c17181146 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -11,10 +11,10 @@ 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 @@ -23,20 +23,20 @@ - - - . - - ** - - - .* - .*/** - pom.xml - build.properties - - - + + + + + + + + + + + + + + org.apache.felix diff --git a/legacy/runtime/org.argeo.slc.launcher/.classpath b/org.argeo.slc.launcher/.classpath similarity index 68% rename from legacy/runtime/org.argeo.slc.launcher/.classpath rename to org.argeo.slc.launcher/.classpath index 581598319..5609932e6 100644 --- a/legacy/runtime/org.argeo.slc.launcher/.classpath +++ b/org.argeo.slc.launcher/.classpath @@ -1,7 +1,6 @@ - - + >> diff --git a/org.argeo.slc.launcher/.gitignore b/org.argeo.slc.launcher/.gitignore new file mode 100644 index 000000000..b83d22266 --- /dev/null +++ b/org.argeo.slc.launcher/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/legacy/runtime/org.argeo.slc.launcher/.project b/org.argeo.slc.launcher/.project similarity index 100% rename from legacy/runtime/org.argeo.slc.launcher/.project rename to org.argeo.slc.launcher/.project diff --git a/org.argeo.slc.launcher/META-INF/.gitignore b/org.argeo.slc.launcher/META-INF/.gitignore new file mode 100644 index 000000000..4854a41b9 --- /dev/null +++ b/org.argeo.slc.launcher/META-INF/.gitignore @@ -0,0 +1 @@ +/MANIFEST.MF diff --git a/org.argeo.slc.launcher/bnd.bnd b/org.argeo.slc.launcher/bnd.bnd new file mode 100644 index 000000000..8acf4c905 --- /dev/null +++ b/org.argeo.slc.launcher/bnd.bnd @@ -0,0 +1 @@ +Main-Class: org.argeo.slc.cli.SlcMain \ No newline at end of file diff --git a/legacy/runtime/org.argeo.slc.launcher/build.properties b/org.argeo.slc.launcher/build.properties similarity index 100% rename from legacy/runtime/org.argeo.slc.launcher/build.properties rename to org.argeo.slc.launcher/build.properties diff --git a/org.argeo.slc.launcher/pom.xml b/org.argeo.slc.launcher/pom.xml new file mode 100644 index 000000000..4ca051bfc --- /dev/null +++ b/org.argeo.slc.launcher/pom.xml @@ -0,0 +1,71 @@ + + + 4.0.0 + + org.argeo.slc + argeo-slc + 2.1.8-SNAPSHOT + .. + + org.argeo.slc.launcher + jar + SLC Launcher + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.argeo.commons + org.argeo.osgi.boot + ${version.argeo-commons} + + + \ No newline at end of file diff --git a/legacy/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java b/org.argeo.slc.launcher/src/org/argeo/slc/cli/SlcMain.java similarity index 94% rename from legacy/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java rename to org.argeo.slc.launcher/src/org/argeo/slc/cli/SlcMain.java index 0d92b6a1f..d7bd977f7 100644 --- a/legacy/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java +++ b/org.argeo.slc.launcher/src/org/argeo/slc/cli/SlcMain.java @@ -211,11 +211,11 @@ public class SlcMain implements PrivilegedAction { File modulesDir = new File(slcDir, "modules"); // JAAS - File jaasFile = new File(confDir, "jaas.config"); - if (!jaasFile.exists()) - copyResource("/org/argeo/slc/cli/jaas.config", jaasFile); - System.setProperty("java.security.auth.login.config", - jaasFile.getCanonicalPath()); +// File jaasFile = new File(confDir, "jaas.config"); +// if (!jaasFile.exists()) +// copyResource("/org/argeo/slc/cli/jaas.config", jaasFile); +// System.setProperty("java.security.auth.login.config", +// jaasFile.getCanonicalPath()); // log4j File log4jFile = new File(confDir, "log4j.properties"); @@ -224,13 +224,15 @@ public class SlcMain implements PrivilegedAction { System.setProperty("log4j.configuration", "file://" + log4jFile.getCanonicalPath()); // Run as a privileged action - LoginContext lc = new LoginContext(os); - lc.login(); - - Subject subject = Subject.getSubject(AccessController.getContext()); - Subject.doAs(subject, new SlcMain(args, confDir, dataDir, - modulesDir)); - +// LoginContext lc = new LoginContext(os); +// lc.login(); +// +// Subject subject = Subject.getSubject(AccessController.getContext()); +// Subject.doAs(subject, new SlcMain(args, confDir, dataDir, +// modulesDir)); +SlcMain slcMain = new SlcMain(args, confDir, dataDir, + modulesDir); +slcMain.run(); if (args.length != 0) System.exit(0); } catch (Exception e) { diff --git a/legacy/runtime/org.argeo.slc.launcher/jaas.config b/org.argeo.slc.launcher/src/org/argeo/slc/cli/jaas.config similarity index 100% rename from legacy/runtime/org.argeo.slc.launcher/jaas.config rename to org.argeo.slc.launcher/src/org/argeo/slc/cli/jaas.config diff --git a/legacy/runtime/org.argeo.slc.launcher/src/main/resources/org/argeo/slc/cli/log4j.properties b/org.argeo.slc.launcher/src/org/argeo/slc/cli/log4j.properties similarity index 100% rename from legacy/runtime/org.argeo.slc.launcher/src/main/resources/org/argeo/slc/cli/log4j.properties rename to org.argeo.slc.launcher/src/org/argeo/slc/cli/log4j.properties diff --git a/org.argeo.slc.support.maven/.classpath b/org.argeo.slc.support.maven/.classpath new file mode 100644 index 000000000..3e26ac1a9 --- /dev/null +++ b/org.argeo.slc.support.maven/.classpath @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/legacy/runtime/org.argeo.slc.support.maven/.classpath b/org.argeo.slc.support.maven/.classpath.old similarity index 87% rename from legacy/runtime/org.argeo.slc.support.maven/.classpath rename to org.argeo.slc.support.maven/.classpath.old index 4154da118..6420ef7eb 100644 --- a/legacy/runtime/org.argeo.slc.support.maven/.classpath +++ b/org.argeo.slc.support.maven/.classpath.old @@ -1,13 +1,9 @@ - - - - - >> + + - @@ -37,5 +33,6 @@ + diff --git a/org.argeo.slc.support.maven/.gitignore b/org.argeo.slc.support.maven/.gitignore new file mode 100644 index 000000000..0f630157f --- /dev/null +++ b/org.argeo.slc.support.maven/.gitignore @@ -0,0 +1,2 @@ +/target/ +/bin/ diff --git a/org.argeo.slc.support.maven/.project b/org.argeo.slc.support.maven/.project new file mode 100644 index 000000000..be03f8af7 --- /dev/null +++ b/org.argeo.slc.support.maven/.project @@ -0,0 +1,21 @@ + + + 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/org.argeo.slc.support.maven/MANIFEST.MF b/org.argeo.slc.support.maven/MANIFEST.MF new file mode 100644 index 000000000..cdf3f8a72 --- /dev/null +++ b/org.argeo.slc.support.maven/MANIFEST.MF @@ -0,0 +1,74 @@ +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/org.argeo.slc.support.maven/META-INF/.gitignore b/org.argeo.slc.support.maven/META-INF/.gitignore new file mode 100644 index 000000000..4854a41b9 --- /dev/null +++ b/org.argeo.slc.support.maven/META-INF/.gitignore @@ -0,0 +1 @@ +/MANIFEST.MF diff --git a/legacy/runtime/org.argeo.slc.support.maven/META-INF/spring/maven-osgi.xml b/org.argeo.slc.support.maven/META-INF/spring/maven-osgi.xml similarity index 100% rename from legacy/runtime/org.argeo.slc.support.maven/META-INF/spring/maven-osgi.xml rename to org.argeo.slc.support.maven/META-INF/spring/maven-osgi.xml diff --git a/legacy/runtime/org.argeo.slc.support.maven/META-INF/spring/maven.xml b/org.argeo.slc.support.maven/META-INF/spring/maven.xml similarity index 100% rename from legacy/runtime/org.argeo.slc.support.maven/META-INF/spring/maven.xml rename to org.argeo.slc.support.maven/META-INF/spring/maven.xml diff --git a/org.argeo.slc.support.maven/bnd.bnd b/org.argeo.slc.support.maven/bnd.bnd new file mode 100644 index 000000000..e69de29bb diff --git a/org.argeo.slc.support.maven/lib/.gitignore b/org.argeo.slc.support.maven/lib/.gitignore new file mode 100644 index 000000000..0557829bf --- /dev/null +++ b/org.argeo.slc.support.maven/lib/.gitignore @@ -0,0 +1 @@ +/*.jar diff --git a/legacy/runtime/org.argeo.slc.support.maven/pom.xml b/org.argeo.slc.support.maven/pom.xml similarity index 61% rename from legacy/runtime/org.argeo.slc.support.maven/pom.xml rename to org.argeo.slc.support.maven/pom.xml index eb5177999..9f18e0f1a 100644 --- a/legacy/runtime/org.argeo.slc.support.maven/pom.xml +++ b/org.argeo.slc.support.maven/pom.xml @@ -1,19 +1,20 @@ - + 4.0.0 org.argeo.slc - runtime - 2.1.1-SNAPSHOT + argeo-slc + 2.1.8-SNAPSHOT .. org.argeo.slc.support.maven bundle SLC Support Maven - 1.11 - 3.0.3 - 1.0-beta-7 + 1.0.1.v20141111 + 3.2.5 + 1.0 @@ -33,7 +34,7 @@ javax.*;resolution:=optional, com.sun.*;resolution:=optional, org.objectweb.asm.*;resolution:=optional, - * + *;resolution:=optional <_exportcontents> org.apache.maven.*;version=${version.maven}, @@ -41,7 +42,7 @@ org.apache.xbean.* true lib - *;scope=provided;inline=false + *;scope=compile;inline=false @@ -56,7 +57,7 @@ copy-dependencies - provided + provided lib @@ -67,38 +68,44 @@ org.argeo.slc - org.argeo.slc.specs - 2.1.1-SNAPSHOT + org.argeo.slc.api + 2.1.8-SNAPSHOT + provided org.argeo.slc - org.argeo.slc.support.aether - 2.1.1-SNAPSHOT + org.argeo.slc.support + 2.1.8-SNAPSHOT + provided - - org.argeo.tp - org.springframework.beans - - - org.argeo.tp - org.apache.commons.io - + + + + + + + + - - org.argeo.tp - slf4j.org.apache.commons.logging - + + + + org.apache.maven maven-embedder ${version.maven} true - provided + compile + + org.slf4j + slf4j-api + commons-logging commons-logging @@ -108,25 +115,29 @@ commons-cli - org.sonatype.aether + org.eclipse.aether aether-spi - org.sonatype.aether + org.eclipse.aether aether-api - org.sonatype.aether + org.eclipse.aether aether-util + + org.eclipse.aether + aether-impl + - org.sonatype.aether - aether-connector-wagon + org.eclipse.aether + aether-transport-wagon ${version.aether} true - provided + compile commons-logging @@ -140,20 +151,32 @@ log4j log4j + + javax.inject + javax.inject + junit junit - org.sonatype.aether + aopalliance + aopalliance + + + com.google.guava + guava + + + org.eclipse.aether aether-spi - org.sonatype.aether + org.eclipse.aether aether-api - org.sonatype.aether + org.eclipse.aether aether-util @@ -163,7 +186,7 @@ wagon-provider-api ${version.wagon} true - provided + compile commons-logging @@ -176,7 +199,7 @@ wagon-file ${version.wagon} true - provided + compile commons-logging @@ -189,7 +212,7 @@ wagon-http-lightweight ${version.wagon} true - provided + compile nekohtml @@ -199,6 +222,10 @@ commons-logging commons-logging + + commons-io + commons-io + @@ -206,7 +233,7 @@ wagon-webdav-jackrabbit ${version.wagon} true - provided + compile org.slf4j @@ -218,15 +245,35 @@ + + + + + + + + + + + - - org.argeo.tp - org.sonatype.aether - - - - org.argeo.tp - junit - + + + + + + + + + central + https://repo1.maven.org/maven2/ + + true + + + false + + + \ No newline at end of file diff --git a/legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/CustomCli.java b/org.argeo.slc.support.maven/src/org/argeo/slc/maven/CustomCli.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/CustomCli.java rename to org.argeo.slc.support.maven/src/org/argeo/slc/maven/CustomCli.java diff --git a/legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/DependencyFileLoader.java b/org.argeo.slc.support.maven/src/org/argeo/slc/maven/DependencyFileLoader.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/DependencyFileLoader.java rename to org.argeo.slc.support.maven/src/org/argeo/slc/maven/DependencyFileLoader.java diff --git a/legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/ManualWagonProvider.java b/org.argeo.slc.support.maven/src/org/argeo/slc/maven/ManualWagonProvider.java similarity index 96% rename from legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/ManualWagonProvider.java rename to org.argeo.slc.support.maven/src/org/argeo/slc/maven/ManualWagonProvider.java index d264bb784..ecc03a83e 100644 --- a/legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/ManualWagonProvider.java +++ b/org.argeo.slc.support.maven/src/org/argeo/slc/maven/ManualWagonProvider.java @@ -27,7 +27,7 @@ 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.connector.wagon.WagonProvider; +import org.eclipse.aether.transport.wagon.WagonProvider; public class ManualWagonProvider implements WagonProvider { diff --git a/legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenCall.java b/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenCall.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenCall.java rename to org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenCall.java diff --git a/legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java b/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenDeployEnvironment.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java rename to org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenDeployEnvironment.java diff --git a/legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenFile.java b/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenFile.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenFile.java rename to org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenFile.java diff --git a/legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenManager.java b/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenManager.java similarity index 79% rename from legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenManager.java rename to org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenManager.java index 049ce8233..37dabc60e 100644 --- a/legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenManager.java +++ b/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenManager.java @@ -17,26 +17,24 @@ package org.argeo.slc.maven; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.maven.repository.internal.DefaultServiceLocator; -import org.apache.maven.repository.internal.MavenRepositorySystemSession; +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.connector.wagon.WagonProvider; -import org.eclipse.aether.connector.wagon.WagonRepositoryConnectorFactory; 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.spi.connector.RepositoryConnectorFactory; -import org.eclipse.aether.util.artifact.DefaultArtifact; -import org.eclipse.aether.util.graph.PreorderNodeListGenerator; +import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator; public class MavenManager { private final static Log log = LogFactory.getLog(MavenManager.class); @@ -108,11 +106,13 @@ public class MavenManager { 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 = 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); @@ -121,7 +121,7 @@ public class MavenManager { DependencyNode node = repoSystem.collectDependencies(session, collectRequest).getRoot(); - repoSystem.resolveDependencies(session, node, null); +// repoSystem.resolveDependencies(session, node, null); PreorderNodeListGenerator nlg = new PreorderNodeListGenerator(); node.accept(nlg); @@ -142,14 +142,11 @@ public class MavenManager { /** Creates a Maven {@link RepositorySystem}. */ public static RepositorySystem createRepositorySystem() { try { - // return new - // DefaultPlexusContainer().lookup(RepositorySystem.class); - DefaultServiceLocator locator = new DefaultServiceLocator(); - locator.setServices(WagonProvider.class, new ManualWagonProvider()); - locator.addService(RepositoryConnectorFactory.class, - WagonRepositoryConnectorFactory.class); +// locator.setServices(WagonProvider.class, new ManualWagonProvider()); +// locator.addService(RepositoryConnectorFactory.class, +// WagonRepositoryConnectorFactory.class); return locator.getService(RepositorySystem.class); } catch (Exception e) { @@ -159,12 +156,14 @@ public class MavenManager { public static RepositorySystemSession createRepositorySystemSession( RepositorySystem system) { - MavenRepositorySystemSession session = new MavenRepositorySystemSession(); - +// MavenRepositorySystemSession session = new MavenRepositorySystemSession(); + DefaultRepositorySystemSession session = MavenRepositorySystemUtils.newSession(); + LocalRepository localRepo = new LocalRepository( System.getProperty("user.home") + "/.m2/repository"); - session.setLocalRepositoryManager(system - .newLocalRepositoryManager(localRepo)); + session.setLocalRepositoryManager( system.newLocalRepositoryManager( session, localRepo ) ); +// session.setLocalRepositoryManager(system +// .newLocalRepositoryManager(localRepo)); session.setTransferListener(new ConsoleTransferListener(System.out)); session.setRepositoryListener(new ConsoleRepositoryListener()); return session; diff --git a/legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenToUrl.java b/org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenToUrl.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenToUrl.java rename to org.argeo.slc.support.maven/src/org/argeo/slc/maven/MavenToUrl.java diff --git a/legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/RemoteRepo.java b/org.argeo.slc.support.maven/src/org/argeo/slc/maven/RemoteRepo.java similarity index 100% rename from legacy/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/RemoteRepo.java rename to org.argeo.slc.support.maven/src/org/argeo/slc/maven/RemoteRepo.java diff --git a/legacy/runtime/org.argeo.slc.support.maven/src/main/resources/org/argeo/slc/support/deploy/ant/build.xml b/org.argeo.slc.support.maven/src/org/argeo/slc/maven/build.xml similarity index 100% rename from legacy/runtime/org.argeo.slc.support.maven/src/main/resources/org/argeo/slc/support/deploy/ant/build.xml rename to org.argeo.slc.support.maven/src/org/argeo/slc/maven/build.xml diff --git a/pom.xml b/pom.xml index 60d35173f..74a36fbff 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.argeo.commons argeo-commons - 2.1.62-SNAPSHOT + 2.1.62 org.argeo.slc argeo-slc @@ -15,6 +15,7 @@ 2015-02-12 2.1.14-SNAPSHOT 2.1.8-SNAPSHOT + 3.11.1.v20160708-1632 @@ -22,8 +23,10 @@ org.argeo.slc.core org.argeo.slc.unit org.argeo.slc.support + org.argeo.slc.support.maven org.argeo.slc.repo org.argeo.slc.factory + org.argeo.slc.launcher org.argeo.slc.agent -- 2.39.2