From 5ca0831fd91542776d1d4a8b51e07b9982bd634e Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 13 Mar 2009 16:45:40 +0000
Subject: [PATCH] Simplify OSGi

git-svn-id: https://svn.argeo.org/slc/trunk@2261 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/site/org.argeo.slc.demo.agent/pom.xml    |  42 ++++++
 demo/site/org.argeo.slc.demo.basic/.project   |  22 ++++
 .../.settings/org.eclipse.pde.core.prefs      |   5 +
 .../META-INF/MANIFEST.MF                      |  35 ++---
 demo/site/org.argeo.slc.demo.basic/pom.xml    |  42 ++++++
 .../META-INF/slc/dep/manager.maven            |   8 +-
 demo/site/org.argeo.slc.demo.deploy/pom.xml   | 123 ++++++------------
 demo/site/org.argeo.slc.demo.log4j/.project   |  22 ++++
 .../.settings/org.eclipse.pde.core.prefs      |   5 +
 .../META-INF/MANIFEST.MF                      |   7 +
 .../org.argeo.slc.demo.log4j/log4j.properties |  25 ++++
 demo/site/org.argeo.slc.demo.log4j/pom.xml    |  38 ++++++
 demo/site/org.argeo.slc.demo.manager/.project |  22 ++++
 .../.settings/org.eclipse.pde.core.prefs      |   5 +
 .../META-INF/MANIFEST.MF                      |  33 ++---
 .../build.properties                          |   1 +
 .../conf/manager.xml                          |  19 ---
 .../org.argeo.slc.demo.manager/conf/maven.xml |  19 ---
 demo/site/org.argeo.slc.demo.manager/pom.xml  |  38 ++++++
 .../target/maven-archiver/pom.properties      |   5 +
 ...slc.demo.manager-0.11.3-SNAPSHOT-tests.jar | Bin 0 -> 2099 bytes
 ...argeo.slc.demo.manager-0.11.3-SNAPSHOT.jar | Bin 0 -> 6275 bytes
 demo/site/pom.xml                             |  20 +++
 org.argeo.slc/pom.xml                         |   4 +-
 runtime/org.argeo.slc.osgiboot/pom.xml        |  18 +++
 .../src/assembly/osgiboot.xml                 |  35 +++++
 .../org.argeo.slc.support.hibernate/pom.xml   |   5 +
 runtime/org.argeo.slc.support.simple/pom.xml  |   1 -
 server/org.argeo.slc.siteserver/pom.xml       | 104 +++------------
 29 files changed, 449 insertions(+), 254 deletions(-)
 create mode 100644 demo/site/org.argeo.slc.demo.agent/pom.xml
 create mode 100644 demo/site/org.argeo.slc.demo.basic/.project
 create mode 100644 demo/site/org.argeo.slc.demo.basic/.settings/org.eclipse.pde.core.prefs
 create mode 100644 demo/site/org.argeo.slc.demo.basic/pom.xml
 create mode 100644 demo/site/org.argeo.slc.demo.log4j/.project
 create mode 100644 demo/site/org.argeo.slc.demo.log4j/.settings/org.eclipse.pde.core.prefs
 create mode 100644 demo/site/org.argeo.slc.demo.log4j/META-INF/MANIFEST.MF
 create mode 100644 demo/site/org.argeo.slc.demo.log4j/log4j.properties
 create mode 100644 demo/site/org.argeo.slc.demo.log4j/pom.xml
 create mode 100644 demo/site/org.argeo.slc.demo.manager/.project
 create mode 100644 demo/site/org.argeo.slc.demo.manager/.settings/org.eclipse.pde.core.prefs
 create mode 100644 demo/site/org.argeo.slc.demo.manager/build.properties
 delete mode 100644 demo/site/org.argeo.slc.demo.manager/conf/maven.xml
 create mode 100644 demo/site/org.argeo.slc.demo.manager/pom.xml
 create mode 100644 demo/site/org.argeo.slc.demo.manager/target/maven-archiver/pom.properties
 create mode 100644 demo/site/org.argeo.slc.demo.manager/target/org.argeo.slc.demo.manager-0.11.3-SNAPSHOT-tests.jar
 create mode 100644 demo/site/org.argeo.slc.demo.manager/target/org.argeo.slc.demo.manager-0.11.3-SNAPSHOT.jar
 create mode 100644 demo/site/pom.xml
 create mode 100644 runtime/org.argeo.slc.osgiboot/src/assembly/osgiboot.xml

diff --git a/demo/site/org.argeo.slc.demo.agent/pom.xml b/demo/site/org.argeo.slc.demo.agent/pom.xml
new file mode 100644
index 000000000..799918fe1
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.agent/pom.xml
@@ -0,0 +1,42 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>argeo-slc-demo</artifactId>
+		<version>0.11.3-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<groupId>org.argeo.slc.demo</groupId>
+	<artifactId>org.argeo.slc.demo.agent</artifactId>
+	<name>Argeo SLC Demo Agent</name>
+	<packaging>jar</packaging>
+	<properties></properties>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+					<classesDirectory>.</classesDirectory>
+					<includes>
+						<include>META-INF/spring/*</include>
+					</includes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.activemq</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.castor</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/demo/site/org.argeo.slc.demo.basic/.project b/demo/site/org.argeo.slc.demo.basic/.project
new file mode 100644
index 000000000..17be37481
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.slc.demo.basic</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/demo/site/org.argeo.slc.demo.basic/.settings/org.eclipse.pde.core.prefs b/demo/site/org.argeo.slc.demo.basic/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 000000000..e2c3c3e05
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,5 @@
+#Fri Mar 13 13:44:23 CET 2009
+eclipse.preferences.version=1
+pluginProject.equinox=false
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
index b5326e558..2338f2b6e 100644
--- a/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
@@ -1,22 +1,23 @@
 Manifest-Version: 1.0
-Archiver-Version: Plexus Archiver
+Bundle-ManifestVersion: 2
+Bundle-Name: Basic Plug-in
+Bundle-SymbolicName: org.argeo.slc.demo.basic
+Bundle-Version: 1.0.0
+Export-Package: conf;version="0.11.3.SNAPSHOT",
+ conf.testCases;version="0.11.3.SNAPSHOT"
+Require-Bundle: org.argeo.slc.support.equinox,
+ org.argeo.slc.specs,
+ org.argeo.slc.support.simple,
+ org.springframework.aop,
+ com.springsource.net.sf.cglib,
+ com.springsource.org.aopalliance
+Import-Package: org.apache.commons.logging;version="1.1",
+ org.springframework.beans.factory.config;version="2.5.6.A"
 Created-By: 1.6.0_0 (Sun Microsystems Inc.)
-Built-By: mbaudier
-Build-Jdk: 1.6.0_0
-Export-Package: conf;version="0.11.3.SNAPSHOT",conf.testCases;version=
- "0.11.3.SNAPSHOT"
+Archiver-Version: Plexus Archiver
 Tool: Bnd-0.0.255
-Bundle-Name: Argeo SLC Demo Basic Test Module
-Require-Bundle: org.argeo.slc.support.equinox,org.argeo.slc.specs,org.
- argeo.slc.support.simple,org.springframework.aop,com.springsource.net
- .sf.cglib,com.springsource.org.aopalliance
-Bundle-Vendor: Argeo
-Bundle-Version: 0.11.3.SNAPSHOT
-Spring-Context: conf/*,conf/testCases/*
-Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.apache.commons.logging;version="1.1",org.springfra
- mework.beans.factory.config;version="2.5.6.A"
-Bundle-SymbolicName: org.argeo.slc.demo.basic
+Build-Jdk: 1.6.0_0
+Spring-Context: conf/*,conf/testCases/*
+Built-By: mbaudier
 Bundle-DocURL: http://www.argeo.org
-
diff --git a/demo/site/org.argeo.slc.demo.basic/pom.xml b/demo/site/org.argeo.slc.demo.basic/pom.xml
new file mode 100644
index 000000000..8cd5ec1cc
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/pom.xml
@@ -0,0 +1,42 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>argeo-slc-demo</artifactId>
+		<version>0.11.3-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<groupId>org.argeo.slc.demo</groupId>
+	<artifactId>org.argeo.slc.demo.basic</artifactId>
+	<name>Argeo SLC Demo Basic Test Module</name>
+	<packaging>jar</packaging>
+	<properties></properties>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+					<classesDirectory>.</classesDirectory>
+					<includes>
+						<include>conf/**</include>
+					</includes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.equinox</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.simple</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven b/demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven
index b0ae3606e..8315df7f5 100644
--- a/demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven
+++ b/demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven
@@ -1,6 +1,5 @@
 
 The following files have been resolved:
-   com.jcraft.jzlib:com.springsource.com.jcraft.jzlib:jar:1.0.7:compile
    com.thoughtworks.xstream:com.springsource.com.thoughtworks.xstream:jar:1.2.2:compile
    javax.activation:com.springsource.javax.activation:jar:1.1.1:compile
    javax.ejb:com.springsource.javax.ejb:jar:3.0.0:compile
@@ -25,8 +24,7 @@ The following files have been resolved:
    org.apache.xerces:com.springsource.org.apache.xerces:jar:2.8.1:compile
    org.apache.xml:com.springsource.org.apache.xml.resolver:jar:1.2.0:compile
    org.apache.xmlcommons:com.springsource.org.apache.xmlcommons:jar:1.3.3:compile
-   org.argeo.dep.osgi:org.argeo.dep.osgi.activemq:jar:5.2.0.argeo.2:compile
-   org.argeo.dep.osgi:org.argeo.dep.osgi.maven.embedder:jar:2.0.4.argeo.1-SNAPSHOT:compile
+   org.argeo.dep.osgi:org.argeo.dep.osgi.activemq:jar:5.2.0.argeo.3:compile
    org.argeo.slc:org.argeo.slc.detached.launcher:jar:0.11.3-SNAPSHOT:compile
    org.argeo.slc.demo:org.argeo.slc.demo.basic:jar:0.11.3-SNAPSHOT:compile
    org.argeo.slc.demo:org.argeo.slc.demo.log4j:jar:0.11.3-SNAPSHOT:compile
@@ -42,8 +40,8 @@ The following files have been resolved:
    org.dbunit:com.springsource.org.dbunit:jar:2.2.0:compile
    org.eclipse.osgi:org.eclipse.osgi:jar:3.4.2.R34x_v20080826-1230:compile
    org.junit:com.springsource.junit:jar:3.8.2:compile
-   org.objectweb.asm:com.springsource.org.objectweb.asm:jar:2.2.0:compile
-   org.objectweb.asm:com.springsource.org.objectweb.asm.attrs:jar:2.2.0:compile
+   org.objectweb.asm:com.springsource.org.objectweb.asm:jar:1.5.3:compile
+   org.objectweb.asm:com.springsource.org.objectweb.asm.attrs:jar:1.5.3:compile
    org.springframework:org.springframework.aop:jar:2.5.6.A:compile
    org.springframework:org.springframework.beans:jar:2.5.6.A:compile
    org.springframework:org.springframework.context:jar:2.5.6.A:compile
diff --git a/demo/site/org.argeo.slc.demo.deploy/pom.xml b/demo/site/org.argeo.slc.demo.deploy/pom.xml
index 6f56921e3..72284c240 100644
--- a/demo/site/org.argeo.slc.demo.deploy/pom.xml
+++ b/demo/site/org.argeo.slc.demo.deploy/pom.xml
@@ -5,85 +5,58 @@
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc-demo</artifactId>
 		<version>0.11.3-SNAPSHOT</version>
-		<relativePath>../..</relativePath>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.demo</groupId>
 	<artifactId>org.argeo.slc.demo.deploy</artifactId>
 	<name>Argeo SLC Demo Deploy</name>
-	<packaging>jar</packaging>
+	<packaging>pom</packaging>
 	<properties></properties>
 	<build>
-		<resources>
-			<resource>
-				<directory>.</directory>
-				<includes>
-					<include>META-INF/**</include>
-				</includes>
-			</resource>
-		</resources>
+		<defaultGoal>antrun:run</defaultGoal>
 		<plugins>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
-					</archive>
-				</configuration>
-			</plugin>
 			<plugin>
 				<artifactId>maven-dependency-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>manager</id>
-						<phase>initialize</phase>
 						<goals>
-							<goal>list</goal>
+							<goal>unpack</goal>
 						</goals>
-						<configuration>
-							<outputFile>META-INF/slc/dep/manager.maven</outputFile>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy</id>
 						<phase>initialize</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
 						<configuration>
-							<outputDirectory>${project.build.directory}/equinox</outputDirectory>
-							<stripVersion>true</stripVersion>
+							<outputDirectory>target/equinox</outputDirectory>
 							<artifactItems>
-								<artifactItem>
-									<groupId>org.eclipse.osgi</groupId>
-									<artifactId>org.eclipse.osgi</artifactId>
-									<version>${version.equinox}</version>
-								</artifactItem>
 								<artifactItem>
 									<groupId>org.argeo.slc.runtime</groupId>
 									<artifactId>org.argeo.slc.osgiboot</artifactId>
 									<version>${project.version}</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.argeo.slc.runtime</groupId>
-									<artifactId>org.argeo.slc.osgiboot</artifactId>
-									<version>${project.version}</version>
-									<type>xml</type>
+									<type>tar.gz</type>
 									<classifier>osgiboot</classifier>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
 					</execution>
 				</executions>
+
 			</plugin>
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
 				<configuration>
 					<tasks>
-						<property name="slc.osgi.locations" refid="maven.compile.classpath" />
+						<path id="slc.osgi.locations.raw">
+							<dirset dir="${user.dir}/..">
+								<include name="*" />
+								<exclude name=".svn" />
+								<exclude name="*.deploy" />
+							</dirset>
+							<path refid="maven.compile.classpath" />
+						</path>
+						<pathconvert dirsep="/" property="slc.osgi.locations"
+							refid="slc.osgi.locations.raw" />
+
 						<property name="slc.osgi.start"
 							value="org.springframework.osgi.extender,org.argeo.slc.demo.basic" />
-						<ant
-							antfile="${project.build.directory}/equinox/org.argeo.slc.osgiboot-osgiboot.xml" />
+						<ant antfile="target/equinox/osgiboot.xml" />
 
 					</tasks>
 				</configuration>
@@ -91,35 +64,38 @@
 
 		</plugins>
 	</build>
+	<profiles>
+		<profile>
+			<id>agent</id>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.slc.demo</groupId>
+					<artifactId>org.argeo.slc.demo.agent</artifactId>
+					<version>${project.version}</version>
+				</dependency>
+				<dependency>
+					<groupId>com.thoughtworks.xstream</groupId>
+					<artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
+					<version>1.2.2</version>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
 	<dependencies>
 
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.equinox</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.activemq</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.castor</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.maven</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 
 		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.detached.launcher</artifactId>
+			<groupId>org.argeo.slc.demo</groupId>
+			<artifactId>org.argeo.slc.demo.basic</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.argeo.slc.demo</groupId>
-			<artifactId>org.argeo.slc.demo.basic</artifactId>
+			<artifactId>org.argeo.slc.demo.manager</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -127,26 +103,5 @@
 			<artifactId>org.argeo.slc.demo.log4j</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-
-
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
-			<version>1.2.2</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.xerces</groupId>
-			<artifactId>
-					com.springsource.org.apache.xerces
-				</artifactId>
-			<version>2.8.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xmlcommons</groupId>
-			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
-			<version>1.3.3</version>
-		</dependency>
-
 	</dependencies>
 </project>
diff --git a/demo/site/org.argeo.slc.demo.log4j/.project b/demo/site/org.argeo.slc.demo.log4j/.project
new file mode 100644
index 000000000..54f7c6223
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.log4j/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.slc.demo.log4j</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/demo/site/org.argeo.slc.demo.log4j/.settings/org.eclipse.pde.core.prefs b/demo/site/org.argeo.slc.demo.log4j/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 000000000..2f9fe3d2d
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.log4j/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,5 @@
+#Fri Mar 13 13:55:45 CET 2009
+eclipse.preferences.version=1
+pluginProject.equinox=false
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/demo/site/org.argeo.slc.demo.log4j/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.log4j/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..e632ac38b
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.log4j/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Log4j Plug-in
+Bundle-SymbolicName: org.argeo.slc.demo.log4j
+Bundle-Version: 1.0.0
+Fragment-Host: com.springsource.org.apache.log4j
+
diff --git a/demo/site/org.argeo.slc.demo.log4j/log4j.properties b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
new file mode 100644
index 000000000..3ee850471
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
@@ -0,0 +1,25 @@
+log4j.rootLogger=WARN, console
+
+## Levels
+log4j.logger.org.argeo=DEBUG
+log4j.logger.org.argeo.slc.execution.ExecutionParameterPostProcessor=TRACE
+log4j.logger.org.argeo.slc.execution.ExecutionContext=DEBUG
+log4j.logger.org.argeo.slc.execution.SimpleExecutionSpec=DEBUG
+
+log4j.logger.org.springframework=WARN
+
+log4j.logger.org.apache.activemq=WARN
+log4j.logger.org.apache.activemq.transport=WARN
+log4j.logger.org.apache.activemq.selector=WARN
+
+log4j.logger.org.apache.catalina=INFO
+log4j.logger.org.apache.coyote=INFO
+log4j.logger.org.apache.tomcat=INFO
+
+## Appenders
+# console is set to be a ConsoleAppender.
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+
+# console uses PatternLayout.
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
diff --git a/demo/site/org.argeo.slc.demo.log4j/pom.xml b/demo/site/org.argeo.slc.demo.log4j/pom.xml
new file mode 100644
index 000000000..ef3f9e69f
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.log4j/pom.xml
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>argeo-slc-demo</artifactId>
+		<version>0.11.3-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<groupId>org.argeo.slc.demo</groupId>
+	<artifactId>org.argeo.slc.demo.log4j</artifactId>
+	<name>Argeo SLC Demo Logging</name>
+	<packaging>jar</packaging>
+	<properties></properties>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+					<classesDirectory>.</classesDirectory>
+					<includes>
+						<include>log4j.properties</include>
+					</includes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+
+		<dependency>
+			<groupId>org.apache.log4j</groupId>
+			<artifactId>com.springsource.org.apache.log4j</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/demo/site/org.argeo.slc.demo.manager/.project b/demo/site/org.argeo.slc.demo.manager/.project
new file mode 100644
index 000000000..86280b2ee
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.manager/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.slc.demo.manager</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/demo/site/org.argeo.slc.demo.manager/.settings/org.eclipse.pde.core.prefs b/demo/site/org.argeo.slc.demo.manager/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 000000000..cfc761f33
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.manager/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,5 @@
+#Fri Mar 13 15:28:46 CET 2009
+eclipse.preferences.version=1
+pluginProject.equinox=false
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF
index cf3ff809f..3ee9f68e9 100644
--- a/demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF
@@ -1,27 +1,14 @@
 Manifest-Version: 1.0
-Export-Package: org.argeo.slc.demo.manager;uses:="org.apache.commons.l
- ogging";version="0.11.3.SNAPSHOT"
-Tool: Bnd-0.0.255
-Bundle-Name: Argeo SLC Demo Manager
-Created-By: 1.6.0_0 (Sun Microsystems Inc.)
-Require-Bundle: org.springframework.jms,
- com.springsource.org.castor,
- org.argeo.dep.osgi.activemq,
- org.argeo.slc.support.equinox,
- org.argeo.slc.support.activemq,
- org.argeo.slc.specs,
- org.argeo.slc.support.simple,
- org.springframework.aop,
- org.springframework.oxm,
- com.springsource.net.sf.cglib,
- com.springsource.org.aopalliance
-Bundle-Vendor: Argeo
-Bundle-Version: 0.11.3.SNAPSHOT
-Spring-Context: conf/*
 Bundle-ManifestVersion: 2
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.apache.commons.logging;version="1.1",org.springfra
- mework.beans.factory.config;version="2.5.6.A"
+Bundle-Name: Manager Plug-in
 Bundle-SymbolicName: org.argeo.slc.demo.manager
+Bundle-Version: 1.0.0
+Spring-Context: conf/*
+Created-By: 1.6.0_0 (Sun Microsystems Inc.)
+Import-Package: org.apache.commons.logging;version="1.1",
+ org.argeo.slc.core.execution;version="0.11.3.SNAPSHOT",
+ org.argeo.slc.execution;version="0.11.3.SNAPSHOT",
+ org.springframework.beans.factory.config;version="2.5.6.A"
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-DocURL: http://www.argeo.org
-
+Tool: Bnd-0.0.255
diff --git a/demo/site/org.argeo.slc.demo.manager/build.properties b/demo/site/org.argeo.slc.demo.manager/build.properties
new file mode 100644
index 000000000..5f22cdd44
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.manager/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/
diff --git a/demo/site/org.argeo.slc.demo.manager/conf/manager.xml b/demo/site/org.argeo.slc.demo.manager/conf/manager.xml
index 34b9c3da4..ba9fea471 100644
--- a/demo/site/org.argeo.slc.demo.manager/conf/manager.xml
+++ b/demo/site/org.argeo.slc.demo.manager/conf/manager.xml
@@ -7,23 +7,4 @@
 	<bean id="modulesManager" class="org.argeo.slc.core.execution.DefaultModulesManager">
 		<property name="executionModules" ref="executionModules" />
 	</bean>
-<!-- 
-	<bean class="org.argeo.slc.osgi.BundlesManager" init-method="init">
-		<property name="urlsToInstall">
-			<bean class="org.argeo.slc.maven.MavenToUrl">
-				<property name="baseUrl" value="reference:file:${user.home}/.m2/repository/" />
-				<property name="mavenFiles">
-					<bean class="org.argeo.slc.maven.DependencyFileLoader">
-						<property name="dependenciesResource"
-							value="classpath:/META-INF/slc/dep/manager.maven" />
-					</bean>
-				</property>
-			</bean>
-		</property>
-	</bean>
- -->
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="ignoreUnresolvablePlaceholders" value="true" />
-	</bean>
 </beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.manager/conf/maven.xml b/demo/site/org.argeo.slc.demo.manager/conf/maven.xml
deleted file mode 100644
index 0fb5c6a6b..000000000
--- a/demo/site/org.argeo.slc.demo.manager/conf/maven.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="
-	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-<!-- 
-	<bean id="mavenManager" class="org.argeo.slc.maven.MavenManager"
-		init-method="init">
-		<property name="remoteRepositories">
-			<list>
-				<bean class="org.argeo.slc.maven.RemoteRepository">
-					<property name="id" value="central" />
-					<property name="url" value="http://repo1.maven.org/maven2" />
-				</bean>
-			</list>
-		</property>
-	</bean>
-	 -->
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.manager/pom.xml b/demo/site/org.argeo.slc.demo.manager/pom.xml
new file mode 100644
index 000000000..8d5177dff
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.manager/pom.xml
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>argeo-slc-demo</artifactId>
+		<version>0.11.3-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<groupId>org.argeo.slc.demo</groupId>
+	<artifactId>org.argeo.slc.demo.manager</artifactId>
+	<name>Argeo SLC Demo Manager</name>
+	<packaging>jar</packaging>
+	<properties></properties>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+					<classesDirectory>.</classesDirectory>
+					<includes>
+						<include>conf/**</include>
+					</includes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.simple</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/demo/site/org.argeo.slc.demo.manager/target/maven-archiver/pom.properties b/demo/site/org.argeo.slc.demo.manager/target/maven-archiver/pom.properties
new file mode 100644
index 000000000..a9be558bb
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.manager/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Fri Mar 13 17:40:59 CET 2009
+version=0.11.3-SNAPSHOT
+groupId=org.argeo.slc.demo
+artifactId=org.argeo.slc.demo.manager
diff --git a/demo/site/org.argeo.slc.demo.manager/target/org.argeo.slc.demo.manager-0.11.3-SNAPSHOT-tests.jar b/demo/site/org.argeo.slc.demo.manager/target/org.argeo.slc.demo.manager-0.11.3-SNAPSHOT-tests.jar
new file mode 100644
index 0000000000000000000000000000000000000000..4bb7ac9de348ada3ba8d0b43f3743f532980e87e
GIT binary patch
literal 2099
zcmWIWW@h1H00D*GTq`gGN^k;cU)K;vT~9wZ{Q#&k4hC7Evaj#C*ozq%7&@647(|ej
z`8xV}y1532==r+UPV~=zWFT<#{lrhQI(~PvY!yS^D6W=kaE%Ic2)z7lm(e)^oh1HE
zbD8e%<EwXix$yeT@6~nrHo|UeFI4_(yQXO*>Ag_eomu<(E7`ZDdsY<0TbD&1xp-pH
zhlmdk7bey@ey^W?_vzL|V^!Uq&7W7u&X(Y`f0Pli`jq_AD$Q3;rfg@|Jow+`d)nMM
zIOIh7^N_c%_m-K8OBsu?EOL<!x~dw!?Cvx6y-U1KPVUO#JT%SYffgrg7E>)#^n>EJ
z%PRJ5JvF7q<=EqU={}PpRlgUST#Vi{Prv03%fFnxqD8$5p4moxT3V+M{HwE%v?~kp
zu(r=PIwHtj)ZI`$Wh?)x)w{Sex%elXXYc;={_<(@Pt!Q;?mN7@k(hdzw=BhcgNxv!
zwJl##_%E0QJ)d%LdErY(`<ep_F2|*=QjrqRTDSLpn&+n5Z}oByGkcas?M|_h?0x=o
z#`i-X|J>XDM}E@!^OvLl+)%kt_{AwCH7A2h&W~?zoqgY<7tF9o!i-CP<Vea*EKALU
z$0(*^B}~QnMd^BpMd_*edc`@(dMT;7`FQl(5~Uy0NWI*|yu|d>BDm2U3=FloR%iJ5
z=Dh+Ywj>q?1{X?=F38W-tH{miof4RT%Ru1x{D;9VHep?|*X$Jag`&FKTr`AM+=_l`
z>0U7X#<aH#zrXFaP*F{t`|a89`{&F5&*7i3@fUAP|GChWcdnm2SZ%y`%Om%I7HK^`
zhb_7<o>?yDS5Z8<L^VBKz4}*))x^uS5B8~?obvBPSoEHVj}cnWcM2Iu_J25ZhP8Al
z>-V75|6hpJy0IwQ+3itV&uO{4W>TN~noE{b^b=&o{14Z<u}c}XMF+_FD~CnI&Q6_|
zWP2!=an_C?gIgzg53QYEt!LBL*fFuAc!kO0@Re;gaZxHMR;u4Wmf7CV*>C?|!uH!<
z_cKnN@pUb{-`l4MxUn<sTD*7f{@u#C@5{Td^W}R66&~f@Ab-c`sJ6#*Ua8#h`-|LN
z7O!!3HuCZM^Qbk%_1Cf7$7{G}&$-IBL1l-C@q5N)b=NlKxF?;G`swzjxj=44p1hFt
z5#5i48$7tze%rJnH)2*;wpRx;-#ej4w~JN3KltM`Z9<y=?#ewe`Wa^N`r`h#WlxIj
z;JSWdDUa;6#6?feHC9g%s~5TT&+p^Jye-_?Q#D@8#Jqo~w4^t&s{D9{ddb-~^9`TQ
zPJd|f+p+YyLD;RcQ=cX{JYC=-QE~XISN7Y<S2u3`w5jP})Boi9nB1Oi^DH7~3gvy9
z%Qq{o^<Zd3*Ry(6+5e2NJi!4j-<}z+ZmIyLp>81drbb#SD9SHLEh@=OEzUjZ&2`8?
zfZ;-|pW%hA&Pk$~3%iy6iPbIGd*DWoVuG<zFKhmK_JZ#ZMA`k;Ou2dZFLU}V%b7{*
zKf1GqH{HIX9lc)r#=EMBsOXt9OS>jXb)QSz`9kmQTI;xK;gEalC+E8`Phu0BGmp7S
z?&ySPKNcwdkCo93OfZcP@MdHZVa8pA1APeu0t{~*K{Qf<4%3FcNCznffhCRVKoYJE
zses34F{r$O0FcFJfVmfL0<83bS&zN^L1_MosTs5A02Udz%>$K32=gp~brzaqu$YG_
zgj71gtioPC!7N+SIE7NHprsYUbJ$Zc!o~-{GLj<Cfow#i=>Tt5Hjv@$Ko|q`%t2NV
F4*<Mp-$4KX

literal 0
HcmV?d00001

diff --git a/demo/site/org.argeo.slc.demo.manager/target/org.argeo.slc.demo.manager-0.11.3-SNAPSHOT.jar b/demo/site/org.argeo.slc.demo.manager/target/org.argeo.slc.demo.manager-0.11.3-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..b6073a661ceb16b1cc83527eff2373d491b13fe0
GIT binary patch
literal 6275
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
Oz~2Dy35{*YK>q_3mCaTF

literal 0
HcmV?d00001

diff --git a/demo/site/pom.xml b/demo/site/pom.xml
new file mode 100644
index 000000000..a278c001c
--- /dev/null
+++ b/demo/site/pom.xml
@@ -0,0 +1,20 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>argeo-slc</artifactId>
+		<version>0.11.3-SNAPSHOT</version>
+		<relativePath>../../org.argeo.slc</relativePath>
+	</parent>
+	<artifactId>argeo-slc-demo</artifactId>
+	<packaging>pom</packaging>
+	<name>Argeo SLC Demo</name>
+	<modules>
+		<module>org.argeo.slc.demo.basic</module>
+		<module>org.argeo.slc.demo.manager</module>
+		<module>org.argeo.slc.demo.agent</module>
+		<module>org.argeo.slc.demo.deploy</module>
+		<module>org.argeo.slc.demo.log4j</module>
+	</modules>
+</project>
diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index ef9663569..7b1198156 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -547,12 +547,12 @@ limitations under the License.
 			<dependency>
 				<groupId>org.objectweb.asm</groupId>
 				<artifactId>com.springsource.org.objectweb.asm</artifactId>
-				<version>2.2.0</version>
+				<version>1.5.3</version>
 			</dependency>
 			<dependency>
 				<groupId>org.objectweb.asm</groupId>
 				<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
-				<version>2.2.0</version>
+				<version>1.5.3</version>
 			</dependency>
 
 			<!-- Ant -->
diff --git a/runtime/org.argeo.slc.osgiboot/pom.xml b/runtime/org.argeo.slc.osgiboot/pom.xml
index 6781b6a02..02ee44aae 100644
--- a/runtime/org.argeo.slc.osgiboot/pom.xml
+++ b/runtime/org.argeo.slc.osgiboot/pom.xml
@@ -29,6 +29,24 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>src/assembly/osgiboot.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>assembly-osgiboot</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
diff --git a/runtime/org.argeo.slc.osgiboot/src/assembly/osgiboot.xml b/runtime/org.argeo.slc.osgiboot/src/assembly/osgiboot.xml
new file mode 100644
index 000000000..f7df1eba6
--- /dev/null
+++ b/runtime/org.argeo.slc.osgiboot/src/assembly/osgiboot.xml
@@ -0,0 +1,35 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+	<id>osgiboot</id>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<formats>
+		<format>tar.gz</format>
+	</formats>
+	<files>
+		<file>
+			<source>target/${project.artifactId}-${project.version}.jar
+			</source>
+			<outputDirectory></outputDirectory>
+			<destName>${project.artifactId}.jar
+			</destName>
+		</file>
+	</files>
+	<fileSets>
+		<fileSet>
+			<directory>src/main/ant</directory>
+			<outputDirectory></outputDirectory>
+		</fileSet>
+	</fileSets>
+	<dependencySets>
+		<dependencySet>
+			<unpack>false</unpack>
+			<outputDirectory></outputDirectory>
+			<outputFileNameMapping>org.eclipse.osgi.jar
+			</outputFileNameMapping>
+			<includes>
+				<include>org.eclipse.osgi:org.eclipse.osgi:jar
+				</include>
+			</includes>
+		</dependencySet>
+	</dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.hibernate/pom.xml b/runtime/org.argeo.slc.support.hibernate/pom.xml
index 2ec107925..a40133d00 100644
--- a/runtime/org.argeo.slc.support.hibernate/pom.xml
+++ b/runtime/org.argeo.slc.support.hibernate/pom.xml
@@ -33,6 +33,10 @@
 				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
 					<instructions>
+						<Fragment-Host>org.argeo.slc.support.simple</Fragment-Host>
+						<Import-Package>*,org.hibernate.proxy</Import-Package>
+						
+					<!-- 
 						<Export-Package>
 							org.argeo.slc.hibernate.*
 						</Export-Package>
@@ -50,6 +54,7 @@
 						org.argeo.slc.msg.test.tree;resolution:=optional
 						</Import-Package>
 						<Fragment-Host>com.springsource.org.hibernate</Fragment-Host>
+						 -->
 					</instructions>
 				</configuration>
 			</plugin>
diff --git a/runtime/org.argeo.slc.support.simple/pom.xml b/runtime/org.argeo.slc.support.simple/pom.xml
index c2fd56e94..7b955acd2 100644
--- a/runtime/org.argeo.slc.support.simple/pom.xml
+++ b/runtime/org.argeo.slc.support.simple/pom.xml
@@ -39,7 +39,6 @@
 							org.argeo.slc.*,org.argeo.slc.core.test.spring
 						</Export-Package>
 						<Import-Package>*,org.apache.commons.logging;version="1.1",
-							org.hibernate.proxy;resolution:="optional",
 							org.dbunit;resolution:="optional",
 							org.dbunit.database;resolution:="optional",
 							org.dbunit.dataset;resolution:="optional",
diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index a977a52e0..be172aaa2 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -11,8 +11,17 @@
 	<packaging>pom</packaging>
 	<name>Argeo SLC Site server</name>
 	<properties>
-		<spring-osgi.version>1.1.2</spring-osgi.version>
-		<spring.version>2.5.5</spring.version>
+		<bundlesToStart>
+			org.argeo.dep.osgi.catalina.start,
+			org.springframework.osgi.extender,
+			org.springframework.osgi.web.extender,
+			org.springframework.osgi.samples.simplewebapp,
+			org.argeo.slc.server.activemq,
+			org.argeo.slc.server.hibernate,
+			org.argeo.slc.webapp,
+			org.argeo.slc.demo.basic,
+			org.argeo.slc.demo.manager
+		</bundlesToStart>
 	</properties>
 	<build>
 		<plugins>
@@ -21,43 +30,20 @@
 				<artifactId>maven-dependency-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>copy</id>
-						<phase>initialize</phase>
 						<goals>
-							<goal>copy</goal>
+							<goal>unpack</goal>
 						</goals>
+						<phase>initialize</phase>
 						<configuration>
-							<outputDirectory>${project.build.directory}/equinox</outputDirectory>
-							<stripVersion>true</stripVersion>
+							<outputDirectory>target/equinox</outputDirectory>
 							<artifactItems>
-								<artifactItem>
-									<groupId>org.eclipse.osgi</groupId>
-									<artifactId>org.eclipse.osgi</artifactId>
-									<version>${version.equinox}</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.argeo.slc.runtime</groupId>
-									<artifactId>org.argeo.slc.osgiboot</artifactId>
-									<version>${project.version}</version>
-								</artifactItem>
 								<artifactItem>
 									<groupId>org.argeo.slc.runtime</groupId>
 									<artifactId>org.argeo.slc.osgiboot</artifactId>
 									<version>${project.version}</version>
-									<type>xml</type>
+									<type>tar.gz</type>
 									<classifier>osgiboot</classifier>
 								</artifactItem>
-								<!--  For Hibernate -->
-								<artifactItem>
-									<groupId>org.objectweb.asm</groupId>
-									<artifactId>com.springsource.org.objectweb.asm</artifactId>
-									<version>1.5.3</version>
-								</artifactItem>
-								<artifactItem>
-									<groupId>org.objectweb.asm</groupId>
-									<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
-									<version>1.5.3</version>
-								</artifactItem>
 							</artifactItems>
 						</configuration>
 					</execution>
@@ -67,9 +53,6 @@
 				<artifactId>maven-antrun-plugin</artifactId>
 				<configuration>
 					<tasks>
-
-						<property name="equinoxDir" location="${project.build.directory}/equinox" />
-
 						<path id="slc.osgi.locations.raw">
 							<dirset dir="${user.dir}/bundles">
 								<include name="*" />
@@ -79,11 +62,6 @@
 								<include name="*" />
 								<exclude name=".svn" />
 							</dirset>
-							<!-- Old ASM for Hibernate: -->
-							<pathelement
-								location="${equinoxDir}/com.springsource.org.objectweb.asm.jar" />
-							<pathelement
-								location="${equinoxDir}/com.springsource.org.objectweb.asm.attrs.jar" />
 							<!-- Dev for Argeo RIA: -->
 							<!--
 								<pathelement
@@ -92,38 +70,15 @@
 							<path refid="maven.compile.classpath" />
 						</path>
 						<pathconvert dirsep="/" property="slc.osgi.locations"
-							refid="slc.osgi.locations.raw">
-						</pathconvert>
+							refid="slc.osgi.locations.raw" />
 
-						<property name="slc.osgi.start"
-							value="org.argeo.dep.osgi.catalina.start,org.springframework.osgi.extender,org.springframework.osgi.web.extender,org.springframework.osgi.samples.simplewebapp,org.argeo.slc.server.activemq,org.argeo.slc.server.hibernate,org.argeo.slc.webapp,org.argeo.slc.demo.basic,org.argeo.slc.demo.manager" />
+						<property name="slc.osgi.start" value="${bundlesToStart}" />
 
 						<property name="javaCommand" value="java -Xmx256m" />
-						<ant antfile="${equinoxDir}/org.argeo.slc.osgiboot-osgiboot.xml" />
-
+						<ant antfile="target/equinox/osgiboot.xml" />
 					</tasks>
 				</configuration>
 			</plugin>
-
-			<!--
-				<plugin> <artifactId>maven-dependency-plugin</artifactId>
-				<executions> <execution> <id>manager</id> <phase>initialize</phase>
-				<goals> <goal>list</goal> </goals> <configuration>
-				<outputFile>target/server.maven</outputFile> </configuration>
-				</execution> </executions> </plugin>
-			-->
-			<!--
-				<plugin> <groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId> <configuration>
-				<webApp>${project.build.directory}/dependency/org.argeo.slc.webapp.war</webApp>
-				<scanIntervalSeconds>0</scanIntervalSeconds>
-				<webDefaultXml>../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml</webDefaultXml>
-				<jettyConfig>src/test/config/jetty/jetty.xml</jettyConfig>
-				<systemProperties> <systemProperty> <name>appserver.base</name>
-				<value>target</value> </systemProperty> <systemProperty>
-				<name>appserver.home</name> <value>target</value> </systemProperty>
-				</systemProperties> </configuration> </plugin>
-			-->
 		</plugins>
 	</build>
 	<dependencies>
@@ -261,29 +216,10 @@
 
 		<!-- For demo -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.activemq</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.castor</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.maven</artifactId>
+			<groupId>org.argeo.slc.demo</groupId>
+			<artifactId>org.argeo.slc.demo.deploy</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 	</dependencies>
-	<!--
-		<repositories> <repository> <id>spring-osgified-artifacts</id>
-		<snapshots> <enabled>true</enabled> </snapshots> <name>Springframework
-		Maven OSGified Artifacts Repository</name>
-		<url>http://maven.springframework.org/osgi</url> </repository>
-		</repositories>
-	-->
 </project>
\ No newline at end of file
-- 
2.39.5