From 50ef8731db88230c4828e57ab1a977c9d6ccd005 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 22 Nov 2008 15:13:06 +0000 Subject: [PATCH] Configure SLC Example 01 git-svn-id: https://svn.argeo.org/slc/trunk@1863 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- examples/org.argeo.slc.example01/.project | 2 +- examples/org.argeo.slc.example01/pom.xml | 25 ++++++++----- .../java/org/argeo/slc/example/Activator.java | 13 ++----- .../src/main/resources/META-INF/MANIFEST.MF | 35 +++++++++---------- 4 files changed, 36 insertions(+), 39 deletions(-) diff --git a/examples/org.argeo.slc.example01/.project b/examples/org.argeo.slc.example01/.project index fc5a0fb76..2cb7a5005 100644 --- a/examples/org.argeo.slc.example01/.project +++ b/examples/org.argeo.slc.example01/.project @@ -1,6 +1,6 @@ - org.argeo.slc.example + org.argeo.slc.example01 diff --git a/examples/org.argeo.slc.example01/pom.xml b/examples/org.argeo.slc.example01/pom.xml index f74d3da97..29b064fbe 100644 --- a/examples/org.argeo.slc.example01/pom.xml +++ b/examples/org.argeo.slc.example01/pom.xml @@ -5,19 +5,15 @@ org.argeo.slc argeo-slc 0.11.2-SNAPSHOT - ../org.argeo.slc + ../../org.argeo.slc - org.argeo.slc.example - Argeo SLC Demo Example 1 + org.argeo.slc.examples + org.argeo.slc.example01 + Argeo SLC Demo Example 01 jar An Example SLC application - - scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.example - https://www.argeo.org/svn/slc/trunk/org.argeo.slc.example - - org.apache.maven.plugins maven-compiler-plugin @@ -80,8 +76,19 @@ org.argeo.slc.runtime - org.argeo.slc.ant + org.argeo.slc.support.ant ${project.version} + + org.argeo.slc.runtime + org.argeo.slc.support.castor + ${project.version} + + + org.argeo.slc.runtime + org.argeo.slc.launcher + ${project.version} + test + \ No newline at end of file diff --git a/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/Activator.java b/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/Activator.java index 90589db95..e3439e978 100644 --- a/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/Activator.java +++ b/examples/org.argeo.slc.example01/src/main/java/org/argeo/slc/example/Activator.java @@ -1,15 +1,8 @@ package org.argeo.slc.example; -import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.slc.cli.DefaultSlcRuntime; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class Activator implements BundleActivator { - //private final static String BOOTSTRAP_LOG4J_CONFIG = "org/argeo/slc/example/log4j.properties"; +public class Activator{// implements BundleActivator { +/* //private final static String BOOTSTRAP_LOG4J_CONFIG = "org/argeo/slc/example/log4j.properties"; private static Log log = LogFactory.getLog(Activator.class); public void start(BundleContext context) throws Exception { @@ -65,6 +58,6 @@ public class Activator implements BundleActivator { // "classpath:" + BOOTSTRAP_LOG4J_CONFIG)); log = LogFactory.getLog(Activator.class); - } + }*/ } diff --git a/examples/org.argeo.slc.example01/src/main/resources/META-INF/MANIFEST.MF b/examples/org.argeo.slc.example01/src/main/resources/META-INF/MANIFEST.MF index 2857f79e2..265999950 100644 --- a/examples/org.argeo.slc.example01/src/main/resources/META-INF/MANIFEST.MF +++ b/examples/org.argeo.slc.example01/src/main/resources/META-INF/MANIFEST.MF @@ -1,13 +1,12 @@ Manifest-Version: 1.0 Export-Package: org.argeo.slc.example.appli;version="0.11.2.SNAPSHOT", org.argeo.slc.example.ws.client.spring;version="0.11.2.SNAPSHOT",org. - argeo.slc.example;uses:="org.apache.commons.logging,org.argeo.slc.cor - e.test,org.argeo.slc.core.structure,org.argeo.slc.example.appli,org.a - rgeo.slc.core.test.context,org.argeo.slc.core.build,org.argeo.slc.run - time,org.argeo.slc.cli,org.osgi.framework,org.argeo.slc.core.deploy,o - rg.argeo.slc.core.structure.tree";version="0.11.2.SNAPSHOT" + argeo.slc.example;uses:="org.argeo.slc.core.structure,org.argeo.slc.e + xample.appli,org.apache.commons.logging,org.argeo.slc.core.test.conte + xt,org.argeo.slc.core.build,org.argeo.slc.core.deploy,org.argeo.slc.c + ore.test,org.argeo.slc.core.structure.tree";version="0.11.2.SNAPSHOT" Tool: Bnd-0.0.255 -Bundle-Name: Argeo SLC Demo Example 1 +Bundle-Name: Argeo SLC Demo Example 01 Created-By: 1.6.0 (Sun Microsystems Inc.) Require-Bundle: org.argeo.slc.core,org.argeo.slc.agent Bundle-Vendor: Argeo @@ -18,19 +17,17 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt Bundle-Description: An Example SLC application Import-Package: org.apache.commons.logging;version="1.1",org.apache.to ols.ant;version="1.7",org.apache.tools.ant.taskdefs;version="1.7",org - .apache.tools.ant.types;version="1.7",org.argeo.slc.cli;version="0.11 - .2.SNAPSHOT",org.argeo.slc.core.build;version="0.11.2.SNAPSHOT",org.a - rgeo.slc.core.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.core.str - ucture;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree;ve - rsion="0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2.SNAPS - HOT",org.argeo.slc.core.test.context;version="0.11.2.SNAPSHOT",org.ar - geo.slc.core.test.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.exam - ple;version="0.11.2.SNAPSHOT",org.argeo.slc.example.appli;version="0. - 11.2.SNAPSHOT",org.argeo.slc.example.ws.client.spring;version="0.11.2 - .SNAPSHOT",org.argeo.slc.msg.test.tree;version="0.11.2.SNAPSHOT",org. - argeo.slc.runtime;version="0.11.2.SNAPSHOT",org.osgi.framework;versio - n="1.4",org.springframework.oxm.castor;version="1.5.5.A" -Bundle-SymbolicName: org.argeo.slc.example + .apache.tools.ant.types;version="1.7",org.argeo.slc.core.build;versio + n="0.11.2.SNAPSHOT",org.argeo.slc.core.deploy;version="0.11.2.SNAPSHO + T",org.argeo.slc.core.structure;version="0.11.2.SNAPSHOT",org.argeo.s + lc.core.structure.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.core.t + est;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.context;version + ="0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version="0.11.2.SNA + PSHOT",org.argeo.slc.example;version="0.11.2.SNAPSHOT",org.argeo.slc. + example.appli;version="0.11.2.SNAPSHOT",org.argeo.slc.example.ws.clie + nt.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;versi + on="0.11.2.SNAPSHOT",org.springframework.oxm.castor;version="1.5.5.A" +Bundle-SymbolicName: org.argeo.slc.example01 Bundle-DocURL: http://www.argeo.org Originally-Created-By: 1.6.0 (Sun Microsystems Inc.) -- 2.39.2