X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fpom.xml;h=efaa2b5020bea9ea99ab05b8da605fa46045ffac;hb=4178000915cbf1bea6f85831f57a833f78cd68f6;hp=67bc6c3bb506f2df09f057783ef1f534263a3191;hpb=882f8f01558c1280645a8d823cc689d21fcea1c5;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index 67bc6c3bb..efaa2b502 100644
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/pom.xml
@@ -4,137 +4,156 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>0.11.2-SNAPSHOT</version>
+		<version>0.11.3-SNAPSHOT</version>
 		<relativePath>../org.argeo.slc</relativePath>
 	</parent>
-	<artifactId>org.argeo.slc.webapp</artifactId>
-	<packaging>war</packaging>
-	<name>Argeo SLC Web Application</name>
+	<groupId>org.argeo.slc.server</groupId>
+	<artifactId>org.argeo.slc.ria</artifactId>
+	<packaging>jar</packaging>
+	<name>Argeo SLC Web UI</name>
 	<build>
-		<finalName>${artifactId}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
+				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
-					<warSourceExcludes>qooxdoo-0.8-sdk/**,source/**</warSourceExcludes>
+					<archive>
+						<compress>false</compress>
+						<manifestFile>src/main/webapp/META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+					<classesDirectory>src/main/webapp</classesDirectory>
+					<includes>
+						<include>index.jsp</include>
+						<include>argeo-ria/**</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.0.4</version>
+				<version>0.8.1.2</version>
 				<executions>
 					<execution>
-						<phase>compile</phase>
+						<id>env</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>env</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>slc-source</id>
+						<phase>process-sources</phase>
 						<goals>
 							<goal>generate</goal>
 						</goals>
 						<configuration>
-							<job>slc-build</job>
+							<job>slc-source</job>
 						</configuration>
 					</execution>
-				</executions>
-			</plugin>
-			<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>
-						<phase>package</phase>
+						<id>slc-build</id>
+						<phase>compile</phase>
 						<goals>
-							<goal>single</goal>
+							<goal>generate</goal>
 						</goals>
+						<configuration>
+							<job>slc-build</job>
+						</configuration>
 					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-				<executions>
+					<!--
+						<execution> <id>slc-test</id> <phase>integration-test</phase>
+						<goals> <goal>generate</goal> </goals> <configuration>
+						<job>slc-test</job> </configuration> </execution>
+					-->
 					<execution>
-						<id>surefire-it</id>
-						<phase>integration-test</phase>
+						<id>slc-api</id>
+						<phase>site</phase>
 						<goals>
-							<goal>test</goal>
+							<goal>generate</goal>
 						</goals>
 						<configuration>
-							<skip>false</skip>
+							<job>slc-api</job>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>start-jetty</id>
-						<phase>pre-integration-test</phase>
+						<id>assembly-ria</id>
+						<phase>package</phase>
 						<goals>
-							<goal>run</goal>
+							<goal>single</goal>
 						</goals>
 						<configuration>
-							<webDefaultXml>src/main/config/jetty/webdefault.xml</webDefaultXml>
-							<scanIntervalSeconds>0</scanIntervalSeconds>
-							<daemon>true</daemon>
-							<jettyConfig>
-								src/main/config/jetty/jetty-test.xml
-							</jettyConfig>
+							<descriptors>
+								<descriptor>src/assembly/ria.xml</descriptor>
+							</descriptors>
 						</configuration>
 					</execution>
 					<execution>
-						<id>stop-jetty</id>
-						<phase>post-integration-test</phase>
+						<id>assembly-ria-slc</id>
+						<phase>package</phase>
 						<goals>
-							<goal>stop</goal>
+							<goal>single</goal>
 						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>src/assembly/ria-slc.xml</descriptor>
+							</descriptors>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 		</plugins>
 	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.server</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.launcher</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ws.client</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
-		</dependency>
+	<!--
+		<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>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+		<dependency> <groupId>com.sun.xml</groupId> <artifactId>
+		com.springsource.com.sun.xml.messaging.saaj </artifactId>
+		</dependency> </dependencies>
+	-->
 </project>
\ No newline at end of file