X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Forg.argeo.slc.demo.manager%2Fpom.xml;h=dfb9204e738523ea5afadf0b15a655272be8644f;hb=2ad1acc6a405415f6456c5547ad6ec2a87438fec;hp=77d18dd84a1a78375ccc8b499378c96e7c589478;hpb=1b19cac6a92c31d9119fc2986e7aaf3df98b2393;p=gpl%2Fargeo-slc.git

diff --git a/demo/org.argeo.slc.demo.manager/pom.xml b/demo/org.argeo.slc.demo.manager/pom.xml
index 77d18dd84..dfb9204e7 100644
--- a/demo/org.argeo.slc.demo.manager/pom.xml
+++ b/demo/org.argeo.slc.demo.manager/pom.xml
@@ -3,14 +3,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>argeo-slc</artifactId>
+		<artifactId>argeo-slc-demo</artifactId>
 		<version>0.11.3-SNAPSHOT</version>
-		<relativePath>../../org.argeo.slc</relativePath>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.demo</groupId>
 	<artifactId>org.argeo.slc.demo.manager</artifactId>
-	<name>SLC Demo Manager</name>
-	<packaging>bundle</packaging>
+	<name>Argeo SLC Demo Manager</name>
+	<packaging>jar</packaging>
 	<properties></properties>
 	<build>
 		<plugins>
@@ -21,37 +21,73 @@
 				<configuration>
 					<instructions>
 						<Import-Package>org.apache.commons.logging,org.springframework.beans.factory.config</Import-Package>
-						<Require-Bundle>org.springframework.jms,com.springsource.org.castor,com.springsource.org.apache.xbean.spring,com.springsource.org.apache.activemq,org.argeo.slc.execution,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</Require-Bundle>
+						<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</Require-Bundle>
 						<Spring-Context>conf/*</Spring-Context>
-						<!-- 
-						<Embed-Dependency>com.springsource.org.castor</Embed-Dependency>
-						<Embed-Transitive>true</Embed-Transitive>
-						<Import-Package>*,javax.xml.parsers;resolution:=optional,
-							javax.xml.transform;resolution:=optional,
-							javax.xml.transform.dom;resolution:=optional,
-							javax.xml.transform.stream;resolution:=optional,
-							org.w3c.dom;resolution:=optional,
-							org.xml.sax;resolution:=optional,
-							org.xml.sax.helpers;resolution:=optional,
-							netscape.ldap;resolution:=optional,
-							org.apache.oro.text.regex;resolution:=optional,
-							org.apache.xerces.utils.regex;resolution:=optional,
-							weblogic.apache.xml.serialize;resolution:=optional,
-							com.sun.org.apache.xml.internal.serialize;resolution:=optional
-						</Import-Package>
-						<Eclipse-RegisterBuddy>com.springsource.org.castor</Eclipse-RegisterBuddy>
-						 -->
-
 					</instructions>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.1-beta-1</version>
+				<!--
+					<configuration>
+					<mainClass>org.argeo.slc.detached.launcher.Main</mainClass>
+					<systemProperties> <systemProperty>
+					<key>slc.osgi.scanClasspath</key> <value>true</value>
+					</systemProperty> <systemProperty> <key>slc.osgi.start</key>
+					<value>*</value> </systemProperty> </systemProperties>
+					<classpathScope>test</classpathScope> </configuration>
+				-->
+				<configuration>
+					<executable>${java.home}${file.separator}bin${file.separator}java</executable>
+					<arguments>
+						<argument>-Xbootclasspath/p:${settings.localRepository}${file.separator}org${file.separator}apache${file.separator}xerces${file.separator}com.springsource.org.apache.xerces${file.separator}2.8.1${file.separator}com.springsource.org.apache.xerces-2.8.1.jar${path.separator}${settings.localRepository}${file.separator}org${file.separator}apache${file.separator}xmlcommons${file.separator}com.springsource.org.apache.xmlcommons${file.separator}1.3.3${file.separator}com.springsource.org.apache.xmlcommons-1.3.3.jar</argument>
+						<argument>-Dslc.osgi.scanClasspath=true</argument>
+						<argument>-Dslc.osgi.start=*</argument>
+						<argument>-classpath</argument>
+						<classpath />
+						<argument>org.argeo.slc.detached.launcher.Main</argument>
+					</arguments>
+					<workingDirectory>target</workingDirectory>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<configuration>
+					<tasks>
+						<property name="xerces.jar"
+							location="${settings.localRepository}/org/apache/xerces/com.springsource.org.apache.xerces/2.8.1/com.springsource.org.apache.xerces-2.8.1.jar" />
+						<property name="xmlcommons.jar"
+							location="${settings.localRepository}/org/apache/xmlcommons/com.springsource.org.apache.xmlcommons/1.3.3/com.springsource.org.apache.xmlcommons-1.3.3.jar" />
+						
+						<echo message="${xmlcommons.jar}"/>
+						<echo message="${xerces.jar}"/>
+							<!-- 
+						<property name="xerces.jar"
+							refid="maven.dependency.org.apache.xerces:com.springsource.org.apache.xerces::jar.path" />
+						<property name="xmlcommons.jar"
+							refid="maven.dependency.org.apache.xmlcommons:com.springsource.org.apache.xmlcommons::jar.path" />
+						 -->
+						<java classname="org.argeo.slc.detached.launcher.Main" fork="true">
+							<classpath>
+								<path refid="maven.compile.classpath" />
+							</classpath>
+							<sysproperty key="slc.osgi.scanClasspath" value="true"/>
+							<sysproperty key="slc.osgi.start" value="*"/>
+							<jvmarg value="-Xbootclasspath/p:${xmlcommons.jar}${path.separator}${xerces.jar}"/>
+						</java>
+					</tasks>
+				</configuration>
+			</plugin>
+
 		</plugins>
 	</build>
 	<dependencies>
 
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.execution</artifactId>
+			<artifactId>org.argeo.slc.support.equinox</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
@@ -62,11 +98,6 @@
 			<artifactId>org.argeo.slc.support.castor</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.codehaus.castor</groupId>
-			<artifactId>com.springsource.org.castor</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.detached.launcher</artifactId>
@@ -74,13 +105,27 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
-			<artifactId>org.eclipse.osgi</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.log4j</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.extender</artifactId>
+			<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>