Prepare SNAPSHOT deployment
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 10 May 2013 15:12:10 +0000 (15:12 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 10 May 2013 15:12:10 +0000 (15:12 +0000)
git-svn-id: https://svn.argeo.org/commons/branches/2.tp@6271 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

demo/argeo_node_web.properties
pom.xml

index 53500e4c69878e3e32a81d9e7afe56fe75f590c4..4200c29d9bd423cadcf464c9abba56a77b689a48 100644 (file)
@@ -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 90fdf0c6b80a78199b2db5818eb59f16669cf5fe..23a8e75f13813bf8b512d3f0cb39cce57a4a8a5b 100644 (file)
--- 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>