Configure SLC Example 01

git-svn-id: https://svn.argeo.org/slc/trunk@1863 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/examples/org.argeo.slc.example01/.project b/examples/org.argeo.slc.example01/.project
index fc5a0fb764426e22819d27b37273293ddc475b08..2cb7a500520353dbef2ac11381682aae13fcf1a7 100644 (file)
--- a/examples/org.argeo.slc.example01/.project
+++ b/examples/org.argeo.slc.example01/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>

-       <name>org.argeo.slc.example</name>
+       <name>org.argeo.slc.example01</name>

        <comment></comment>
        <projects>
        </projects>
        <comment></comment>
        <projects>
        </projects>

diff --git a/examples/org.argeo.slc.example01/pom.xml b/examples/org.argeo.slc.example01/pom.xml
index f74d3da979523e92c55f12e2d4e5755048969e35..29b064fbe1f43a4b9da0e3287083359924852825 100644 (file)
--- a/examples/org.argeo.slc.example01/pom.xml
+++ b/examples/org.argeo.slc.example01/pom.xml
@@ -5,19 +5,15 @@
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
                <version>0.11.2-SNAPSHOT</version>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
                <version>0.11.2-SNAPSHOT</version>

-               <relativePath>../org.argeo.slc</relativePath>
+               <relativePath>../../org.argeo.slc</relativePath>

        </parent>
        </parent>

-       <artifactId>org.argeo.slc.example</artifactId>
-       <name>Argeo SLC Demo Example 1</name>
+       <groupId>org.argeo.slc.examples</groupId>
+       <artifactId>org.argeo.slc.example01</artifactId>
+       <name>Argeo SLC Demo Example 01</name>

        <packaging>jar</packaging>
        <description>An Example SLC application</description>
        <packaging>jar</packaging>
        <description>An Example SLC application</description>

-       <scm>
-               <connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.example</connection>
-               <url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc.example</url>
-       </scm>

        <build>
                <plugins>
        <build>
                <plugins>

-                       <!-- Look to parent pom for inheritances -->

                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-compiler-plugin</artifactId>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-compiler-plugin</artifactId>


@@ -80,8 +76,19 @@
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>

-                       <artifactId>org.argeo.slc.ant</artifactId>
+                       <artifactId>org.argeo.slc.support.ant</artifactId>

                        <version>${project.version}</version>
                </dependency>
                        <version>${project.version}</version>
                </dependency>

+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.castor</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.launcher</artifactId>
+                       <version>${project.version}</version>
+                       <scope>test</scope>
+               </dependency>

        </dependencies>
 </project>
\ No newline at end of file
        </dependencies>
 </project>
\ 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 90589db9516ea0dcb1de0417ef400e8f53c07364..e3439e9788df3f4ec0c4c2a0e70380c97088a13b 100644 (file)
--- 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;
 
 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 {
        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);
 
 //                             "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 2857f79e2a94bd33db55af0ad34812e3a77968bd..2659999506bc6b6c6d1b61ff323aaf17431eeedb 100644 (file)
--- 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\r
 Export-Package: org.argeo.slc.example.appli;version="0.11.2.SNAPSHOT",\r
  org.argeo.slc.example.ws.client.spring;version="0.11.2.SNAPSHOT",org.\r
 Manifest-Version: 1.0\r
 Export-Package: org.argeo.slc.example.appli;version="0.11.2.SNAPSHOT",\r
  org.argeo.slc.example.ws.client.spring;version="0.11.2.SNAPSHOT",org.\r

- argeo.slc.example;uses:="org.apache.commons.logging,org.argeo.slc.cor\r
- e.test,org.argeo.slc.core.structure,org.argeo.slc.example.appli,org.a\r
- rgeo.slc.core.test.context,org.argeo.slc.core.build,org.argeo.slc.run\r
- time,org.argeo.slc.cli,org.osgi.framework,org.argeo.slc.core.deploy,o\r
- rg.argeo.slc.core.structure.tree";version="0.11.2.SNAPSHOT"\r
+ argeo.slc.example;uses:="org.argeo.slc.core.structure,org.argeo.slc.e\r
+ xample.appli,org.apache.commons.logging,org.argeo.slc.core.test.conte\r
+ xt,org.argeo.slc.core.build,org.argeo.slc.core.deploy,org.argeo.slc.c\r
+ ore.test,org.argeo.slc.core.structure.tree";version="0.11.2.SNAPSHOT"\r

 Tool: Bnd-0.0.255\r
 Tool: Bnd-0.0.255\r

-Bundle-Name: Argeo SLC Demo Example 1\r
+Bundle-Name: Argeo SLC Demo Example 01\r

 Created-By: 1.6.0 (Sun Microsystems Inc.)\r
 Require-Bundle: org.argeo.slc.core,org.argeo.slc.agent\r
 Bundle-Vendor: Argeo\r
 Created-By: 1.6.0 (Sun Microsystems Inc.)\r
 Require-Bundle: org.argeo.slc.core,org.argeo.slc.agent\r
 Bundle-Vendor: Argeo\r


@@ -18,19 +17,17 @@ Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: An Example SLC application\r
 Import-Package: org.apache.commons.logging;version="1.1",org.apache.to\r
  ols.ant;version="1.7",org.apache.tools.ant.taskdefs;version="1.7",org\r
 Bundle-Description: An Example SLC application\r
 Import-Package: org.apache.commons.logging;version="1.1",org.apache.to\r
  ols.ant;version="1.7",org.apache.tools.ant.taskdefs;version="1.7",org\r

- .apache.tools.ant.types;version="1.7",org.argeo.slc.cli;version="0.11\r
- .2.SNAPSHOT",org.argeo.slc.core.build;version="0.11.2.SNAPSHOT",org.a\r
- rgeo.slc.core.deploy;version="0.11.2.SNAPSHOT",org.argeo.slc.core.str\r
- ucture;version="0.11.2.SNAPSHOT",org.argeo.slc.core.structure.tree;ve\r
- rsion="0.11.2.SNAPSHOT",org.argeo.slc.core.test;version="0.11.2.SNAPS\r
- HOT",org.argeo.slc.core.test.context;version="0.11.2.SNAPSHOT",org.ar\r
- geo.slc.core.test.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.exam\r
- ple;version="0.11.2.SNAPSHOT",org.argeo.slc.example.appli;version="0.\r
- 11.2.SNAPSHOT",org.argeo.slc.example.ws.client.spring;version="0.11.2\r
- .SNAPSHOT",org.argeo.slc.msg.test.tree;version="0.11.2.SNAPSHOT",org.\r
- argeo.slc.runtime;version="0.11.2.SNAPSHOT",org.osgi.framework;versio\r
- n="1.4",org.springframework.oxm.castor;version="1.5.5.A"\r
-Bundle-SymbolicName: org.argeo.slc.example\r
+ .apache.tools.ant.types;version="1.7",org.argeo.slc.core.build;versio\r
+ n="0.11.2.SNAPSHOT",org.argeo.slc.core.deploy;version="0.11.2.SNAPSHO\r
+ T",org.argeo.slc.core.structure;version="0.11.2.SNAPSHOT",org.argeo.s\r
+ lc.core.structure.tree;version="0.11.2.SNAPSHOT",org.argeo.slc.core.t\r
+ est;version="0.11.2.SNAPSHOT",org.argeo.slc.core.test.context;version\r
+ ="0.11.2.SNAPSHOT",org.argeo.slc.core.test.spring;version="0.11.2.SNA\r
+ PSHOT",org.argeo.slc.example;version="0.11.2.SNAPSHOT",org.argeo.slc.\r
+ example.appli;version="0.11.2.SNAPSHOT",org.argeo.slc.example.ws.clie\r
+ nt.spring;version="0.11.2.SNAPSHOT",org.argeo.slc.msg.test.tree;versi\r
+ on="0.11.2.SNAPSHOT",org.springframework.oxm.castor;version="1.5.5.A"\r
+Bundle-SymbolicName: org.argeo.slc.example01\r

 Bundle-DocURL: http://www.argeo.org\r
 Originally-Created-By: 1.6.0 (Sun Microsystems Inc.)\r
 \r
 Bundle-DocURL: http://www.argeo.org\r
 Originally-Created-By: 1.6.0 (Sun Microsystems Inc.)\r
 \r