Update scripts to install fcrepo-webapp instead of kitchen-sink, and …

…to use the async-indexing config
fcrepo4-labs · Jun 14, 2013 · c5bc8a5 · c5bc8a5
1 parent a5f838c
commit c5bc8a5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/modules/tomcat7/manifests/init.pp b/modules/tomcat7/manifests/init.pp
@@ -40,6 +40,7 @@
     $jre = 'default',
     $install_admin = true,
     $data_dir = '/opt/fcrepo4-data',
+    $repo_config = 'classpath:/config/async-indexing/repository.json',
 ) {
 
   include yourkit

diff --git a/modules/tomcat7/templates/default-tomcat7.erb b/modules/tomcat7/templates/default-tomcat7.erb
@@ -29,10 +29,10 @@ JAVA_OPTS="${JAVA_OPTS} -Dfcrepo.ispn.binary.alternative.CacheDirPath=<%= data_d
 JAVA_OPTS="${JAVA_OPTS} -Dfcrepo.activemq.dir=<%= data_dir %>/active-mq"
 JAVA_OPTS="${JAVA_OPTS} -Dcom.arjuna.ats.arjuna.common.ObjectStoreEnvironmentBean.default.objectStoreDir=<%= data_dir %>/object-store-default"
 JAVA_OPTS="${JAVA_OPTS} -Dcom.arjuna.ats.arjuna.objectstore.objectStoreDir=<%= data_dir %>/object-store"
+JAVA_OPTS="${JAVA_OPTS} -Dfcrepo.modeshape.configuration=<%= repo_config %>"
 
 
-
-JAVA_OPTS="${JAVA_OPTS} -Dfcrepo.infinispan.cache_configuration=config/infinispan_configuration_chained.xml"
+JAVA_OPTS="${JAVA_OPTS} -Dfcrepo.infinispan.cache_configuration=config/infinispan/chained/infinispan.xml"
 
 
 #JAVA_OPTS="${JAVA_OPTS} -Djgroups.tcp.address=10.151.125.215"

diff --git a/modules/tomcat7/tests/init.pp b/modules/tomcat7/tests/init.pp
@@ -5,8 +5,7 @@
    }
 
   tomcat7::fcrepo-webapp { "fcrepo webapp":
-#    url => 'http://ci.fcrepo.org/jenkins/view/FF/job/fcrepo-kitchen-sink/lastSuccessfulBuild/artifact/target/fcrepo-kitchen-sink-4.0-SNAPSHOT.war',
-    url => 'http://ci.fcrepo.org/jenkins/job/fcrepo-kitchen-sink/353/artifact/target/fcrepo-kitchen-sink-4.0-SNAPSHOT.war',
+    url => 'http://ci.fcrepo.org/jenkins/job/fcrepo4/lastSuccessfulBuild/org.fcrepo$fcrepo-webapp/artifact/org.fcrepo/fcrepo-webapp/4.0-SNAPSHOT/fcrepo-webapp-4.0-SNAPSHOT.war',
     war => 'fcrepo.war',
   }
 

diff --git a/site/site.pp b/site/site.pp
@@ -6,8 +6,7 @@
    }
 
   tomcat7::fcrepo-webapp { "fcrepo webapp":
-#    url => 'http://ci.fcrepo.org/jenkins/view/FF/job/fcrepo-kitchen-sink/lastSuccessfulBuild/artifact/target/fcrepo-kitchen-sink-4.0-SNAPSHOT.war',
-    url => 'http://ci.fcrepo.org/jenkins/job/fcrepo-kitchen-sink/353/artifact/target/fcrepo-kitchen-sink-4.0-SNAPSHOT.war',
+    url => 'http://ci.fcrepo.org/jenkins/job/fcrepo4/lastSuccessfulBuild/org.fcrepo\$fcrepo-webapp/artifact/org.fcrepo/fcrepo-webapp/4.0-SNAPSHOT/fcrepo-webapp-4.0-SNAPSHOT.war',
     war => 'fcrepo.war',
   }