Update packaging for new libraries structure

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

diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index 89f1e01cc865b30dfa2d87508b41238dbf1696de..a2821be5c34b1bfa9bae53df6259b6c83e90ba91 100644 (file)
--- 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/ria-slc.xml b/org.argeo.slc.webapp/src/assembly/ria-slc.xml
new file mode 100644 (file)
index 0000000..57085d8
--- /dev/null
+++ b/org.argeo.slc.webapp/src/assembly/ria-slc.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-slc</id>
+       <includeBaseDirectory>false</includeBaseDirectory>
+       <formats>
+               <format>zip</format>
+       </formats>
+       <fileSets>
+               <fileSet>
+                       <directory>src/main/webapp/argeo-ria-lib/slc</directory>
+                       <outputDirectory></outputDirectory>
+                       <includes>
+                               <include>*/**</include>
+                       </includes>
+               </fileSet>
+       </fileSets>
+</assembly>
\ No newline at end of file

diff --git a/org.argeo.slc.webapp/src/assembly/ria.xml b/org.argeo.slc.webapp/src/assembly/ria.xml
new file mode 100644 (file)
index 0000000..eafd070
--- /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

diff --git a/org.argeo.slc.webapp/src/assembly/sdk.xml b/org.argeo.slc.webapp/src/assembly/sdk.xml
deleted file mode 100644 (file)
index 03d6b53..0000000
--- a/org.argeo.slc.webapp/src/assembly/sdk.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<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>
-       <includeBaseDirectory>false</includeBaseDirectory>
-       <formats>
-               <format>zip</format>
-       </formats>
-       <fileSets>
-               <fileSet>
-                       <directory>src/main/webapp/source</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>
-                       </includes>
-               </fileSet>
-       </fileSets>
-</assembly>
\ No newline at end of file