X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fpom.xml;h=26c8885faf26f1419198da8fbbef9a5d73b87433;hb=db57a9673765b879019aa176448c1a118fe37f06;hp=d9393f0ed4fa60f36a3250b6f704b3b171d1d095;hpb=c42f45fc5b90bab0fdb7ca083231ed754d774def;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index d9393f0ed..26c8885fa 100644
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -1,38 +1,17 @@
 <project 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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.argeo.slc.runtime</groupId>
-		<artifactId>argeo-slc-runtime</artifactId>
-		<version>0.11.3</version>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>runtime</artifactId>
+		<version>0.13.0</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>
-				<!-- 
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				 -->
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -42,51 +21,34 @@
 						<Export-Package>
 							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,*</Import-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,
+							org.tmatesoft.svn.*;resolution:=optional,
+							*
+						</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>
-					<systemProperties>
-						<systemProperty>
-							<name>activemq.base</name>
-							<value>${user.home}/share/apache-activemq-5.2.0</value>
-						</systemProperty>
-					</systemProperties>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- SLC -->
+		<!-- Commons -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.hibernate</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.castor</artifactId>
+			<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.activemq</artifactId>
+			<artifactId>org.argeo.slc.core</artifactId>
 		</dependency>
 
 		<!-- Spring -->
-		<!--
-			<dependency> <groupId>org.springframework.ws</groupId>
-			<artifactId>org.springframework.ws</artifactId> </dependency>
-		-->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.web.servlet</artifactId>
@@ -95,51 +57,30 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.aop</artifactId>
 		</dependency>
-
-		<!-- J2EE -->
 		<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>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.wsdl</groupId>
-			<artifactId>com.springsource.javax.wsdl</artifactId>
+			<groupId>org.springframework.ws</groupId>
+			<artifactId>org.springframework.oxm</artifactId>
 		</dependency>
 
+		<!-- Web -->
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet.jsp</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.el</groupId>
-			<artifactId>com.springsource.javax.el</artifactId>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.fileupload</artifactId>
 		</dependency>
+
+		<!-- J2EE -->
 		<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>
+			<artifactId>com.springsource.javax.servlet</artifactId>
 		</dependency>
 
-		<!-- Various -->
+		<!-- 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>
@@ -149,13 +90,30 @@
 			<artifactId>com.springsource.com.lowagie.text</artifactId>
 		</dependency>
 
-		<!-- Required in JDK 1.5 -->
+		<!-- Security -->
+
+		<dependency>
+			<groupId>com.springsource.json</groupId>
+			<artifactId>com.springsource.json</artifactId>
+			<version>1.0.1.RELEASE</version>
+		</dependency>
 		<dependency>
-			<groupId>com.sun.xml</groupId>
-			<artifactId>
-				com.springsource.com.sun.xml.messaging.saaj
-				</artifactId>
+			<groupId>org.antlr</groupId>
+			<artifactId>com.springsource.org.antlr</artifactId>
 		</dependency>
 
+		<!-- SVN -->
+		<dependency>
+			<groupId>com.svnkit</groupId>
+			<artifactId>com.springsource.org.tmatesoft.svn</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<!--  Commons VFS
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.vfs</artifactId>
+		</dependency> -->
+
 	</dependencies>
 </project>