From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 21 Jun 2008 18:26:03 +0000 (+0000)
Subject: Adapt Maven to the new runtime
X-Git-Tag: argeo-slc-2.1.7~2762
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=1a637bef4c0801fc1f9b398d427fa5f553f0c5a5;p=gpl%2Fargeo-slc.git

Adapt Maven to the new runtime

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

diff --git a/org.argeo.slc.example/pom.xml b/org.argeo.slc.example/pom.xml
index 7ff641b13..5792e47dc 100644
--- a/org.argeo.slc.example/pom.xml
+++ b/org.argeo.slc.example/pom.xml
@@ -1,84 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.9-SNAPSHOT</version>
-		<relativePath>../org.argeo.slc</relativePath>
-	</parent>
-	<artifactId>argeo-slc-example</artifactId>
-	<name>Argeo SLC Example</name>
-	<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>
-		<!-- Look to parent pom for inheritances -->
-		<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assembly/slc.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>assembly-exampleSlcAppli</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<systemProperties>
-						<property>
-							<name>it.slc.base</name>
-							<value>${basedir}/exampleSlcAppli</value>
-						</property>
-					</systemProperties>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
+<?xml version="1.0" encoding="UTF-8"?>
+<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.9-SNAPSHOT</version>
+		<relativePath>../org.argeo.slc</relativePath>
+	</parent>
+	<artifactId>argeo-slc-example</artifactId>
+	<name>Argeo SLC Example</name>
+	<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>
+			<!-- Look to parent pom for inheritances -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>src/assembly/slc.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>assembly-exampleSlcAppli</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<systemProperties>
+						<property>
+							<name>slc.rootDir</name>
+							<value>${basedir}/src/main/slc/root</value>
+						</property>
+					</systemProperties>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>argeo-slc-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>argeo-slc-hibernate</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>argeo-slc-agent</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-	</dependencies>
+	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.slc.example/src/assembly/slc.xml b/org.argeo.slc.example/src/assembly/slc.xml
index ce5d8f47b..478d7415f 100644
--- a/org.argeo.slc.example/src/assembly/slc.xml
+++ b/org.argeo.slc.example/src/assembly/slc.xml
@@ -8,7 +8,7 @@
 	</formats>
 	<fileSets>
 		<fileSet>
-			<directory>exampleSlcAppli</directory>
+			<directory>src/main/slc</directory>
 			<outputDirectory></outputDirectory>
 			<includes>
 				<include>**/*</include>