From cdbbb88bcb735919c4e23bc2aeafd3b4354d1975 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 14 Nov 2008 10:06:01 +0000
Subject: [PATCH] Quick fixes for SEB v3.1

git-svn-id: https://svn.argeo.org/slc/trunk@1814 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.slc.detached.launcher/pom.xml       | 223 +++++++++++-------
 .../org/argeo/slc/detached/launcher/Main.java |   5 +
 .../slc/detached/launcher/felix.properties    |  15 +-
 org.argeo.slc.detached/pom.xml                |  11 +-
 .../src/main/resources/META-INF/MANIFEST.MF   |  48 ++--
 5 files changed, 181 insertions(+), 121 deletions(-)

diff --git a/org.argeo.slc.detached.launcher/pom.xml b/org.argeo.slc.detached.launcher/pom.xml
index 7097d72de..3f787836a 100644
--- a/org.argeo.slc.detached.launcher/pom.xml
+++ b/org.argeo.slc.detached.launcher/pom.xml
@@ -1,92 +1,137 @@
-<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.2-SNAPSHOT</version>
-        <relativePath>../org.argeo.slc</relativePath>
-    </parent>
-    <artifactId>org.argeo.slc.detached.launcher</artifactId>
-    <name>Argeo SLC Detached Launcher</name>
-    <packaging>jar</packaging>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.3</source>
-                    <target>1.3</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>
-                                org.argeo.slc.detached.launcher.Main
+<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.2-SNAPSHOT</version>
+		<relativePath>../org.argeo.slc</relativePath>
+	</parent>
+	<artifactId>org.argeo.slc.detached.launcher</artifactId>
+	<name>Argeo SLC Detached Launcher</name>
+	<packaging>jar</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.3</source>
+					<target>1.3</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>
+								org.argeo.slc.detached.launcher.Main
                             </mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/assembly/dist.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>attach-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.main</artifactId>
-        </dependency>
-        <!-- Spring -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>2.0.8</version>
-        </dependency>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>src/assembly/dist.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>attach-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.main</artifactId>
+		</dependency>
+		<!-- Old -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>2.0.8</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+		</dependency>
 
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-        </dependency>
-    </dependencies>
+
+		<!-- Spring -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.context</artifactId>
+			<version>2.5.6.A</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.log4j</groupId>
+			<artifactId>
+					com.springsource.org.apache.log4j
+				</artifactId>
+			<version>1.2.15</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>
+					com.springsource.org.apache.commons.logging
+				</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>xalan</groupId>
+			<artifactId>xalan</artifactId>
+		</dependency>
+	</dependencies>
+	<repositories>
+		<repository>
+			<id>com.springsource.repository.bundles.release</id>
+			<name>
+				SpringSource Enterprise Bundle Repository - SpringSource
+				Bundle Releases
+			</name>
+			<url>
+				http://repository.springsource.com/maven/bundles/release
+			</url>
+		</repository>
+		<repository>
+			<id>com.springsource.repository.bundles.external</id>
+			<name>
+				SpringSource Enterprise Bundle Repository - External
+				Bundle Releases
+			</name>
+			<url>
+				http://repository.springsource.com/maven/bundles/external
+			</url>
+		</repository>
+	</repositories>
 </project>
\ No newline at end of file
diff --git a/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java b/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
index fe69e30c5..423b1cbc4 100644
--- a/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
+++ b/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
@@ -139,6 +139,11 @@ public class Main {
 		Class[] mainArgsClasses = new Class[] { uiArgs.getClass() };
 		Object[] mainArgs = { uiArgs };
 		Method mainMethod = clss.getMethod("main", mainArgsClasses);
+		String[] passedArgs = (String[])mainArgs[0];
+		System.out.println("PASSED ARGS:");
+		for(int i=0;i<passedArgs.length;i++){
+			System.out.println(passedArgs[i]);
+		}
 		mainMethod.invoke(null, mainArgs);
 	}
 
diff --git a/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties b/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties
index 19e5c2443..d2d2d888e 100644
--- a/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties
+++ b/org.argeo.slc.detached.launcher/src/main/resources/org/argeo/slc/detached/launcher/felix.properties
@@ -10,16 +10,9 @@ org.osgi.framework.system.packages=org.osgi.framework; version=1.4.0, \
  org.osgi.service.startlevel; version=1.1.0, \
  org.osgi.service.url; version=1.0.0, \
  org.osgi.util.tracker; version=1.3.3, \
- org.springframework.beans.factory;version=2.0.8,\
- org.springframework.beans.factory.support;version=2.0.8,\
- org.springframework.beans.factory.xml;version=2.0.8,\
- org.springframework.context;version=2.0.8,\
- org.springframework.context.support;version=2.0.8,\
- org.springframework.core.io;version=2.0.8, \
+ org.w3c.dom, \
  org.apache.commons.io; version=1.4.0, \
  org.apache.commons.io.filefilter; version=1.4.0, \
- org.apache.commons.logging, \
- org.w3c.dom, \
  javax.xml.transform, \
  javax.xml.transform.dom, \
  javax.xml.transform.stream \
@@ -32,6 +25,12 @@ felix.auto.start.1= \
  file:${slc.detached.jar} \
  file:${slc.home}/lib/detached/org.apache.felix.shell-1.0.2.jar \
  file:${slc.home}/lib/detached/org.apache.felix.shell.tui-1.0.2.jar \
+ file:${slc.home}/lib/detached/com.springsource.org.apache.commons.logging-1.1.1.jar \
+ file:${slc.home}/lib/detached/com.springsource.org.apache.log4j-1.2.15.jar \
+ file:${slc.home}/lib/detached/org.springframework.aop-2.5.6.A.jar \
+ file:${slc.home}/lib/detached/org.springframework.beans-2.5.6.A.jar \
+ file:${slc.home}/lib/detached/org.springframework.context-2.5.6.A.jar \
+ file:${slc.home}/lib/detached/org.springframework.core-2.5.6.A.jar \
  file:${slc.home}/lib/org.argeo.dep.jemmy.nb61-0.2.2.jar \
  ${slc.detached.userBundles}
 
diff --git a/org.argeo.slc.detached/pom.xml b/org.argeo.slc.detached/pom.xml
index 6695ab3b7..80edd1a86 100644
--- a/org.argeo.slc.detached/pom.xml
+++ b/org.argeo.slc.detached/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -11,6 +12,14 @@
 	<packaging>jar</packaging>
 	<build>
 		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
diff --git a/org.argeo.slc.detached/src/main/resources/META-INF/MANIFEST.MF b/org.argeo.slc.detached/src/main/resources/META-INF/MANIFEST.MF
index ffdb948c9..907e8fe7b 100644
--- a/org.argeo.slc.detached/src/main/resources/META-INF/MANIFEST.MF
+++ b/org.argeo.slc.detached/src/main/resources/META-INF/MANIFEST.MF
@@ -1,39 +1,41 @@
 Manifest-Version: 1.0
 Export-Package: org.argeo.slc.detached.admin;uses:="org.apache.commons
- .logging,org.osgi.framework,org.argeo.slc.detached",org.argeo.slc.det
- ached.ui;uses:="org.argeo.slc.detached,org.springframework.beans.fact
- ory",org.argeo.slc.detached;uses:="org.apache.commons.logging,org.spr
- ingframework.context.support,org.springframework.core.io,org.springfr
- amework.context,org.springframework.beans.factory.xml,javax.xml.trans
- form.dom,org.argeo.slc.detached.drivers,org.w3c.dom,org.springframewo
- rk.beans.factory.support,org.argeo.slc.detached.admin,javax.xml.trans
- form,javax.xml.transform.stream,org.osgi.framework,org.apache.commons
- .io,org.springframework.beans.factory",org.argeo.slc.detached.drivers
- ;uses:="org.apache.commons.logging,org.apache.commons.io.filefilter,j
- avax.xml.transform,javax.xml.transform.stream,org.apache.commons.io,o
- rg.argeo.slc.detached,org.springframework.beans.factory"
+ .logging,org.osgi.framework,org.argeo.slc.detached";version="0.11.2.S
+ NAPSHOT",org.argeo.slc.detached.ui;uses:="org.argeo.slc.detached,org.
+ springframework.beans.factory";version="0.11.2.SNAPSHOT",org.argeo.sl
+ c.detached;uses:="org.apache.commons.logging,org.springframework.cont
+ ext.support,org.springframework.core.io,org.springframework.context,o
+ rg.springframework.beans.factory.xml,javax.xml.transform.dom,org.arge
+ o.slc.detached.drivers,org.w3c.dom,org.springframework.beans.factory.
+ support,org.argeo.slc.detached.admin,javax.xml.transform,javax.xml.tr
+ ansform.stream,org.osgi.framework,org.apache.commons.io,org.springfra
+ mework.beans.factory";version="0.11.2.SNAPSHOT",org.argeo.slc.detache
+ d.drivers;uses:="org.apache.commons.logging,org.apache.commons.io.fil
+ efilter,javax.xml.transform,javax.xml.transform.stream,org.apache.com
+ mons.io,org.argeo.slc.detached,org.springframework.beans.factory";ver
+ sion="0.11.2.SNAPSHOT"
 Built-By: mbaudier
 Tool: Bnd-0.0.255
 Bundle-Name: Argeo SLC Detached
-Created-By: Apache Maven Bundle Plugin
+Created-By: 1.6.0 (Sun Microsystems Inc.)
 Bundle-Vendor: Argeo
 Build-Jdk: 1.6.0
-Bundle-Version: 0.11.1.SNAPSHOT
-Bnd-LastModified: 1224019400860
-Bundle-ManifestVersion: 2
+Bundle-Version: 0.11.2.SNAPSHOT
 Bundle-Activator: org.argeo.slc.detached.Activator
+Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: SLC Distribution
 Import-Package: javax.xml.transform,javax.xml.transform.dom,javax.xml.
  transform.stream,org.apache.commons.io;version="1.4",org.apache.commo
  ns.io.filefilter;version="1.4",org.apache.commons.logging,org.argeo.s
- lc.detached,org.argeo.slc.detached.admin,org.argeo.slc.detached.drive
- rs,org.argeo.slc.detached.ui,org.osgi.framework,org.springframework.b
- eans.factory;version="2.0",org.springframework.beans.factory.support;
- version="2.0",org.springframework.beans.factory.xml;version="2.0",org
- .springframework.context;version="2.0",org.springframework.context.su
- pport;version="2.0",org.springframework.core.io;version="2.0",org.w3c
- .dom
+ lc.detached;version="0.11.2.SNAPSHOT",org.argeo.slc.detached.admin;ve
+ rsion="0.11.2.SNAPSHOT",org.argeo.slc.detached.drivers;version="0.11.
+ 2.SNAPSHOT",org.argeo.slc.detached.ui;version="0.11.2.SNAPSHOT",org.o
+ sgi.framework,org.springframework.beans.factory;version="2.0",org.spr
+ ingframework.beans.factory.support;version="2.0",org.springframework.
+ beans.factory.xml;version="2.0",org.springframework.context;version="
+ 2.0",org.springframework.context.support;version="2.0",org.springfram
+ ework.core.io;version="2.0",org.w3c.dom
 Bundle-SymbolicName: org.argeo.slc.detached
 Bundle-DocURL: http://www.argeo.org
 Originally-Created-By: Apache Maven Bundle Plugin
-- 
2.39.2