X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc%2Fpom.xml;h=d4384b4f47cad06f889b32f3b6c213193c6798f8;hb=e0a1f9d1d1afbe975d595a1327789872075c8772;hp=1ce433a9cb93fa7b7f916aec0f34d13aab3bdd50;hpb=1b19cac6a92c31d9119fc2986e7aaf3df98b2393;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 1ce433a9c..d4384b4f4 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -5,10 +5,13 @@
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.11.3-SNAPSHOT</version>
+	<version>0.11.4-SNAPSHOT</version>
+	<!-- 
 	<url>
 		http://www.argeo.org/projects/slc/${project.artifactId}/${project.version}
 	</url>
+	 -->
+	<url>file:///home/mbaudier/dev/work/slcSite/${project.version}/</url>
 	<properties>
 		<version.spring>2.5.6.A</version.spring>
 		<version.spring-ws>1.5.5.A</version.spring-ws>
@@ -16,12 +19,15 @@
 		<version.maven>2.0.9</version.maven>
 		<version.ant>1.7.0</version.ant>
 		<version.jetty>6.1.14</version.jetty>
-		<version.maven-bundle-plugin>1.4.3</version.maven-bundle-plugin>
-		<version.activemq>5.2.0</version.activemq>
+		<version.tomcat>6.0.18</version.tomcat>
+		<version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
+		<version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
+		<version.activemq>5.2.0.0006</version.activemq>
+		<version.maven-argeo-osgi>0.1.12</version.maven-argeo-osgi>
 	</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>
+		<connection>scm:svn:https://www.argeo.org/svn/slc/trunk</connection>
+		<url>https://www.argeo.org/svn/slc/trunk</url>
 	</scm>
 	<issueManagement>
 		<system>Bugzilla</system>
@@ -81,14 +87,6 @@ limitations under the License.
 						<target>1.5</target>
 					</configuration>
 				</plugin>
-				<plugin>
-					<artifactId>maven-jar-plugin</artifactId>
-					<configuration>
-						<archive>
-							<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
-						</archive>
-					</configuration>
-				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
@@ -102,19 +100,12 @@ limitations under the License.
 						</execution>
 					</executions>
 				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<executions>
-						<execution>
-							<id>attach-javadoc</id>
-							<phase>package</phase>
-							<goals>
-								<goal>jar</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
+				<!--
+					<plugin> <groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-javadoc-plugin</artifactId> <executions>
+					<execution> <id>attach-javadoc</id> <phase>package</phase> <goals>
+					<goal>jar</goal> </goals> </execution> </executions> </plugin>
+				-->
 				<plugin>
 					<groupId>org.mortbay.jetty</groupId>
 					<artifactId>maven-jetty-plugin</artifactId>
@@ -163,87 +154,54 @@ limitations under the License.
 							<artifactId>com.springsource.javax.mail</artifactId>
 							<version>1.4.1</version>
 						</dependency>
-
-						<!--
-							Required by ActiveMQ admin <dependency>
-							<groupId>org.springframework</groupId>
-							<artifactId>org.springframework.web</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.apache.activemq</groupId>
-							<artifactId>com.springsource.org.apache.activemq.web</artifactId>
-							<version>${version.activemq}</version> </dependency> <dependency>
-							<groupId>javax.jms</groupId>
-							<artifactId>com.springsource.javax.jms</artifactId>
-							<version>1.1.0</version> </dependency> <dependency>
-							<groupId>org.apache.geronimo.specs</groupId>
-							<artifactId>com.springsource.javax.management.j2ee</artifactId>
-							<version>1.0.1</version> </dependency> <dependency>
-							<groupId>com.opensymphony.sitemesh</groupId>
-							<artifactId>com.springsource.com.opensymphony.sitemesh</artifactId>
-							<version>2.3.0</version> </dependency>
-						-->
 					</dependencies>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.felix</groupId>
-					<artifactId>maven-bundle-plugin</artifactId>
-					<version>${version.maven-bundle-plugin}</version>
-					<extensions>true</extensions>
-					<configuration>
-						<manifestLocation>target/classes/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>
+					<groupId>org.argeo.slc.maven</groupId>
+					<artifactId>maven-argeo-osgi-plugin</artifactId>
+					<version>${version.maven-argeo-osgi}</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<inherited>false</inherited>
+				<artifactId>maven-resources-plugin</artifactId>
 				<configuration>
-					<descriptors>
-						<descriptor>
-							src/assembly/with-dependencies.xml
-						</descriptor>
-					</descriptors>
+					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
-		</plugins>
-	</build>
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>2.0-beta-5</version>
+				<!--
+					The site plugin is buggy with multi modules.
+					http://jira.codehaus.org/browse/MSITE-276
+				-->
 			</plugin>
+
+
+			<!--
+				<plugin> <groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<inherited>false</inherited> <configuration> <descriptors>
+				<descriptor> src/assembly/with-dependencies.xml </descriptor>
+				</descriptors> </configuration> </plugin>
+			-->
 		</plugins>
-	</reporting>
+
+	</build>
+	<!--
+		<reporting> <plugins> <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-surefire-report-plugin</artifactId> </plugin>
+		<plugin> <groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-javadoc-plugin</artifactId> </plugin> <plugin>
+		<groupId>org.codehaus.mojo</groupId>
+		<artifactId>cobertura-maven-plugin</artifactId> </plugin> </plugins>
+		</reporting>
+	-->
 	<dependencyManagement>
 		<dependencies>
 			<!-- SLC (itself) -->
@@ -267,11 +225,11 @@ limitations under the License.
 				<artifactId>org.argeo.slc.support.simple</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
+			<!--
+				<dependency> <groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.ant</artifactId>
-				<version>${project.version}</version>
-			</dependency>
+				<version>${project.version}</version> </dependency>
+			-->
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.hibernate</artifactId>
@@ -294,24 +252,42 @@ limitations under the License.
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.execution</artifactId>
+				<artifactId>org.argeo.slc.osgiboot</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.ws.client</artifactId>
+				<artifactId>org.argeo.slc.support.equinox</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
+			<!--
+				<dependency> <groupId>org.argeo.slc.runtime</groupId>
+				<artifactId>org.argeo.slc.support.ws.client</artifactId>
+				<version>${project.version}</version> </dependency> <dependency>
 				<groupId>org.argeo.slc</groupId>
 				<artifactId>org.argeo.slc.webapp</artifactId>
+				<version>${project.version}</version> <type>war</type> </dependency>
+			-->
+			<dependency>
+				<groupId>org.argeo.slc.server</groupId>
+				<artifactId>org.argeo.slc.ria</artifactId>
 				<version>${project.version}</version>
-				<type>war</type>
+			</dependency>
+			<!--
+				<dependency> <groupId>org.argeo.slc.server</groupId>
+				<artifactId>bundles</artifactId> <version>0.11.3-SNAPSHOT</version>
+				<type>pom</type> </dependency>
+			-->
+			<dependency>
+				<groupId>org.argeo.slc.server</groupId>
+				<artifactId>deploy</artifactId>
+				<version>${project.version}</version>
+				<type>pom</type>
 			</dependency>
 
 			<!-- SLC dubious -->
 			<dependency>
-				<groupId>org.argeo.slc</groupId>
+				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.detached.launcher</artifactId>
 				<version>${project.version}</version>
 				<type>tar.gz</type>
@@ -344,7 +320,6 @@ limitations under the License.
 				<artifactId>
 					com.springsource.com.sun.xml.messaging.saaj
 				</artifactId>
-				<scope>runtime</scope>
 				<version>1.3.0</version>
 			</dependency>
 			<dependency>
@@ -354,6 +329,26 @@ limitations under the License.
 				</artifactId>
 				<version>1.1.1</version>
 			</dependency>
+			<dependency>
+				<groupId>javax.annotation</groupId>
+				<artifactId>com.springsource.javax.annotation</artifactId>
+				<version>1.0.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.persistence</groupId>
+				<artifactId>com.springsource.javax.persistence</artifactId>
+				<version>1.0.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.xml.ws</groupId>
+				<artifactId>com.springsource.javax.xml.ws</artifactId>
+				<version>2.1.1</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.xml.bind</groupId>
+				<artifactId>com.springsource.javax.xml.bind</artifactId>
+				<version>2.1.7</version>
+			</dependency>
 
 			<!-- Unit tests -->
 			<dependency>
@@ -456,12 +451,11 @@ limitations under the License.
 				<artifactId>org.springframework.jms</artifactId>
 				<version>${version.spring}</version>
 			</dependency>
-
-			<dependency>
-				<groupId>org.springframework.ws</groupId>
+			<!--
+				<dependency> <groupId>org.springframework.ws</groupId>
 				<artifactId>org.springframework.ws</artifactId>
-				<version>${version.spring-ws}</version>
-			</dependency>
+				<version>${version.spring-ws}</version> </dependency>
+			-->
 			<dependency>
 				<groupId>org.springframework.ws</groupId>
 				<artifactId>org.springframework.oxm</artifactId>
@@ -478,6 +472,26 @@ limitations under the License.
 				<artifactId>org.springframework.osgi.core</artifactId>
 				<version>${version.spring-osgi}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.osgi</groupId>
+				<artifactId>org.springframework.osgi.web.extender</artifactId>
+				<version>${version.spring-osgi}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.osgi</groupId>
+				<artifactId>org.springframework.osgi.web</artifactId>
+				<version>${version.spring-osgi}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.osgi</groupId>
+				<artifactId>org.springframework.osgi.test</artifactId>
+				<version>${version.spring-osgi}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
+				<version>1.0.0.argeo3</version>
+			</dependency>
 
 			<!-- AOP -->
 			<dependency>
@@ -490,12 +504,32 @@ limitations under the License.
 				<artifactId>com.springsource.org.aspectj.weaver</artifactId>
 				<version>1.6.2.RELEASE</version>
 			</dependency>
+			<dependency>
+				<groupId>org.aopalliance</groupId>
+				<artifactId>com.springsource.org.aopalliance</artifactId>
+				<version>1.0.0</version>
+			</dependency>
+			<dependency>
+				<groupId>net.sourceforge.cglib</groupId>
+				<artifactId>com.springsource.net.sf.cglib</artifactId>
+				<version>2.1.3</version>
+			</dependency>
+			<dependency>
+				<groupId>org.objectweb.asm</groupId>
+				<artifactId>com.springsource.org.objectweb.asm</artifactId>
+				<version>1.5.3</version>
+			</dependency>
+			<dependency>
+				<groupId>org.objectweb.asm</groupId>
+				<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
+				<version>1.5.3</version>
+			</dependency>
 
 			<!-- Ant -->
 			<dependency>
-				<groupId>org.argeo.dep.osgi</groupId>
-				<artifactId>org.argeo.dep.osgi.ant</artifactId>
-				<version>1.7.1</version>
+				<groupId>org.apache.ant</groupId>
+				<artifactId>com.springsource.org.apache.tools.ant</artifactId>
+				<version>1.7.0</version>
 			</dependency>
 
 			<!-- Required by specific Ant tasks -->
@@ -538,6 +572,16 @@ limitations under the License.
 				<artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
 				<version>1.1</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>com.springsource.org.apache.commons.pool</artifactId>
+				<version>1.4.0</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
+				<version>1.2.2.osgi</version>
+			</dependency>
 
 			<!-- DB Drivers -->
 			<dependency>
@@ -545,6 +589,16 @@ limitations under the License.
 				<artifactId>com.springsource.org.hsqldb</artifactId>
 				<version>1.8.0.9</version>
 			</dependency>
+			<dependency>
+				<groupId>net.sourceforge.jtds</groupId>
+				<artifactId>com.springsource.net.sourceforge.jtds</artifactId>
+				<version>1.2.2</version>
+			</dependency>
+			<dependency>
+				<groupId>com.mysql.jdbc</groupId>
+				<artifactId>com.springsource.com.mysql.jdbc</artifactId>
+				<version>5.1.6</version>
+			</dependency>
 
 			<!-- XML -->
 			<dependency>
@@ -607,14 +661,6 @@ limitations under the License.
 				<artifactId>com.springsource.javax.activation</artifactId>
 				<version>1.1.1</version>
 			</dependency>
-
-			<dependency>
-				<groupId>org.aspectj</groupId>
-				<artifactId>
-					com.springsource.org.aspectj.weaver
-				</artifactId>
-				<version>1.6.2.RELEASE</version>
-			</dependency>
 			<dependency>
 				<groupId>com.lowagie.text</groupId>
 				<artifactId>
@@ -623,6 +669,22 @@ limitations under the License.
 				<version>2.0.8</version>
 			</dependency>
 
+			<!-- Tomcat -->
+			<dependency>
+				<groupId>org.apache.catalina</groupId>
+				<artifactId>com.springsource.org.apache.catalina</artifactId>
+				<version>${version.tomcat}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.jasper</groupId>
+				<artifactId>com.springsource.org.apache.jasper</artifactId>
+				<version>${version.tomcat}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.el</groupId>
+				<artifactId>com.springsource.org.apache.el</artifactId>
+				<version>${version.tomcat}</version>
+			</dependency>
 
 			<!-- Maven -->
 			<dependency>
@@ -650,20 +712,10 @@ limitations under the License.
 			</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>
-			-->
 			<dependency>
 				<groupId>org.eclipse.osgi</groupId>
 				<artifactId>org.eclipse.osgi</artifactId>
-				<version>3.4.2.R34x_v20080826-1230</version>
+				<version>${version.equinox}</version>
 			</dependency>
 
 			<!-- Auto UI -->
@@ -724,27 +776,46 @@ limitations under the License.
 
 			<!-- ActiveMQ -->
 			<dependency>
-				<groupId>org.apache.activemq</groupId>
-				<artifactId>com.springsource.org.apache.activemq</artifactId>
+				<groupId>org.argeo.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.activemq</artifactId>
 				<version>${version.activemq}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.activemq</groupId>
-				<artifactId>com.springsource.org.apache.activemq.web</artifactId>
-				<version>${version.activemq}</version>
+				<artifactId>com.springsource.org.apache.activemq.pool</artifactId>
+				<version>5.2.0</version>
+				<exclusions>
+					<exclusion>
+						<groupId>org.apache.activemq</groupId>
+						<artifactId>com.springsource.org.apache.activemq</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<!--
-				<dependency> <groupId>org.apache.activemq</groupId>
-				<artifactId>activemq-pool</artifactId>
-				<version>${version.activemq}</version> </dependency> <dependency>
-				<groupId>org.apache.activemq</groupId>
-				<artifactId>activemq-optional</artifactId>
-				<version>${version.activemq}</version> </dependency>
+				<dependency> <groupId>org.argeo.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
+				<version>${version.activemq-web}</version> </dependency>
 			-->
 			<dependency>
-				<groupId>org.apache.xbean</groupId>
-				<artifactId>com.springsource.org.apache.xbean.spring</artifactId>
-				<version>3.3.0</version>
+				<groupId>javax.xml.soap</groupId>
+				<artifactId>com.springsource.javax.xml.soap</artifactId>
+				<version>1.3.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.xml.rpc</groupId>
+				<artifactId>com.springsource.javax.xml.rpc</artifactId>
+				<version>1.1.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.ejb</groupId>
+				<artifactId>com.springsource.javax.ejb</artifactId>
+				<version>3.0.0</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>com.springsource.org.apache.camel</artifactId>
+				<version>1.3.0</version>
 			</dependency>
 
 		</dependencies>
@@ -878,12 +949,29 @@ limitations under the License.
 			<name>Argeo FOSS Snapshots Repository</name>
 			<url>file:///var/argeo/maven2/argeo-snapshots</url>
 		</snapshotRepository>
+		<!--
+			<site> <id>argeo-slc-site</id> <name>SLC Site</name> <url>
+			file:///var/argeo/projects/SLC/www/site/${project.version} </url>
+			</site>
+		-->
 		<site>
 			<id>argeo-slc-site</id>
 			<name>SLC Site</name>
-			<url>
-				file:///var/argeo/projects/SLC/www/site/${project.version}
-			</url>
+			<url>file:///home/mbaudier/dev/work/slcSite/${project.version}/</url>
 		</site>
 	</distributionManagement>
+	<profiles>
+		<profile>
+			<id>developer</id>
+			<distributionManagement>
+				<snapshotRepository>
+					<uniqueVersion>true</uniqueVersion>
+					<id>argeo-snapshots-restricted</id>
+					<name>Argeo FOSS Snapshots Repository</name>
+					<url>scpexe://argeo.org/var/argeo/maven2/argeo-snapshots</url>
+				</snapshotRepository>
+			</distributionManagement>
+		</profile>
+	</profiles>
+	
 </project>