From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 10 May 2013 15:12:10 +0000 (+0000)
Subject: Prepare SNAPSHOT deployment
X-Git-Tag: svn/tags/argeo-commons-2.1.2.tp~6
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=3eedf1e8bba32d5be162937b8092d2bf0dc3b6f9;p=lgpl%2Fargeo-commons.git

Prepare SNAPSHOT deployment

git-svn-id: https://svn.argeo.org/commons/branches/2.tp@6271 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/demo/argeo_node_web.properties b/demo/argeo_node_web.properties
index 53500e4c6..4200c29d9 100644
--- a/demo/argeo_node_web.properties
+++ b/demo/argeo_node_web.properties
@@ -70,6 +70,9 @@ org.eclipse.equinox.http.registry,\
 #org.argeo.server.catalina.start,\
 #org.eclipse.jetty.server,\
 
+eclipse.application=
+org.eclipse.equinox.http.jetty.context.path=/ui
+
 # Jetty
 org.osgi.service.http.port=7070
 org.eclipse.equinox.http.jetty.log.stderr.threshold=debug
diff --git a/pom.xml b/pom.xml
index 90fdf0c6b..23a8e75f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
@@ -246,7 +247,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.argeo.maven.plugins</groupId>
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<version>1.1.3-SNAPSHOT</version>
+					<version>1.1.2</version>
 				</plugin>
 				<!-- Others -->
 				<plugin>
@@ -494,7 +495,7 @@ limitations under the License.
 		</repository>
 		<repository>
 			<id>argeo-tp-rap</id>
-			<url>http://alma:7080/data/public/java/org.argeo.tp.rap-2.1.x</url>
+			<url>http://repo.argeo.org/data/public/java/org.argeo.tp.rap-2.1.x</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
@@ -540,12 +541,12 @@ limitations under the License.
 				<repository>
 					<id>localrepo</id>
 					<name>Internal Release Repository</name>
-					<url>dav:http://localhost:7070/data/files/java/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
+					<url>dav:http://alma:7080/data/files/java/org.argeo.commons-${developmentCycle.argeo-commons}.tp</url>
 				</repository>
 				<site>
 					<id>site</id>
 					<name>Argeo Commons Site</name>
-					<url>dav:http://localhost:7070/data/files/docs/org.argeo.commons-${developmentCycle.argeo-commons}.x</url>
+					<url>dav:http://alma:7080/data/files/docs/org.argeo.commons-${developmentCycle.argeo-commons}.tp</url>
 				</site>
 			</distributionManagement>
 		</profile>