X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=ea34cd896c199cb3f5d8d7c76f9442bb88e22f14;hb=bf943f312a0a44eccbbfc592be26291f63e63608;hp=559c2fd275eabdf70c85018af420942e4ccf96c9;hpb=7648fd0ae6155bdaedccf76a259a74e9eaa7312f;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 559c2fd27..ea34cd896 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,56 +2,45 @@
 	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</groupId>
-		<artifactId>parent</artifactId>
-		<version>1.0.0</version>
+		<groupId>org.argeo.commons</groupId>
+		<artifactId>argeo-commons</artifactId>
+		<version>0.3.4-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC</name>
-	<version>0.12.1-SNAPSHOT</version>
+	<version>0.13.1-SNAPSHOT</version>
 	<properties>
-		<developmentCycle>0.12</developmentCycle>
-		<version.argeo-distribution>1.0.3</version.argeo-distribution>
-		<version.argeo-ria>0.12.3</version.argeo-ria>
-		<version.argeo-commons>0.1.2</version.argeo-commons>
-		<version.equinox>3.5.1.R35x_v20090827</version.equinox>
-		<version.maven-bundle-plugin>2.0.1</version.maven-bundle-plugin>
-		<version.maven-argeo-osgi>0.1.27</version.maven-argeo-osgi>
-		<version.maven-argeo-qooxdoo>0.8.3.0</version.maven-argeo-qooxdoo>
-		<site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
-		<site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
+		<developmentCycle.slc>0.13</developmentCycle.slc>
+		<site.repoBase>file:///srv/projects/www/slc/site</site.repoBase>
+		<site.urlBase>http://projects.argeo.org/slc/site</site.urlBase>
+		<version.slc>${developmentCycle.slc}.1-SNAPSHOT</version.slc>
 	</properties>
 	<modules>
 		<module>runtime</module>
-		<module>dep</module>
 		<module>modules</module>
-		<module>server</module>
+		<module>eclipse</module>
 		<module>demo</module>
-		<module>integration-tests</module>
-		<!-- <module>archetypes</module>-->
+		<module>dep</module>
+		<!-- <module>integration-tests</module> -->
 		<module>dist</module>
 	</modules>
-	<url>${site.urlBase}/${developmentCycle}</url>
+	<url>${site.urlBase}/${developmentCycle.slc}</url>
 	<scm>
-		<connection>scm:svn:https://www.argeo.org/svn/slc/trunk</connection>
-		<developerConnection>scm:svn:https://www.argeo.org/svn/slc/trunk</developerConnection>
-		<url>https://www.argeo.org/svn/slc/trunk</url>
+		<connection>scm:svn:https://svn.argeo.org/slc/trunk</connection>
+		<developerConnection>scm:svn:https://svn.argeo.org/slc/trunk</developerConnection>
+		<url>https://svn.argeo.org/slc/trunk</url>
 	</scm>
-	<issueManagement>
-		<system>Bugzilla</system>
-		<url>https://www.argeo.org/bugzilla/</url>
-	</issueManagement>
 	<licenses>
 		<license>
 			<name>Apache 2</name>
 			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
 			<distribution>repo</distribution>
 			<comments><![CDATA[
-SLC - Software LifeCycle framework
+SLC (Software Life Cycle) framework
 			   
-Copyright 2008 Mathieu Baudier - Argeo e.U.
+Copyright 2011 Mathieu Baudier
 
 Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
 you may not use this file except in compliance with the License.
@@ -68,10 +57,6 @@ limitations under the License.
 			</comments>
 		</license>
 	</licenses>
-	<organization>
-		<name>Argeo</name>
-		<url>http://www.argeo.org</url>
-	</organization>
 	<developers>
 		<developer>
 			<id>mbaudier</id>
@@ -86,9 +71,9 @@ limitations under the License.
 			</roles>
 		</developer>
 		<developer>
-			<id>cdujeu</id>
-			<name>Charles du Jeu</name>
-			<email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=KGbI2aXhd2VnJuMU9cL3qeGeNSKwIeUjeqa3XCqRQhY=]]></email>
+			<id>ocapillo</id>
+			<name>Olivier Capillon</name>
+			<email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=BYw8i94WiejnvegUKJoCZQQr0h-mYlKCNKZVe_3WPIA=]]></email>
 			<organization>Argeo</organization>
 			<organizationUrl>http://www.argeo.org</organizationUrl>
 			<roles>
@@ -96,9 +81,9 @@ limitations under the License.
 			</roles>
 		</developer>
 		<developer>
-			<id>ocapillo</id>
-			<name>Olivier Capillon</name>
-			<email><![CDATA[http://mailhide.recaptcha.net/d?k=01EM7GpnvY3k8woQ2tnnZLUA==&c=BYw8i94WiejnvegUKJoCZQQr0h-mYlKCNKZVe_3WPIA=]]></email>
+			<id>bsinou</id>
+			<name>Bruno Sinou</name>
+			<email><![CDATA[http://www.google.com/recaptcha/mailhide/d?k=01SZoYvDnJzcw0KOR7M7u6Qg==&c=SVgEjXA_Uu9ZrNzLES92w1ght6puLFiVpoNUddCfSU8=]]></email>
 			<organization>Argeo</organization>
 			<organizationUrl>http://www.argeo.org</organizationUrl>
 			<roles>
@@ -118,87 +103,8 @@ limitations under the License.
 			</roles>
 		</contributor>
 	</contributors>
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<source>1.5</source>
-						<target>1.5</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-source-plugin</artifactId>
-					<executions>
-						<execution>
-							<id>attach-sources</id>
-							<phase>package</phase>
-							<goals>
-								<goal>jar</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.argeo.maven.plugins</groupId>
-					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>${version.maven-argeo-osgi}</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>buildnumber-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>create</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<doCheck>false</doCheck>
-					<doUpdate>false</doUpdate>
-					<useLastCommittedRevision>true</useLastCommittedRevision>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<configuration>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<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-release-plugin</artifactId>
-				<configuration>
-					<autoVersionSubmodules>true</autoVersionSubmodules>
-					<releaseProfiles>release</releaseProfiles>
-					<goals>deploy</goals>
-					<preparationGoals>clean argeo-osgi:update-manifests install</preparationGoals>
-				</configuration>
-			</plugin>
-		</plugins>
-
-	</build>
 	<dependencyManagement>
 		<dependencies>
-			<!-- Third Parties -->
 			<dependency>
 				<groupId>org.argeo.dep</groupId>
 				<artifactId>versions-all</artifactId>
@@ -206,158 +112,12 @@ limitations under the License.
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-
-			<!-- SLC (itself) -->
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.specs</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.core</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.unit</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.launcher</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.detached</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.lib.detached</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.simple</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.ant</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.hibernate</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.castor</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.activemq</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<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.support.osgi</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.equinox</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
-				<artifactId>org.argeo.slc.support.jemmy</artifactId>
-				<version>${project.version}</version>
-			</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>
-			</dependency>
-
-			<dependency>
-				<groupId>org.argeo.ria</groupId>
-				<artifactId>org.argeo.ria.core</artifactId>
-				<version>${version.argeo-ria}</version>
-			</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.runtime</groupId>
-				<artifactId>org.argeo.slc.detached.launcher</artifactId>
-				<version>${project.version}</version>
-				<type>tar.gz</type>
-				<classifier>dist</classifier>
-			</dependency>
-
-			<!-- Argeo Commons -->
-			<dependency>
-				<groupId>org.argeo.commons.security</groupId>
-				<artifactId>org.argeo.security.dep.ads</artifactId>
-				<version>${version.argeo-commons}</version>
-				<type>pom</type>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.commons.osgi</groupId>
-				<artifactId>org.argeo.osgi.boot</artifactId>
-				<version>${version.argeo-commons}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.commons.server</groupId>
-				<artifactId>org.argeo.server.ads</artifactId>
-				<version>${version.argeo-commons}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.commons.server</groupId>
-				<artifactId>org.argeo.server.dep.jackrabbit.server</artifactId>
-				<version>${version.argeo-commons}</version>
-				<type>pom</type>
-			</dependency>
-			<dependency>
-				<groupId>org.argeo.commons.server</groupId>
-				<artifactId>org.argeo.server.jackrabbit</artifactId>
-				<version>${version.argeo-commons}</version>
-			</dependency>
-
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
 		<repository>
 			<id>argeo</id>
-			<url>http://www.argeo.org/maven/argeo</url>
+			<url>http://maven.argeo.org/argeo</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -369,101 +129,122 @@ limitations under the License.
 				<checksumPolicy>fail</checksumPolicy>
 			</snapshots>
 		</repository>
+		<repository>
+			<id>argeo-snapshots</id>
+			<url>http://dev.argeo.org/maven/argeo-snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>fail</checksumPolicy>
+			</snapshots>
+		</repository>
 	</repositories>
 	<distributionManagement>
 		<site>
 			<id>argeo-slc-site</id>
 			<name>SLC Site</name>
-			<url>file://${site.repoBase}/${developmentCycle}/</url>
+			<url>file://${site.repoBase}/${developmentCycle.slc}/</url>
 		</site>
 	</distributionManagement>
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>index</report>
-							<report>summary</report>
-							<report>license</report>
-							<report>scm</report>
-							<report>issue-tracking</report>
-						</reports>
-					</reportSet>
-					<reportSet>
-						<inherited>false</inherited>
-						<reports>
-							<report>project-team</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<inherited>false</inherited>
-				<configuration>
-					<aggregate>true</aggregate>
-					<encoding>UTF-8</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<configuration>
-					<aggregate>true</aggregate>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-				<inherited>false</inherited>
-				<configuration>
-					<aggregate>true</aggregate>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>taglist-maven-plugin</artifactId>
-				<configuration>
-					<aggregate>true</aggregate>
-					<tags>
-						<tag>TODO</tag>
-						<tag>FIXME</tag>
-						<tag>@deprecated</tag>
-					</tags>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-changelog-plugin</artifactId>
-				<inherited>false</inherited>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-pmd-plugin</artifactId>
-				<version>2.3</version>
-				<inherited>false</inherited>
-				<configuration>
-					<linkXref>true</linkXref>
-					<targetJdk>1.5</targetJdk>
-					<aggregate>true</aggregate>
-					<excludes>
-						<exclude>**/springutil/*.java</exclude>
-					</excludes>
-				</configuration>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>cpd</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-		</plugins>
-	</reporting>
+<!-- 	<reporting> -->
+<!-- 		<plugins> -->
+<!-- 			<plugin> -->
+<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
+<!-- 				<artifactId>maven-project-info-reports-plugin</artifactId> -->
+<!-- 				<version>2.3.1</version> -->
+<!-- 				<reportSets> -->
+<!-- 					<reportSet> -->
+<!-- 						<reports> -->
+<!-- 							<report>index</report> -->
+<!-- 							<report>summary</report> -->
+<!-- 							<report>license</report> -->
+<!-- 							<report>scm</report> -->
+<!-- 							<report>issue-tracking</report> -->
+<!-- 							<report>dependencies</report> -->
+<!-- 						</reports> -->
+<!-- 					</reportSet> -->
+<!-- 					<reportSet> -->
+<!-- 						<inherited>false</inherited> -->
+<!-- 						<reports> -->
+<!-- 							<report>project-team</report> -->
+<!-- 						</reports> -->
+<!-- 					</reportSet> -->
+<!-- 				</reportSets> -->
+<!-- 			</plugin> -->
+<!-- 			<plugin> -->
+<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
+<!-- 				<artifactId>maven-javadoc-plugin</artifactId> -->
+<!-- 				<version>2.7</version> -->
+<!-- 				<inherited>false</inherited> -->
+<!-- 				<configuration> -->
+<!-- 					<aggregate>true</aggregate> -->
+<!-- 					<encoding>UTF-8</encoding> -->
+<!-- 				</configuration> -->
+<!-- 			</plugin> -->
+<!-- 			<plugin> -->
+<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
+<!-- 				<artifactId>maven-jxr-plugin</artifactId> -->
+<!-- 				<version>2.2</version> -->
+<!-- 				<configuration> -->
+<!-- 					<aggregate>true</aggregate> -->
+<!-- 				</configuration> -->
+<!-- 			</plugin> -->
+<!-- 			<plugin> -->
+<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
+<!-- 				<artifactId>maven-surefire-report-plugin</artifactId> -->
+<!-- 				<version>2.7.1</version> -->
+<!-- 				<inherited>false</inherited> -->
+<!-- 				<configuration> -->
+<!-- 					<aggregate>true</aggregate> -->
+<!-- 				</configuration> -->
+<!-- 			</plugin> -->
+<!-- 			<plugin> -->
+<!-- 				<groupId>org.codehaus.mojo</groupId> -->
+<!-- 				<artifactId>taglist-maven-plugin</artifactId> -->
+<!-- 				<version>2.4</version> -->
+<!-- 				<configuration> -->
+<!-- 					<aggregate>true</aggregate> -->
+<!-- 					<tags> -->
+<!-- 						<tag>TODO</tag> -->
+<!-- 						<tag>FIXME</tag> -->
+<!-- 						<tag>@deprecated</tag> -->
+<!-- 					</tags> -->
+<!-- 				</configuration> -->
+<!-- 			</plugin> -->
+<!-- 			<plugin> -->
+<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
+<!-- 				<artifactId>maven-changelog-plugin</artifactId> -->
+<!-- 				<version>2.2</version> -->
+<!-- 				<inherited>false</inherited> -->
+<!-- 			</plugin> -->
+<!-- 			<plugin> -->
+<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
+<!-- 				<artifactId>maven-pmd-plugin</artifactId> -->
+<!-- 				<version>2.3</version> -->
+<!-- 				<inherited>false</inherited> -->
+<!-- 				<configuration> -->
+<!-- 					<linkXref>true</linkXref> -->
+<!-- 					<targetJdk>1.5</targetJdk> -->
+<!-- 					<aggregate>true</aggregate> -->
+<!-- 					<excludes> -->
+<!-- 						<exclude>**/springutil/*.java</exclude> -->
+<!-- 					</excludes> -->
+<!-- 				</configuration> -->
+<!-- 				<reportSets> -->
+<!-- 					<reportSet> -->
+<!-- 						<reports> -->
+<!-- 							<report>cpd</report> -->
+<!-- 						</reports> -->
+<!-- 					</reportSet> -->
+<!-- 				</reportSets> -->
+<!-- 			</plugin> -->
+<!-- 		</plugins> -->
+<!-- 	</reporting> -->
 	<profiles>
 		<profile>
 			<id>developer</id>
@@ -486,7 +267,7 @@ limitations under the License.
 				<site>
 					<id>argeo-slc-site</id>
 					<name>SLC Site</name>
-					<url>file://${site.repoBase}/${project.version}</url>
+					<url>file://${site.repoBase}/${version.slc}</url>
 				</site>
 			</distributionManagement>
 		</profile>