Changeset 6754 for vlo/branches/vlo-3.3-oeaw/vlo-commons/pom.xml

Timestamp:

11/09/15 13:22:00 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

merged with trunk 3.4

Location:

vlo/branches/vlo-3.3-oeaw/vlo-commons

Files:

• . (modified) (1 prop)
• pom.xml (modified) (3 diffs)

vlo/branches/vlo-3.3-oeaw/vlo-commons/pom.xml

@@ -6 +6 @@
         <groupId>eu.clarin.cmdi</groupId>
         <artifactId>vlo</artifactId>
-        <version>3.3-SNAPSHOT</version>
+        <version>3.4-SNAPSHOT</version>
     </parent>
     <groupId>eu.clarin.cmdi</groupId>
     <artifactId>vlo-commons</artifactId>
-    <version>3.3-SNAPSHOT</version>
+    <version>3.4-SNAPSHOT</version>
     <name>VLO Commons</name>
     <url>http://maven.apache.org</url>
@@ -126 +126 @@
         
         <profile>
+            <!-- For deployment to catalog-clarin.esc.rzg.mpg.de -->
+            <id>dev-vm</id>
+            <properties>
+                <vloconfig.solrUrl>http://localhost:8080/vlo-solr/core0/</vloconfig.solrUrl>
+                <vloconfig.dataRootsFile>file:/lat/webapps/vlo/dataroots-testvm.xml</vloconfig.dataRootsFile>
+            </properties>
+        </profile>
+        
+        <profile>
             <!-- For deployment to vlo.clarin.eu -->
             <id>production</id>
@@ -138 +147 @@
         
         <profile>
-            <!-- For deployment to vlo.clarin.eu -->
-            <id>dev-vm</id>
-            <properties>
-                <vloconfig.solrUrl>http://localhost:8080/vlo-solr/core0/</vloconfig.solrUrl>
-                <vloconfig.dataRootsFile>dataroots-testvm.xml</vloconfig.dataRootsFile>
-            </properties>
-        </profile>
-        
-        <profile>
-            <!--  For deployment to beta.vlo.clarin.eu -->
+            <!--  For deployment to beta-vlo.clarin.eu -->
             <id>beta</id>
             <properties>
-                <vloconfig.solrUrl><!-- TODO!!! --></vloconfig.solrUrl>
-                <vloconfig.homeUrl>http://beta.vlo.clarin.eu</vloconfig.homeUrl>
-                <vloconfig.dataRootsFile>dataroots-production.xml</vloconfig.dataRootsFile>
+                <vloconfig.deleteAllFirst>false</vloconfig.deleteAllFirst>
+                <vloconfig.maxDaysInSolr>7</vloconfig.maxDaysInSolr>
+                <vloconfig.solrUrl>http://172.17.42.1:8080/solr/core0/</vloconfig.solrUrl>
+                <vloconfig.homeUrl>http://beta-vlo.clarin.eu</vloconfig.homeUrl>
+                <vloconfig.dataRootsFile>dataroots-beta.xml</vloconfig.dataRootsFile>
             </properties>
         </profile>