From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 1 Jul 2009 08:14:32 +0000 (+0000)
Subject: New build structure for SLC
X-Git-Tag: argeo-slc-2.1.7~1717
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=e52f0058036d8f53f7289b87a020b5a34429883d;p=gpl%2Fargeo-slc.git

New build structure for SLC

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

diff --git a/server/org.argeo.slc.ria/config.json b/server/org.argeo.slc.ria/config.json
index 04f6e9d93..c42d673f2 100644
--- a/server/org.argeo.slc.ria/config.json
+++ b/server/org.argeo.slc.ria/config.json
@@ -22,7 +22,7 @@
     "API_EXCLUDE"  : ["qx.legacy.*"],
     "LOCALES"      : [ "en" ],
     "ROOT"         : "src/argeo-ria-src",
-	"BUILD_PATH"   : "src/argeo-ria",
+	"BUILD_PATH"   : "target/classes/argeo-ria",
 	"RIA_LIB_PATH" : "src/argeo-ria-lib",
 	"RIA_LIB_URI"  : "../argeo-ria-lib",
 	"CACHE"		   : "cache" ,
diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index b535b3fcb..464065838 100644
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -12,11 +12,16 @@
 	<packaging>jar</packaging>
 	<name>Argeo SLC RIA</name>
 	<build>
+		<resources>
+			<resource>
+				<directory>src</directory>
+				<includes>
+					<include>index.jsp</include>
+					<include>WEB-INF/*</include>
+				</includes>
+			</resource>
+		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-qooxdoo-plugin</artifactId>
@@ -85,17 +90,40 @@
 				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
 					<archive>
-						<compress>false</compress>
-						<manifestFile>src/META-INF/MANIFEST.MF</manifestFile>
+						<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
 					</archive>
-					<classesDirectory>src/</classesDirectory>
-					<includes>
-						<include>index.jsp</include>
-						<include>argeo-ria/**</include>
-						<include>WEB-INF/*</include>
-					</includes>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${version.maven-bundle-plugin}</version>
+				<configuration>
+					<instructions>
+						<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+						<Export-Package></Export-Package>
+						<Import-Package>
+							javax.servlet,
+							javax.servlet.http,
+							javax.servlet.jsp,
+							javax.servlet.jsp.jstl.core,
+							javax.servlet.jsp.jstl.fmt,
+							javax.servlet.jsp.jstl.tlv,
+							javax.servlet.resources
+						</Import-Package>
+						<Web-ContextPath>org.argeo.slc.ria</Web-ContextPath>
+					</instructions>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
diff --git a/server/org.argeo.slc.ria/src/META-INF/MANIFEST.MF b/server/org.argeo.slc.ria/src/META-INF/MANIFEST.MF
deleted file mode 100644
index d639b0797..000000000
--- a/server/org.argeo.slc.ria/src/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Classpath: .
-Bundle-Version: 0.11.4.SNAPSHOT
-Bundle-Name: SLC RIA
-Import-Package: javax.servlet,javax.servlet.http,javax.servlet.jsp,jav
- ax.servlet.jsp.jstl.core,javax.servlet.jsp.jstl.fmt,javax.servlet.jsp
- .jstl.tlv,javax.servlet.resources
-Bundle-SymbolicName: org.argeo.slc.ria
-Web-ContextPath: org.argeo.slc.ria
-