Fix various things in the launcher perspective, better layout.

[gpl/argeo-slc.git] / server / org.argeo.slc.ria / pom.xml

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index efaa2b5020bea9ea99ab05b8da605fa46045ffac..173cb5ba932bc932bceabe6f34524c79c7ad2fec 100644 (file)
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -2,12 +2,11 @@
        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>
+               <groupId>org.argeo.slc.server</groupId>
+               <artifactId>argeo-slc-server</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.server</groupId>
        <artifactId>org.argeo.slc.ria</artifactId>
        <packaging>jar</packaging>
        <name>Argeo SLC Web UI</name>
@@ -22,24 +21,20 @@
                                <configuration>
                                        <archive>
                                                <compress>false</compress>
-                                               <manifestFile>src/main/webapp/META-INF/MANIFEST.MF</manifestFile>
+                                               <manifestFile>src/META-INF/MANIFEST.MF</manifestFile>
                                        </archive>
-                                       <classesDirectory>src/main/webapp</classesDirectory>
+                                       <classesDirectory>src/</classesDirectory>
                                        <includes>
                                                <include>index.jsp</include>
                                                <include>argeo-ria/**</include>
+                                               <include>WEB-INF/*</include>
                                        </includes>
                                </configuration>
                        </plugin>
-                       <!--
-                               <plugin> <artifactId>maven-war-plugin</artifactId> <configuration>
-                               <warSourceExcludes>qooxdoo-0.8-sdk/**,source/**</warSourceExcludes>
-                               </configuration> </plugin>
-                       -->
                        <plugin>
                                <groupId>org.argeo.slc.maven</groupId>
                                <artifactId>maven-argeo-qooxdoo-plugin</artifactId>
-                               <version>0.8.1.2</version>
+                               <version>0.8.1.6</version>
                                <executions>
                                        <execution>
                                                <id>env</id>
@@ -97,7 +92,7 @@
                                                </goals>
                                                <configuration>
                                                        <descriptors>
-                                                               <descriptor>src/assembly/ria.xml</descriptor>
+                                                               <descriptor>assembly/ria.xml</descriptor>
                                                        </descriptors>
                                                </configuration>
                                        </execution>
@@ -109,7 +104,7 @@
                                                </goals>
                                                <configuration>
                                                        <descriptors>
-                                                               <descriptor>src/assembly/ria-slc.xml</descriptor>
+                                                               <descriptor>assembly/ria-slc.xml</descriptor>
                                                        </descriptors>
                                                </configuration>
                                        </execution>
@@ -117,43 +112,4 @@
                        </plugin>
                </plugins>
        </build>
-       <!--
-               <dependencies> <dependency> <groupId>org.argeo.slc.runtime</groupId>
-               <artifactId>org.argeo.slc.server</artifactId> </dependency>
-
-               <dependency> <groupId>org.springframework.osgi</groupId>
-               <artifactId>org.springframework.osgi.web.extender</artifactId>
-               </dependency> <dependency> <groupId>org.eclipse.osgi</groupId>
-               <artifactId>org.eclipse.osgi</artifactId> </dependency> <dependency>
-               <groupId>org.apache.catalina</groupId>
-               <artifactId>com.springsource.org.apache.catalina</artifactId>
-               </dependency> <dependency> <groupId>org.springframework.osgi</groupId>
-               <artifactId>org.springframework.osgi.web</artifactId> </dependency>
-               <dependency> <groupId>javax.annotation</groupId>
-               <artifactId>com.springsource.javax.annotation</artifactId>
-               </dependency> <dependency> <groupId>javax.persistence</groupId>
-               <artifactId>com.springsource.javax.persistence</artifactId>
-               </dependency> <dependency> <groupId>javax.xml.ws</groupId>
-               <artifactId>com.springsource.javax.xml.ws</artifactId> </dependency>
-               <dependency> <groupId>javax.xml.bind</groupId>
-               <artifactId>com.springsource.javax.xml.bind</artifactId> </dependency>
-               <dependency> <groupId>org.springframework.osgi</groupId>
-               <artifactId>org.springframework.osgi.extender</artifactId>
-               </dependency> <dependency> <groupId>org.argeo.slc.dep.osgi</groupId>
-               <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-               </dependency> <dependency> <groupId>javax.servlet</groupId>
-               <artifactId>com.springsource.javax.servlet.jsp</artifactId>
-               </dependency> <dependency> <groupId>javax.el</groupId>
-               <artifactId>com.springsource.javax.el</artifactId> </dependency>
-               <dependency> <groupId>javax.servlet</groupId>
-               <artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
-               </dependency> <dependency> <groupId>org.apache.taglibs</groupId>
-               <artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
-               </dependency> <dependency> <groupId>org.hsqldb</groupId>
-               <artifactId>com.springsource.org.hsqldb</artifactId> </dependency>
-
-               <dependency> <groupId>com.sun.xml</groupId> <artifactId>
-               com.springsource.com.sun.xml.messaging.saaj </artifactId>
-               </dependency> </dependencies>
-       -->
 </project>
\ No newline at end of file