X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fpom.xml;h=4a148d63ed97c37ffceb2254e01b52c6e29d7ec2;hb=d758d1d9a10ab42a0542cf890a6e26c26f4f0fc7;hp=ab4c8e4eeb894c2822a3fa4fcbaf2905cdaf64c5;hpb=8de062b94c1cb1e2f4e053954c0cf4b59b7d58f5;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index ab4c8e4ee..4a148d63e 100644
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -2,29 +2,16 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>argeo-slc</artifactId>
-		<version>0.11.2</version>
-		<relativePath>../../org.argeo.slc</relativePath>
+		<artifactId>runtime</artifactId>
+		<version>0.13.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.runtime</groupId>
 	<artifactId>org.argeo.slc.server</artifactId>
-	<name>Argeo SLC Server</name>
+	<name>SLC Server</name>
 	<description>SLC Server</description>
 	<build>
 		<plugins>
-			<!-- Look to parent pom for inheritances -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -32,71 +19,67 @@
 				<configuration>
 					<instructions>
 						<Export-Package>
-							org.argeo.slc.*
+							org.argeo.slc.*,org.argeo.slc.server,org.argeo.slc.server.spring
 						</Export-Package>
+						<Import-Package>org.w3c.dom;version="0.0.0",
+							javax.xml.*;version="0.0.0",
+							org.argeo.slc.activemq,
+							org.argeo.slc.execution,
+							org.springframework.context.support,
+							*
+						</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<configuration>
-					<webAppSourceDirectory>
-						../../org.argeo.slc.webapp/src/main/webapp
-					</webAppSourceDirectory>
-					<jettyConfig>
-						../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test-local.xml
-					</jettyConfig>
-					<webDefaultXml>../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml</webDefaultXml>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
+		<!-- Commons -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.hibernate</artifactId>
-			<version>${project.version}</version>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.core</artifactId>
+			<version>${version.argeo-commons}</version>
 		</dependency>
+
+		<!-- SLC -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.castor</artifactId>
-			<version>${project.version}</version>
+			<artifactId>org.argeo.slc.core</artifactId>
 		</dependency>
 
+		<!-- Spring -->
 		<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>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.web.servlet</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet</artifactId>
-			<scope>provided</scope>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.aop</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
-			<artifactId>org.springframework.ws</artifactId>
+			<artifactId>org.springframework.oxm</artifactId>
 		</dependency>
+
+		<!-- Web -->
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.web.servlet</artifactId>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.fileupload</artifactId>
 		</dependency>
+
+		<!-- J2EE -->
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.aop</artifactId>
+			<groupId>javax.servlet</groupId>
+			<artifactId>com.springsource.javax.servlet</artifactId>
 		</dependency>
+
+		<!-- AOP -->
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>com.springsource.org.aspectj.weaver</artifactId>
 		</dependency>
+
+		<!-- Docs -->
 		<dependency>
 			<groupId>net.sourceforge.jexcelapi</groupId>
 			<artifactId>com.springsource.jxl</artifactId>
@@ -105,9 +88,17 @@
 			<groupId>com.lowagie.text</groupId>
 			<artifactId>com.springsource.com.lowagie.text</artifactId>
 		</dependency>
+
+		<!-- Security -->
+
+		<dependency>
+			<groupId>com.springsource.json</groupId>
+			<artifactId>com.springsource.json</artifactId>
+			<version>1.0.1.RELEASE</version>
+		</dependency>
 		<dependency>
-			<groupId>javax.wsdl</groupId>
-			<artifactId>com.springsource.javax.wsdl</artifactId>
+			<groupId>org.antlr</groupId>
+			<artifactId>com.springsource.org.antlr</artifactId>
 		</dependency>
 
 	</dependencies>