From cd0f1a6edcfa2654c12e2f87b132bcc5bba01f51 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 9 Dec 2008 23:39:40 +0000
Subject: [PATCH] Update packaging for new libraries structure

git-svn-id: https://svn.argeo.org/slc/trunk@1997 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.slc.webapp/pom.xml                  | 26 ++++++++++++++-----
 .../src/assembly/{sdk.xml => ria-slc.xml}     | 11 +++-----
 org.argeo.slc.webapp/src/assembly/ria.xml     | 17 ++++++++++++
 3 files changed, 39 insertions(+), 15 deletions(-)
 rename org.argeo.slc.webapp/src/assembly/{sdk.xml => ria-slc.xml} (56%)
 create mode 100644 org.argeo.slc.webapp/src/assembly/ria.xml

diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index 89f1e01cc..a2821be5c 100644
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/pom.xml
@@ -80,18 +80,30 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assembly/sdk.xml</descriptor>
-					</descriptors>
-				</configuration>
 				<executions>
 					<execution>
-						<id>assembly-base</id>
+						<id>assembly-ria</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>src/assembly/ria.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+					<execution>
+						<id>assembly-ria-slc</id>
 						<phase>package</phase>
 						<goals>
 							<goal>single</goal>
 						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>src/assembly/ria-slc.xml</descriptor>
+							</descriptors>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
@@ -180,7 +192,7 @@
 		<dependency>
 			<groupId>com.sun.xml</groupId>
 			<artifactId>
-					com.springsource.com.sun.xml.messaging.saaj
+				com.springsource.com.sun.xml.messaging.saaj
 				</artifactId>
 		</dependency>
 
diff --git a/org.argeo.slc.webapp/src/assembly/sdk.xml b/org.argeo.slc.webapp/src/assembly/ria-slc.xml
similarity index 56%
rename from org.argeo.slc.webapp/src/assembly/sdk.xml
rename to org.argeo.slc.webapp/src/assembly/ria-slc.xml
index 03d6b53ac..57085d831 100644
--- a/org.argeo.slc.webapp/src/assembly/sdk.xml
+++ b/org.argeo.slc.webapp/src/assembly/ria-slc.xml
@@ -1,21 +1,16 @@
 <assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-	<id>sdk</id>
+	<id>ria-slc</id>
 	<includeBaseDirectory>false</includeBaseDirectory>
 	<formats>
 		<format>zip</format>
 	</formats>
 	<fileSets>
 		<fileSet>
-			<directory>src/main/webapp/source</directory>
+			<directory>src/main/webapp/argeo-ria-lib/slc</directory>
 			<outputDirectory></outputDirectory>
 			<includes>
-				<include>class/org/argeo/ria/**</include>
-				<include>class/org/argeo/slc/ria/**</include>
-				<include>resource/ria/**</include>
-				<include>resource/slc/**</include>
-				<include>translation/ria/**</include>
-				<include>translation/slc/**</include>
+				<include>*/**</include>
 			</includes>
 		</fileSet>
 	</fileSets>
diff --git a/org.argeo.slc.webapp/src/assembly/ria.xml b/org.argeo.slc.webapp/src/assembly/ria.xml
new file mode 100644
index 000000000..eafd0701c
--- /dev/null
+++ b/org.argeo.slc.webapp/src/assembly/ria.xml
@@ -0,0 +1,17 @@
+<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+	<id>ria</id>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<fileSets>
+		<fileSet>
+			<directory>src/main/webapp/argeo-ria-src</directory>
+			<outputDirectory></outputDirectory>
+			<includes>
+				<include>*/**</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+</assembly>
\ No newline at end of file
-- 
2.39.2