X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=sandbox%2Fargeo.slc.jemmytest%2Fpom.xml;h=c324c166cb25b947eb3c0906ae43dc950271ea5d;hb=01a57bdb91452a0c77dd3577ebba2f4b6aa7ae5e;hp=9a3edf3910ef4505a6ad95ce8cb967d0341518a1;hpb=23f3f53b94b01d8658b72283d258b19dbe9e1a0c;p=gpl%2Fargeo-slc.git

diff --git a/sandbox/argeo.slc.jemmytest/pom.xml b/sandbox/argeo.slc.jemmytest/pom.xml
index 9a3edf391..c324c166c 100644
--- a/sandbox/argeo.slc.jemmytest/pom.xml
+++ b/sandbox/argeo.slc.jemmytest/pom.xml
@@ -1,111 +1,179 @@
-<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.1-SNAPSHOT</version>
-        <relativePath>../org.argeo.slc</relativePath>
-    </parent>
-    <groupId>org.argeo.slc.sandbox</groupId>
-    <artifactId>org.argeo.slc.sandbox.jemmytest</artifactId>
-    <name>SLC Sandbox JemmyTest</name>
-    <packaging>bundle</packaging>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.3</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <manifestLocation>
-                        src/main/resources/META-INF
-                    </manifestLocation>
-                    <instructions>
-                        <Bundle-SymbolicName>
-                            ${pom.artifactId}
-                        </Bundle-SymbolicName>
-                        <Bundle-Activator>
-                            org.argeo.slc.jemmytest.JemmyTestActivator
-                        </Bundle-Activator>
-                        <Export-Package>
-                            org.argeo.slc.jemmytest.*
+<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>
+	<groupId>org.argeo.slc.sandbox</groupId>
+	<artifactId>org.argeo.slc.sandbox.jemmytest</artifactId>
+	<name>SLC Sandbox JemmyTest</name>
+	<packaging>jar</packaging>
+	<properties>
+		<bundlesToStart>
+			org.springframework.osgi.extender,
+			org.argeo.slc.detached,
+			org.argeo.slc.sandbox.jemmytest,
+			org.argeo.slc.support.equinox
+		</bundlesToStart>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${version.maven-bundle-plugin}</version>
+				<configuration>
+					<instructions>
+						<Export-Package>
+							org.argeo.slc.jemmytest.*
                         </Export-Package>
-                        <Import-Package>
-                            *,org.springframework.beans.factory.xml;version=2.0.8
+						<Import-Package>
+							*,org.springframework.beans.factory.config
                         </Import-Package>
-                        <Require-Bundle>
-                            org.argeo.slc.detached
+						<Require-Bundle>
+							org.argeo.slc.detached
                         </Require-Bundle>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <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>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration></configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles></profiles>
-    <dependencies>
-        <dependency>
-            <groupId>org.argeo.slc</groupId>
-            <artifactId>org.argeo.slc.detached</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+						<Spring-Context>*;create-asynchronously:=false</Spring-Context>
+					</instructions>
 
-        <dependency>
-            <groupId>org.argeo.slc</groupId>
-            <artifactId>argeo-slc-agent</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.4</source>
+					<target>1.4</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration></configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<phase>initialize</phase>
+						<configuration>
+							<outputDirectory>target/equinox</outputDirectory>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.argeo.slc.runtime</groupId>
+									<artifactId>org.argeo.slc.osgiboot</artifactId>
+									<version>${project.version}</version>
+									<type>tar.gz</type>
+									<classifier>osgiboot</classifier>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
 
+			</plugin>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<configuration>
+					<tasks>
+						<path id="slc.osgi.locations.raw">
+							<dirset dir="${user.dir}/modules">
+								<include name="*" />
+								<exclude name=".svn" />
+							</dirset>
+							<path refid="maven.compile.classpath" />
+						</path>
+						<pathconvert dirsep="/" property="slc.osgi.locations"
+							refid="slc.osgi.locations.raw" />
 
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
+						<property name="slc.osgi.start" value="${bundlesToStart}" />
+						<ant antfile="target/equinox/osgiboot.xml" />
 
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
+					</tasks>
+				</configuration>
+			</plugin>
 
-        <dependency>
-            <groupId>org.argeo.dep.jemmy</groupId>
-            <artifactId>org.argeo.dep.jemmy.nb61</artifactId>
-        </dependency>
+		</plugins>
+	</build>
+	<profiles></profiles>
+	<dependencies>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
 
-    </dependencies>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.lib.detached</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.launcher</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.dep.jemmy</groupId>
+			<artifactId>org.argeo.dep.jemmy.nb61</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.detached.launcher</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.extender</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.equinox</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<!--
+			<dependency> <groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.detached</artifactId>
+			<version>${project.version}</version> <exclusions> <exclusion>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
+			</exclusion> </exclusions> </dependency> <dependency>
+			<groupId>org.argeo.dep.jemmy</groupId>
+			<artifactId>org.argeo.dep.jemmy.nb61</artifactId> </dependency>
+
+			<dependency> <groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.detached.launcher</artifactId>
+			<version>${project.version}</version> <exclusions> <exclusion>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
+			</exclusion> </exclusions> </dependency> <dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.agent</artifactId>
+			<version>${project.version}</version> <exclusions> <exclusion>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
+			</exclusion> </exclusions> </dependency>
+		-->
+	</dependencies>
 </project>
\ No newline at end of file