Mercurial > hg > ismi-richfaces
changeset 59:403afc3d94eb remove_escidoc
delete config files of instance in repo. copy *.template and edit in instance.
author | casties |
---|---|
date | Mon, 30 Nov 2015 15:37:10 +0100 |
parents | 8d598e37d008 |
children | 4ec8d4cfad26 |
files | .hgignore src/main/resources/hibernate.cfg.xml src/main/resources/hibernate.cfg.xml.template src/main/resources/log4j.properties src/main/resources/log4j.properties.template src/main/resources/openmind.properties src/main/resources/openmind.properties.template |
diffstat | 7 files changed, 132 insertions(+), 167 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Mon Nov 30 15:37:10 2015 +0100 @@ -0,0 +1,17 @@ + +syntax: regexp +^\.classpath$ +syntax: regexp +^\.project$ +syntax: regexp +^target$ +syntax: regexp +^\.settings$ +syntax: regexp +^\.externalToolBuilders$ +syntax: regexp +^src/main/resources/hibernate\.cfg\.xml$ +syntax: regexp +^src/main/resources/log4j\.properties$ +syntax: regexp +^src/main/resources/openmind\.properties$ \ No newline at end of file
--- a/src/main/resources/hibernate.cfg.xml Mon Nov 23 15:23:30 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> -<hibernate-configuration> - <session-factory> - - <!-- C3p0 --> - <property name="hibernate.c3p0.acquire_increment">1</property> - <property name="hibernate.c3p0.idle_test_period">300</property> - <property name="hibernate.c3p0.timeout">120</property> - <property name="hibernate.c3p0.max_size">25</property> - <property name="hibernate.c3p0.min_size">1</property> - <property name="hibernate.c3p0.max_statement">0</property> - <property name="hibernate.c3p0.preferredTestQuery">select 1;</property> - - <property name="connection.provider_class">org.hibernate.connection.C3P0ConnectionProvider</property> - - <!-- <property name="show_sql">true</property> --> - <!-- <property name="hibernate.dialect">org.hibernate.dialect.MySQLDialect</property> --> - - <property name="hibernate.dialect">org.mpi.openmind.repository.utils.CustomMysqlDialect</property> - <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property> - <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.username">ismi</property> - <property name="hibernate.connection.password">ismipw</property> - <property name="hibernate.connection.username">root</property> - <property name="hibernate.connection.password">e1nste1n</property> - <property name="hibernate.connection.username">root</property> - <property name="hibernate.connection.password">dm2eroot</property> - <property name="hibernate.connection.username">root</property> - <property name="hibernate.connection.password">admin</property> - --> - - <!-- <property name="show_sql">true</property> --> - <property name="current_session_context_class">thread</property> - <!-- <property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property> --> - <!-- <property name="hbm2ddl.auto">create</property> --> - <!-- <property name="hibernate.hbm2ddl.auto">validate</property> --> - - - <mapping class="org.mpi.openmind.repository.bo.Node" /> - <mapping class="org.mpi.openmind.repository.bo.Attribute" /> - <mapping class="org.mpi.openmind.repository.bo.Entity" /> - <mapping class="org.mpi.openmind.repository.bo.Relation" /> - <mapping class="org.mpi.openmind.repository.bo.View" /> - <mapping class="org.mpi.openmind.repository.bo.ViewerAttribute" /> - <mapping class="org.mpi.openmind.repository.bo.ViewerPage" /> - <mapping class="org.mpi.openmind.repository.bo.utils.Sequence" /> - <mapping class="org.mpi.openmind.security.bo.User" /> - <mapping class="org.mpi.openmind.security.bo.Group" /> - <mapping class="org.mpi.openmind.security.bo.Role" /> - <mapping class="org.mpi.openmind.security.bo.Permission" /> - <mapping class="org.mpi.openmind.security.bo.utils.UserRole" /> - <mapping class="org.mpi.openmind.security.bo.utils.GroupRole" /> - <mapping class="org.mpi.openmind.security.bo.utils.UserGroup" /> - <mapping class="org.mpi.openmind.security.bo.utils.RolePermission" /> - </session-factory> -</hibernate-configuration>
--- a/src/main/resources/hibernate.cfg.xml.template Mon Nov 23 15:23:30 2015 +0100 +++ b/src/main/resources/hibernate.cfg.xml.template Mon Nov 30 15:37:10 2015 +0100 @@ -2,30 +2,42 @@ <!DOCTYPE hibernate-configuration PUBLIC "-//Hibernate/Hibernate Configuration DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> <hibernate-configuration> <session-factory> - <!-- second level cache configuration --> - <!-- Enable/Disable the second-level cache --> - <property name="cache.use_second_level_cache">true</property> - <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property> - <property name="cache.use_structured_entries">true</property> - <property name="cache.use_query_cache">false</property> - <property name="cache.use_minimal_puts">true</property> - - <!-- property name="hibernate.dialect">org.hibernate.dialect.MySQLDialect</property--> + + <!-- C3p0 --> + <property name="hibernate.c3p0.acquire_increment">1</property> + <property name="hibernate.c3p0.idle_test_period">300</property> + <property name="hibernate.c3p0.timeout">120</property> + <property name="hibernate.c3p0.max_size">25</property> + <property name="hibernate.c3p0.min_size">1</property> + <property name="hibernate.c3p0.max_statement">0</property> + <property name="hibernate.c3p0.preferredTestQuery">select 1;</property> + + <property name="connection.provider_class">org.hibernate.connection.C3P0ConnectionProvider</property> + + <!-- <property name="show_sql">true</property> --> + <!-- <property name="hibernate.dialect">org.hibernate.dialect.MySQLDialect</property> --> + <property name="hibernate.dialect">org.mpi.openmind.repository.utils.CustomMysqlDialect</property> <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property> <property name="hibernate.connection.url">jdbc:mysql://localhost/openmind?characterEncoding=UTF-8</property> - <property name="hibernate.connection.username">root</property> - <property name="hibernate.connection.password">admin</property> - <property name="hibernate.connection.charSet">UTF-8</property> - <!--property name="show_sql">true</property--> + <property name="hibernate.connection.charSet">UTF-8</property> + <property name="hibernate.connection.username">root</property> + <property name="hibernate.connection.password"></property> + + <!-- <property name="show_sql">true</property> --> <property name="current_session_context_class">thread</property> - <property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property> - <!--property name="hbm2ddl.auto">create</property--> + <!-- <property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property> --> + <!-- <property name="hbm2ddl.auto">create</property> --> + <!-- <property name="hibernate.hbm2ddl.auto">validate</property> --> + + <mapping class="org.mpi.openmind.repository.bo.Node" /> <mapping class="org.mpi.openmind.repository.bo.Attribute" /> <mapping class="org.mpi.openmind.repository.bo.Entity" /> <mapping class="org.mpi.openmind.repository.bo.Relation" /> <mapping class="org.mpi.openmind.repository.bo.View" /> + <mapping class="org.mpi.openmind.repository.bo.ViewerAttribute" /> + <mapping class="org.mpi.openmind.repository.bo.ViewerPage" /> <mapping class="org.mpi.openmind.repository.bo.utils.Sequence" /> <mapping class="org.mpi.openmind.security.bo.User" /> <mapping class="org.mpi.openmind.security.bo.Group" />
--- a/src/main/resources/log4j.properties Mon Nov 23 15:23:30 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,84 +0,0 @@ -### direct log messages to stdout ### -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM HH:mm:ss,SSS} %5p %c{1}:%L - %m%n -#%d{dd MMM yyyy HH:mm:ss,SSS} -#%d{ABSOLUTE} -### direct messages to file hibernate.log ### -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.File=${catalina.home}/logs/hibernate.log -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n - -log4j.appender.persistenceServiceFile=org.apache.log4j.FileAppender -log4j.appender.persistenceServiceFile.File=${catalina.home}/logs/persistenceService.log -log4j.appender.persistenceServiceFile.layout=org.apache.log4j.PatternLayout -log4j.appender.persistenceServiceFile.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n - -log4j.appender.ismiFile=org.apache.log4j.FileAppender -log4j.appender.ismiFile.File=${catalina.home}/logs/ismi.log -log4j.appender.ismiFile.layout=org.apache.log4j.PatternLayout -log4j.appender.ismiFile.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n - -### set log levels - for more verbose logging change 'info' to 'debug' ## - -log4j.rootLogger=warn, stdout, ismiFile - -#Others -log4j.logger.org.hibernate.connection.C3P0ConnectionProvider=error - -# Log JDBC bind parameter runtime arguments -#log4j.logger.org.hibernate.type=trace - -#OM -log4j.logger.org.mpi.openmind.repository.services.PersistenceService=info -log4j.logger.org.mpi.openmind.search.SearchService=info -log4j.logger.org.mpi.openmind.cache.CacheService=info -log4j.logger.org.mpi.openmind.cache.AbstractCacheService=info -log4j.logger.org.mpi.openmind.configuration.ConfigurationService=info -log4j.logger.org.mpi.openmind.cache.WrapperService=info -log4j.logger.org.mpi.openmind.repository.services.ServiceRegistry=info -log4j.logger.org.mpi.openmind.repository.bo.Entity=info -#ISMI -log4j.logger.de.mpiwg.itgroup.ismi.search.beans.SimpleSearchBean=info -log4j.logger.de.mpiwg.itgroup.ismi.entry.beans.SessionBean=info -log4j.logger.de.mpiwg.itgroup.ismi.merge.GeneralMerge=info -log4j.logger.de.mpiwg.itgroup.ismi.servlets.JSONInterface=info -log4j.logger.de.mpiwg.itgroup.ismi.entry.beans.CurrentTextBean=info -log4j.logger.de.mpiwg.itgroup.ismi.entry.beans.CurrentPersonBean=info -log4j.logger.de.mpiwg.itgroup.ismi.entry.beans.ApplicationBean=info -log4j.logger.de.mpiwg.itgroup.ismi.entry.beans.CurrentWitnessBean=info -log4j.logger.de.mpiwg.itgroup.ismi.servlets.jsonmethods.JSONGetRels=info -log4j.logger.de.mpiwg.itgroup.ismi.json.utils.JSONUtils=info -log4j.logger.org.mpiwg.itgroup.escidoc.ESciDocCache=info - -log4j.logger.de.mpiwg.itgroup.ismi=info - -log4j.logger.org.mpi.openmind.search.AbstractSearchService=info -log4j.logger.org.mpi.openmind.repository.services.AbstractPersistenceService=info - -log4j.logger.de.mpiwg.itgroup.ismi.entry.beans.CurrentWitnessBean=info -log4j.logger.de.mpiwg.itgroup.ismi.publicView.PublicCodexList=info; -#log4j.logger. -#log4j.logger. -#log4j.logger. - -#log4j.logger.net.sf.hibernate=debug, stdout -#Hibernate -#log4j.logger.org.hibernate.cfg=debug, file -#log4j.logger.org.hibernate.cfg.annotations.Version=info, stdout -#log4j.logger.org.hibernate.cfg.Environment=info, stdout -#log4j.logger.org.hibernate.cfg.AnnotationBinder=info, stdout - - -### enable the following line if you want to track down connection ### -### leakages when using DriverManagerConnectionProvider ### -#log4j.logger.net.sf.hibernate.connection.DriverManagerConnectionProvider=trace - -### log JDBC bind parameters ### -#log4j.logger.net.sf.hibernate.type=debug - - - -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/resources/log4j.properties.template Mon Nov 30 15:37:10 2015 +0100 @@ -0,0 +1,84 @@ +### direct log messages to stdout ### +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM HH:mm:ss,SSS} %5p %c{1}:%L - %m%n +#%d{dd MMM yyyy HH:mm:ss,SSS} +#%d{ABSOLUTE} +### direct messages to file hibernate.log ### +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.File=${catalina.home}/logs/hibernate.log +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n + +log4j.appender.persistenceServiceFile=org.apache.log4j.FileAppender +log4j.appender.persistenceServiceFile.File=${catalina.home}/logs/persistenceService.log +log4j.appender.persistenceServiceFile.layout=org.apache.log4j.PatternLayout +log4j.appender.persistenceServiceFile.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n + +log4j.appender.ismiFile=org.apache.log4j.FileAppender +log4j.appender.ismiFile.File=${catalina.home}/logs/ismi.log +log4j.appender.ismiFile.layout=org.apache.log4j.PatternLayout +log4j.appender.ismiFile.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n + +### set log levels - for more verbose logging change 'info' to 'debug' ## + +log4j.rootLogger=warn, stdout, ismiFile + +#Others +log4j.logger.org.hibernate.connection.C3P0ConnectionProvider=error + +# Log JDBC bind parameter runtime arguments +#log4j.logger.org.hibernate.type=trace + +#OM +log4j.logger.org.mpi.openmind.repository.services.PersistenceService=info +log4j.logger.org.mpi.openmind.search.SearchService=info +log4j.logger.org.mpi.openmind.cache.CacheService=info +log4j.logger.org.mpi.openmind.cache.AbstractCacheService=info +log4j.logger.org.mpi.openmind.configuration.ConfigurationService=info +log4j.logger.org.mpi.openmind.cache.WrapperService=info +log4j.logger.org.mpi.openmind.repository.services.ServiceRegistry=info +log4j.logger.org.mpi.openmind.repository.bo.Entity=info +#ISMI +log4j.logger.de.mpiwg.itgroup.ismi.search.beans.SimpleSearchBean=info +log4j.logger.de.mpiwg.itgroup.ismi.entry.beans.SessionBean=info +log4j.logger.de.mpiwg.itgroup.ismi.merge.GeneralMerge=info +log4j.logger.de.mpiwg.itgroup.ismi.servlets.JSONInterface=info +log4j.logger.de.mpiwg.itgroup.ismi.entry.beans.CurrentTextBean=info +log4j.logger.de.mpiwg.itgroup.ismi.entry.beans.CurrentPersonBean=info +log4j.logger.de.mpiwg.itgroup.ismi.entry.beans.ApplicationBean=info +log4j.logger.de.mpiwg.itgroup.ismi.entry.beans.CurrentWitnessBean=info +log4j.logger.de.mpiwg.itgroup.ismi.servlets.jsonmethods.JSONGetRels=info +log4j.logger.de.mpiwg.itgroup.ismi.json.utils.JSONUtils=info +#log4j.logger.org.mpiwg.itgroup.escidoc.ESciDocCache=info + +log4j.logger.de.mpiwg.itgroup.ismi=info + +log4j.logger.org.mpi.openmind.search.AbstractSearchService=info +log4j.logger.org.mpi.openmind.repository.services.AbstractPersistenceService=info + +log4j.logger.de.mpiwg.itgroup.ismi.entry.beans.CurrentWitnessBean=info +log4j.logger.de.mpiwg.itgroup.ismi.publicView.PublicCodexList=info; +#log4j.logger. +#log4j.logger. +#log4j.logger. + +#log4j.logger.net.sf.hibernate=debug, stdout +#Hibernate +#log4j.logger.org.hibernate.cfg=debug, file +#log4j.logger.org.hibernate.cfg.annotations.Version=info, stdout +#log4j.logger.org.hibernate.cfg.Environment=info, stdout +#log4j.logger.org.hibernate.cfg.AnnotationBinder=info, stdout + + +### enable the following line if you want to track down connection ### +### leakages when using DriverManagerConnectionProvider ### +#log4j.logger.net.sf.hibernate.connection.DriverManagerConnectionProvider=trace + +### log JDBC bind parameters ### +log4j.logger.net.sf.hibernate.type=debug + + + +
--- a/src/main/resources/openmind.properties Mon Nov 23 15:23:30 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -scheduling-path=/net/xserve02.mpiwg-berlin.mpg.de/Volumes/data/Users/jurzua/ismi/automatic-backup -#scheduling-path=/home/jurzua/ismi/automatic-backup -scheduling-enable=true -debug-modus=false \ No newline at end of file