X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc%2Fpom.xml;h=9e831f351561140763a1387bc6e43649c4124b97;hb=4af418ad1d16e736d7e205567d994eb73c8f7e83;hp=c71c706a43e3e32a172da841a47f23fd1f4e7b93;hpb=d6af711c5514ebe1d193b5d4ef5b505c659607b1;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index c71c706a4..9e831f351 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -1,34 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.9-SNAPSHOT</version>
+	<version>0.11.2-SNAPSHOT</version>
 	<description>SLC Distribution</description>
 	<url>
 		http://www.argeo.org/projects/slc/${project.artfactId}/${project.version}
 	</url>
-	<!-- 
-		<modules>
-		<module>../org.argeo.slc.core</module>
-		<module>../org.argeo.slc.example</module>
-		</modules>
-	-->
 	<properties>
-		<version.spring>2.5.4</version.spring>
-		<version.spring-ws>1.5.2</version.spring-ws>
+		<version.spring>2.5.6.A</version.spring>
+		<version.spring-ws>1.5.5.A</version.spring-ws>
 		<version.maven>2.0.9</version.maven>
-		<version.ant>1.7.0</version.ant>
+		<version.ant>1.7.1</version.ant>
+		<version.jetty>6.1.11</version.jetty>
 	</properties>
 	<scm>
 		<connection>
 			scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc
 		</connection>
-		<url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc</url>
+		<url>
+			https://www.argeo.org/svn/slc/trunk/org.argeo.slc
+		</url>
 	</scm>
 	<issueManagement>
 		<system>Bugzilla</system>
@@ -67,8 +62,16 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.5</source>
+						<target>1.5</target>
+					</configuration>
+				</plugin>
+				<plugin>
+					<artifactId>maven-jar-plugin</artifactId>
+					<configuration>
+						<archive>
+							<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+						</archive>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -100,12 +103,67 @@
 				<plugin>
 					<groupId>org.mortbay.jetty</groupId>
 					<artifactId>maven-jetty-plugin</artifactId>
-					<version>6.1.10</version>
+					<version>${version.jetty}</version>
 					<configuration>
 						<contextPath>org.argeo.slc.webapp</contextPath>
 						<stopKey>stopKey</stopKey>
-						<stopPort>8081</stopPort>
+						<stopPort>9091</stopPort>
+						<connectors>
+							<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+								<port>9090</port>
+								<maxIdleTime>60000</maxIdleTime>
+							</connector>
+						</connectors>
 					</configuration>
+					<dependencies>
+						<dependency>
+							<groupId>org.hsqldb</groupId>
+							<artifactId>
+								com.springsource.org.hsqldb
+							</artifactId>
+							<version>1.8.0.9</version>
+						</dependency>
+						<dependency>
+							<groupId>org.mortbay.jetty</groupId>
+							<artifactId>jetty-plus</artifactId>
+							<version>${version.jetty}</version>
+						</dependency>
+						<dependency>
+							<groupId>org.mortbay.jetty</groupId>
+							<artifactId>jetty-naming</artifactId>
+							<version>${version.jetty}</version>
+						</dependency>
+						<dependency>
+							<groupId>log4j</groupId>
+							<artifactId>log4j</artifactId>
+							<version>1.2.14</version>
+							<type>jar</type>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.felix</groupId>
+					<artifactId>maven-bundle-plugin</artifactId>
+					<version>1.4.3</version>
+					<extensions>true</extensions>
+					<configuration>
+						<manifestLocation>src/main/resources/META-INF</manifestLocation>
+						<instructions>
+							<Bundle-SymbolicName>
+								${pom.artifactId}
+							</Bundle-SymbolicName>
+							<_removeheaders>Bnd-LastModified</_removeheaders>
+						</instructions>
+					</configuration>
+					<executions>
+						<execution>
+							<id>bundle-manifest</id>
+							<phase>process-classes</phase>
+							<goals>
+								<goal>manifest</goal>
+							</goals>
+						</execution>
+					</executions>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -142,82 +200,153 @@
 	</reporting>
 	<dependencyManagement>
 		<dependencies>
+			<!-- Javax -->
 			<dependency>
 				<groupId>javax.transaction</groupId>
-				<artifactId>jta</artifactId>
+				<artifactId>
+					com.springsource.javax.transaction
+				</artifactId>
+				<version>1.1.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.xml.stream</groupId>
+				<artifactId>
+					com.springsource.javax.xml.stream
+				</artifactId>
 				<version>1.0.1</version>
 			</dependency>
+			<dependency>
+				<groupId>javax.xml.soap</groupId>
+				<artifactId>com.springsource.javax.xml.soap</artifactId>
+				<version>1.3.0</version>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.xml</groupId>
+				<artifactId>
+					com.springsource.com.sun.xml.messaging.saaj
+				</artifactId>
+				<scope>runtime</scope>
+				<version>1.3.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.activation</groupId>
+				<artifactId>
+					com.springsource.javax.activation
+				</artifactId>
+				<version>1.1.1</version>
+				<scope>runtime</scope>
+			</dependency>
 
+			<!-- Unit tests -->
 			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
+				<groupId>org.junit</groupId>
+				<artifactId>com.springsource.junit</artifactId>
 				<version>3.8.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.dbunit</groupId>
-				<artifactId>dbunit</artifactId>
-				<version>2.2</version>
-				<exclusions>
-					<exclusion>
-						<groupId>junit-addons</groupId>
-						<artifactId>junit-addons</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>poi</groupId>
-						<artifactId>poi</artifactId>
-					</exclusion>
-				</exclusions>
+				<artifactId>com.springsource.org.dbunit</artifactId>
+				<version>2.2.0</version>
 			</dependency>
+			<!--
+				<dependency> <groupId>org.dbunit</groupId>
+				<artifactId>dbunit</artifactId> <version>2.2.3</version>
+				<exclusions> <exclusion> <groupId>junit-addons</groupId>
+				<artifactId>junit-addons</artifactId> </exclusion> <exclusion>
+				<groupId>poi</groupId> <artifactId>poi</artifactId> </exclusion>
+				</exclusions> </dependency> <dependency> <groupId>log4j</groupId>
+				<artifactId>log4j</artifactId> <version>1.2.15</version>
+				<exclusions> <exclusion> <groupId>com.sun.jmx</groupId>
+				<artifactId>jmxri</artifactId> </exclusion> <exclusion>
+				<groupId>com.sun.jdmk</groupId> <artifactId>jmxtools</artifactId>
+				</exclusion> <exclusion> <groupId>javax.mail</groupId>
+				<artifactId>mail</artifactId> </exclusion> <exclusion>
+				<groupId>javax.jms</groupId> <artifactId>jms</artifactId>
+				</exclusion> </exclusions> </dependency>
+			-->
+
 			<dependency>
-				<groupId>log4j</groupId>
-				<artifactId>log4j</artifactId>
-				<version>1.2.14</version>
+				<groupId>org.apache.log4j</groupId>
+				<artifactId>
+					com.springsource.org.apache.log4j
+				</artifactId>
+				<version>1.2.15</version>
 			</dependency>
 			<dependency>
-				<groupId>commons-logging</groupId>
-				<artifactId>commons-logging</artifactId>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>
+					com.springsource.org.apache.commons.logging
+				</artifactId>
 				<version>1.1.1</version>
 			</dependency>
 			<dependency>
-				<groupId>org.hibernate</groupId>
-				<artifactId>hibernate</artifactId>
-				<version>3.2.6.ga</version>
+				<groupId>org.slf4j</groupId>
+				<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+				<version>1.5.3</version>
 			</dependency>
-
+			<!-- Spring -->
 			<dependency>
 				<groupId>org.springframework</groupId>
-				<artifactId>spring-context</artifactId>
+				<artifactId>org.springframework.core</artifactId>
 				<version>${version.spring}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
-				<artifactId>spring-orm</artifactId>
+				<artifactId>org.springframework.context</artifactId>
 				<version>${version.spring}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
-				<artifactId>spring-jdbc</artifactId>
+				<artifactId>
+					org.springframework.context.support
+				</artifactId>
 				<version>${version.spring}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework</groupId>
-				<artifactId>spring-webmvc</artifactId>
+				<artifactId>org.springframework.orm</artifactId>
 				<version>${version.spring}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>org.springframework.jdbc</artifactId>
+				<version>${version.spring}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>org.springframework.web.servlet</artifactId>
+				<version>${version.spring}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>org.springframework.aop</artifactId>
+				<version>${version.spring}</version>
+			</dependency>
+
 			<dependency>
 				<groupId>org.springframework.ws</groupId>
-				<artifactId>spring-ws-core</artifactId>
+				<artifactId>org.springframework.ws</artifactId>
 				<version>${version.spring-ws}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.ws</groupId>
-				<artifactId>spring-oxm</artifactId>
+				<artifactId>org.springframework.oxm</artifactId>
 				<version>${version.spring-ws}</version>
 			</dependency>
 
+			<!-- Ant -->
 			<dependency>
 				<groupId>org.apache.ant</groupId>
-				<artifactId>ant</artifactId>
+				<artifactId>
+					com.springsource.org.apache.tools.ant
+				</artifactId>
+				<version>1.7.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>
+					ant
+				</artifactId>
 				<version>${version.ant}</version>
 			</dependency>
 			<dependency>
@@ -225,11 +354,39 @@
 				<artifactId>ant-commons-logging</artifactId>
 				<version>${version.ant}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant-commons-net</artifactId>
+				<version>${version.ant}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant-apache-oro</artifactId>
+				<version>${version.ant}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>ant-apache-bsf</artifactId>
+				<version>${version.ant}</version>
+			</dependency>
+			<!-- Required by FTP Ant task -->
+			<dependency>
+				<groupId>commons-net</groupId>
+				<artifactId>commons-net</artifactId>
+				<version>1.4.1</version>
+			</dependency>
+			<dependency>
+				<groupId>oro</groupId>
+				<artifactId>oro</artifactId>
+				<version>2.0.8</version>
+			</dependency>
 
 			<dependency>
 				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-io</artifactId>
-				<version>1.3.2</version>
+				<artifactId>
+					com.springsource.org.apache.commons.io
+				</artifactId>
+				<version>1.4.0</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-cli</groupId>
@@ -237,81 +394,89 @@
 				<version>1.1</version>
 			</dependency>
 
+			<!-- DB Drivers -->
 			<dependency>
-				<groupId>hsqldb</groupId>
-				<artifactId>hsqldb</artifactId>
+				<groupId>org.hsqldb</groupId>
+				<artifactId>com.springsource.org.hsqldb</artifactId>
 				<version>1.8.0.9</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.codehaus.castor</groupId>
-				<artifactId>castor</artifactId>
-				<version>1.2</version>
-				<exclusions>
-					<exclusion>
-						<groupId>xerces</groupId>
-						<artifactId>xerces</artifactId>
-					</exclusion>
-				</exclusions>
+				<artifactId>com.springsource.org.castor</artifactId>
+				<version>1.2.0</version>
 			</dependency>
+			<!--
+				<dependency> <groupId>org.argeo.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.castor</artifactId>
+				<version>1.2</version> </dependency>
+			-->
+			<!--
+				<dependency> <groupId>org.codehaus.castor</groupId>
+				<artifactId>castor</artifactId> <version>1.2</version> <exclusions>
+				<exclusion> <groupId>xerces</groupId>
+				<artifactId>xerces</artifactId> </exclusion> </exclusions>
+				</dependency>
+			-->
 			<dependency>
-				<groupId>xerces</groupId>
-				<artifactId>xercesImpl</artifactId>
+				<groupId>org.apache.xerces</groupId>
+				<artifactId>
+					com.springsource.org.apache.xerces
+				</artifactId>
 				<version>2.8.1</version>
-			</dependency>
-
-			<dependency>
-				<groupId>xalan</groupId>
-				<artifactId>xalan</artifactId>
-				<version>2.7.0</version>
-			</dependency>
-
-			<dependency>
-				<groupId>javax.xml.soap</groupId>
-				<artifactId>saaj-api</artifactId>
-				<version>1.3</version>
-				<scope>runtime</scope>
 				<exclusions>
 					<exclusion>
-						<groupId>javax.activation</groupId>
-						<artifactId>activation</artifactId>
+						<groupId>org.apache.xmlcommons</groupId>
+						<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
 					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
-				<groupId>com.sun.xml.messaging.saaj</groupId>
-				<artifactId>saaj-impl</artifactId>
-				<version>1.3</version>
-				<scope>runtime</scope>
-			</dependency>
-			<dependency>
-				<groupId>javax.activation</groupId>
-				<artifactId>activation</artifactId>
-				<version>1.1</version>
-				<scope>runtime</scope>
+				<groupId>org.apache.xalan</groupId>
+				<artifactId>
+					com.springsource.org.apache.xalan
+				</artifactId>
+				<version>2.7.0</version>
 			</dependency>
 
+			<!-- Web -->
 			<dependency>
 				<groupId>javax.servlet</groupId>
-				<artifactId>jstl</artifactId>
+				<artifactId>
+					com.springsource.javax.servlet.jsp.jstl
+				</artifactId>
 				<version>1.1.2</version>
 			</dependency>
 			<dependency>
-				<groupId>taglibs</groupId>
-				<artifactId>standard</artifactId>
+				<groupId>org.apache.taglibs</groupId>
+				<artifactId>
+					com.springsource.org.apache.taglibs.standard
+				</artifactId>
 				<version>1.1.2</version>
 			</dependency>
 			<dependency>
 				<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-				<version>2.5</version>
+				<artifactId>com.springsource.javax.servlet</artifactId>
+				<version>2.5.0</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.aspectj</groupId>
+				<artifactId>
+					com.springsource.org.aspectj.weaver
+				</artifactId>
+				<version>1.6.2.RELEASE</version>
 			</dependency>
 			<dependency>
-				<groupId>c3p0</groupId>
-				<artifactId>c3p0</artifactId>
-				<version>0.9.1.2</version>
+				<groupId>com.lowagie.text</groupId>
+				<artifactId>
+					com.springsource.com.lowagie.text
+				</artifactId>
+				<version>2.0.8</version>
 			</dependency>
 
+
+			<!-- Maven -->
 			<dependency>
 				<groupId>org.apache.maven</groupId>
 				<artifactId>maven-core</artifactId>
@@ -329,12 +494,76 @@
 				<version>${version.maven}</version>
 			</dependency>
 
+			<!-- OSGi -->
+			<dependency>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>org.apache.felix.main</artifactId>
+				<version>1.2.1</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.apache.felix</groupId>
+						<artifactId>
+							org.apache.felix.framework
+						</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>org.osgi.core</artifactId>
+				<version>1.2.0</version>
+				<scope>provided</scope>
+			</dependency>
+
+			<!-- Auto UI -->
+			<dependency>
+				<groupId>org.argeo.dep.jemmy</groupId>
+				<artifactId>org.argeo.dep.jemmy.nb61</artifactId>
+				<version>0.2.2</version>
+			</dependency>
+
+			<!-- Spring bundle repo -->
+			<dependency>
+				<groupId>javax.transaction</groupId>
+				<artifactId>
+					com.springsource.javax.transaction
+				</artifactId>
+				<version>1.1.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.hibernate</groupId>
+				<artifactId>com.springsource.org.hibernate</artifactId>
+				<version>3.2.6.ga</version>
+			</dependency>
+			<dependency>
+				<groupId>net.sourceforge.jexcelapi</groupId>
+				<artifactId>com.springsource.jxl</artifactId>
+				<version>2.6.6</version>
+			</dependency>
+			<dependency>
+				<groupId>net.sourceforge.ehcache</groupId>
+				<artifactId>com.springsource.net.sf.ehcache</artifactId>
+				<version>1.4.1</version>
+			</dependency>
+			<dependency>
+				<groupId>edu.emory.mathcs.backport</groupId>
+				<artifactId>
+					com.springsource.edu.emory.mathcs.backport
+				</artifactId>
+				<version>3.1.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.wsdl</groupId>
+				<artifactId>com.springsource.javax.wsdl</artifactId>
+				<version>1.6.1</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
 		<repository>
 			<id>central</id>
-			<url>http://www.argeo.org/maven/proxy</url>
+			<url>http://repo1.maven.org/maven2</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -346,6 +575,46 @@
 				<checksumPolicy>fail</checksumPolicy>
 			</snapshots>
 		</repository>
+		<repository>
+			<id>com.springsource.repository.bundles.release</id>
+			<name>
+				SpringSource Enterprise Bundle Repository - SpringSource
+				Bundle Releases
+			</name>
+			<url>
+				http://repository.springsource.com/maven/bundles/release
+			</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>com.springsource.repository.bundles.external</id>
+			<name>
+				SpringSource Enterprise Bundle Repository - External
+				Bundle Releases
+			</name>
+			<url>
+				http://repository.springsource.com/maven/bundles/external
+			</url>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>daily</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
 		<repository>
 			<id>argeo</id>
 			<url>http://www.argeo.org/maven/argeo</url>
@@ -396,4 +665,4 @@
 			</url>
 		</site>
 	</distributionManagement>
-</project>
\ No newline at end of file
+</project>