Mercurial > hg > ismi-richfaces

changeset 14:afe17645cdea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make om4-ismi run on tuxserve01 (openmind-ismi-dev) again.
author casties
date Tue, 07 Apr 2015 19:40:38 +0000
parents 1e3d54f9ed2b
children 7f4e0e6d7a48
files src/main/java/de/mpiwg/itgroup/ismi/entry/beans/ApplicationBean.java src/main/resources/hibernate.cfg.xml src/main/webapp/imageServer/resources/js/diva4ismi.js src/main/webapp/search/components/titles4Person.xhtml src/main/webapp/search/components/witness4Title.xhtml
diffstat 5 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/ApplicationBean.java	Tue Apr 07 19:38:39 2015 +0000
+++ b/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/ApplicationBean.java	Tue Apr 07 19:40:38 2015 +0000
@@ -47,10 +47,10 @@
 	private static Logger logger = Logger.getLogger(ApplicationBean.class);
 	
 	public static String urlISMIExportServiceAuthors = 
-		"http://ismi-dev.mpiwg-berlin.mpg.de/ISMI/database/export/authorsTitlesWitness";
+		"https://openmind-ismi-dev.mpiwg-berlin.mpg.de/ISMI/database/export/authorsTitlesWitness";
 	
 	public static String urlISMIExportServiceTitles = 
-		"http://ismi-dev.mpiwg-berlin.mpg.de/ISMI/database/export/titlesWitnesses";
+		"https://openmind-ismi-dev.mpiwg-berlin.mpg.de/ISMI/database/export/titlesWitnesses";
 	
 	private BiographyBean biographyBean;
 	
--- a/src/main/resources/hibernate.cfg.xml	Tue Apr 07 19:38:39 2015 +0000
+++ b/src/main/resources/hibernate.cfg.xml	Tue Apr 07 19:40:38 2015 +0000
@@ -22,8 +22,9 @@
 		<property name="hibernate.connection.url">jdbc:mysql://localhost/openmind?characterEncoding=UTF-8</property>
         <property name="hibernate.connection.charSet">UTF-8</property>  
         <property name="hibernate.connection.username">root</property>
-<!--       <property name="hibernate.connection.password">e1nste1n</property>-->
-        <property name="hibernate.connection.password">fB79DCsT87</property>   
+		 <property name="hibernate.connection.password">e1nste1n</property>
+        <!--         <property name="hibernate.connection.password">fB79DCsT87</property>    -->        
+        <!-- <property name="hibernate.connection.password">e1nste1n</property>    -->            
                  
 		<!--
 		<property name="hibernate.connection.username">ismi</property>
--- a/src/main/webapp/imageServer/resources/js/diva4ismi.js	Tue Apr 07 19:38:39 2015 +0000
+++ b/src/main/webapp/imageServer/resources/js/diva4ismi.js	Tue Apr 07 19:40:38 2015 +0000
@@ -1,8 +1,8 @@
 var divaGlobal = {
 		//rest_url : "http://localhost:8080/ismi-richfaces",
 		debugModus : false,
-		//rest_url : "https://openmind-ismi-dev.mpiwg-berlin.mpg.de/om4-ismi",
-                rest_url : "http://ismi-dev.mpiwg-berlin.mpg.de:8080/ismi-richfaces",
+		rest_url : "https://openmind-ismi-dev.mpiwg-berlin.mpg.de/om4-ismi",
+                //rest_url : "http://ismi-dev.mpiwg-berlin.mpg.de:8080/ismi-richfaces",
                 iipServerURL: "https://images.rasi.mcgill.ca/fcgi-bin/iipsrv.fcgi",
                 drupal_url: "https://drupal.mpiwg-berlin.mpg.de/ismi"
 }
--- a/src/main/webapp/search/components/titles4Person.xhtml	Tue Apr 07 19:38:39 2015 +0000
+++ b/src/main/webapp/search/components/titles4Person.xhtml	Tue Apr 07 19:40:38 2015 +0000
@@ -80,7 +80,7 @@
 				<h:outputLink
 					value="#{Session.advancedSearch.titles4PersonQuery.exportDirkUrl}">
 					<h:outputText
-						value="http://ismi-dev.mpiwg-berlin.mpg.de/ISMI/database/export..."
+						value="https://openmind-ismi-dev.mpiwg-berlin.mpg.de/ISMI/database/export..."
 						style="color:#2200C1;font-size:small;cursor:pointer;text-decoration:underline" />
 				</h:outputLink>
 
@@ -210,4 +210,4 @@
 
 	</ui:composition>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/src/main/webapp/search/components/witness4Title.xhtml	Tue Apr 07 19:38:39 2015 +0000
+++ b/src/main/webapp/search/components/witness4Title.xhtml	Tue Apr 07 19:40:38 2015 +0000
@@ -61,7 +61,7 @@
 				<h:outputLink
 					value="#{Session.advancedSearch.witness4TitleQuery.exportDirkUrl}">
 					<h:outputText
-						value="http://ismi-dev.mpiwg-berlin.mpg.de/ISMI/database/export..."
+						value="https://openmind-ismi-dev.mpiwg-berlin.mpg.de/ISMI/database/export..."
 						style="color:#2200C1;font-size:small;cursor:pointer;text-decoration:underline" />
 				</h:outputLink>
 
@@ -134,4 +134,4 @@
 
 	</ui:composition>
 </body>
-</html>
\ No newline at end of file
+</html>