From: <go...@us...> - 2011-06-19 20:50:56
|
Revision: 10530 http://unicore.svn.sourceforge.net/unicore/?rev=10530&view=rev Author: golbi Date: 2011-06-19 20:50:49 +0000 (Sun, 19 Jun 2011) Log Message: ----------- Fixed log4j config for RPM (regression) + updated RPM mapconfig to myBatis Modified Paths: -------------- uvos/uvos-server/trunk/src/main/package/conf.properties uvos/uvos-server/trunk/src/main/package/distributions/Default/src/etc/unicore/uvos-server/db/mapconfig.xml Added Paths: ----------- uvos/uvos-server/trunk/src/main/package/distributions/Default/src/etc/unicore/uvos-server/log4j.properties Modified: uvos/uvos-server/trunk/src/main/package/conf.properties =================================================================== --- uvos/uvos-server/trunk/src/main/package/conf.properties 2011-06-18 22:57:29 UTC (rev 10529) +++ uvos/uvos-server/trunk/src/main/package/conf.properties 2011-06-19 20:50:49 UTC (rev 10530) @@ -7,8 +7,7 @@ files.usr.share.doc.2=src/main/doc/* files.etc.1=src/main/conf/mail* -files.etc.2=src/main/conf/log4j.properties -files.etc.3=src/main/conf/crlcheck.properties +files.etc.2=src/main/conf/crlcheck.properties files.etc.db.1=src/main/conf/db/*.sql files.etc.db.2=src/main/conf/db/README Modified: uvos/uvos-server/trunk/src/main/package/distributions/Default/src/etc/unicore/uvos-server/db/mapconfig.xml =================================================================== --- uvos/uvos-server/trunk/src/main/package/distributions/Default/src/etc/unicore/uvos-server/db/mapconfig.xml 2011-06-18 22:57:29 UTC (rev 10529) +++ uvos/uvos-server/trunk/src/main/package/distributions/Default/src/etc/unicore/uvos-server/db/mapconfig.xml 2011-06-19 20:50:49 UTC (rev 10530) @@ -1,53 +1,73 @@ <?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE sqlMapConfig - PUBLIC "-//ibatis.apache.org//DTD SQL Map Config 2.0//EN" - "http://ibatis.apache.org/dtd/sql-map-config-2.dtd"> -<sqlMapConfig> +<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd"> +<configuration> <properties url="file:/etc/unicore/uvos-server/datamap.properties" /> - <settings - cacheModelsEnabled="true" - enhancementEnabled="true" - lazyLoadingEnabled="true" - maxRequests="128" - maxSessions="10" - maxTransactions="5" - useStatementNamespaces="false" - defaultStatementTimeout="5" /> - <!-- - <resultObjectFactory type="com.mydomain.MyResultObjectFactory"> - <property name="someProperty" value="someValue" /> - </resultObjectFactory> - --> + + <settings> + <setting name="lazyLoadingEnabled" value="false"/> +<!-- + <setting name="defaultStatementTimeout" value="5"/> + <setting name="cacheModelsEnabled" value="true"/> + <setting name="enhancementEnabled" value="true"/> + <setting name="maxRequests" value="128"/> + <setting name="maxSessions" value="10"/> + <setting name="maxTransactions" value="5"/> +--> + </settings> + + <typeAliases> + <typeAlias alias="AppFormB" type="pl.edu.icm.unicore.uvos.model.VOApplicationFormBean" /> + <typeAlias alias="AppB" type="pl.edu.icm.unicore.uvos.model.VOApplicationBean" /> + <typeAlias alias="AuthZB" type="pl.edu.icm.unicore.uvos.model.AuthzBean" /> + <typeAlias alias="GroupB" type="pl.edu.icm.unicore.uvos.model.GroupBean" /> + <typeAlias alias="AttributeB" type="pl.edu.icm.unicore.uvos.model.AttributeBean" /> + <typeAlias alias="IdentityB" type="pl.edu.icm.unicore.uvos.model.IdentityBean" /> + <typeAlias alias="EntityB" type="pl.edu.icm.unicore.uvos.model.EntityBean" /> + <typeAlias alias="IdParamB" type="pl.edu.icm.unicore.uvos.model.GenericBean" /> + <typeAlias alias="GenericB" type="pl.edu.icm.unicore.uvos.model.GenericBean" /> + <typeAlias alias="AuthnB" type="pl.edu.icm.unicore.uvos.model.AuthnBean" /> + <typeAlias alias="NotB" type="pl.edu.icm.unicore.uvos.model.NotifyBean" /> + <typeAlias alias="ElemB" type="pl.edu.icm.unicore.uvos.model.ElementBean" /> + <typeAlias alias="AttrB" type="pl.edu.icm.unicore.uvos.model.AttributeWithOwnerBean" /> + <typeAlias alias="AttributeType" type="pl.edu.icm.unicore.uvos.model.AttributeTypeBean" /> + <typeAlias alias="IdentityType" type="pl.edu.icm.unicore.uvos.model.IdentityTypeBean" /> + + <typeAlias alias="IntNotNull" type="pl.edu.icm.unicore.uvos.db.NullIntTypeHandler" /> + </typeAliases> - <!-- Configure a datasource to use with this SQL Map using SimpleDataSource. - Notice the use of the properties from the above resource --> - <transactionManager type="JDBC"> - <dataSource type="SIMPLE"> - <property name="JDBC.Driver" value="${driver}" /> - <property name="JDBC.ConnectionURL" value="${url}" /> - <property name="JDBC.Username" value="${username}" /> - <property name="JDBC.Password" value="${password}" /> - <property name="JDBC.DefaultAutoCommit" value="true" /> - <property name="Pool.MaximumActiveConnections" value="10" /> - <property name="Pool.MaximumIdleConnections" value="5" /> - <property name="Pool.MaximumCheckoutTime" value="120000" /> - <property name="Pool.TimeToWait" value="500" /> - <property name="Pool.PingQuery" value="select 1 from Entities" /> - <property name="Pool.PingEnabled" value="true" /> - <property name="Pool.PingConnectionsOlderThan" value="600000" /> - <property name="Pool.PingConnectionsNotUsedFor" value="600000" /> - </dataSource> - </transactionManager> + <environments default="def"> + <environment id="def"> + <transactionManager type="JDBC"/> + <dataSource type="POOLED"> + <property name="driver" value="${driver}" /> + <property name="url" value="${url}" /> + <property name="username" value="${username}" /> + <property name="password" value="${password}" /> + <property name="defaultAutoCommit" value="true" /> + <!-- + <property name="defaultTransactionIsolationLevel" value="" /> + --> + <property name="poolMaximumActiveConnections" value="10" /> + <property name="poolMaximumIdleConnections" value="5" /> + <property name="poolMaximumCheckoutTime" value="120000" /> + <property name="poolTimeToWait" value="500" /> + <property name="poolPingQuery" value="select 1 from Entities" /> + <property name="poolPingEnabled" value="true" /> + <property name="poolPingConnectionsNotUsedFor" value="600000" /> + </dataSource> + </environment> + </environments> - - <sqlMap url="file:/etc/unicore/uvos-server/db/maps/Types.xml" /> - <sqlMap url="file:/etc/unicore/uvos-server/db/maps/Identity.xml" /> - <sqlMap url="file:/etc/unicore/uvos-server/db/maps/Group.xml" /> - <sqlMap url="file:/etc/unicore/uvos-server/db/maps/Authz.xml" /> - <sqlMap url="file:/etc/unicore/uvos-server/db/maps/Purge.xml" /> - <sqlMap url="file:/etc/unicore/uvos-server/db/maps/IdentityPast.xml" /> - <sqlMap url="file:/etc/unicore/uvos-server/db/maps/GroupPast.xml" /> - <sqlMap url="file:/etc/unicore/uvos-server/db/maps/PastChanges.xml" /> - <sqlMap url="file:/etc/unicore/uvos-server/db/maps/Applications.xml" /> - <sqlMap url="file:/etc/unicore/uvos-server/db/maps/Notifications.xml" /> -</sqlMapConfig> + <mappers> + <mapper url="file:/etc/unicore/uvos-server/db/maps/Types.xml" /> + <mapper url="file:/etc/unicore/uvos-server/db/maps/Identity.xml" /> + <mapper url="file:/etc/unicore/uvos-server/db/maps/Group.xml" /> + <mapper url="file:/etc/unicore/uvos-server/db/maps/Authz.xml" /> + <mapper url="file:/etc/unicore/uvos-server/db/maps/Purge.xml" /> + <mapper url="file:/etc/unicore/uvos-server/db/maps/IdentityPast.xml" /> + <mapper url="file:/etc/unicore/uvos-server/db/maps/GroupPast.xml" /> + <mapper url="file:/etc/unicore/uvos-server/db/maps/PastChanges.xml" /> + <mapper url="file:/etc/unicore/uvos-server/db/maps/Applications.xml" /> + <mapper url="file:/etc/unicore/uvos-server/db/maps/Notifications.xml" /> + </mappers> +</configuration> Added: uvos/uvos-server/trunk/src/main/package/distributions/Default/src/etc/unicore/uvos-server/log4j.properties =================================================================== --- uvos/uvos-server/trunk/src/main/package/distributions/Default/src/etc/unicore/uvos-server/log4j.properties (rev 0) +++ uvos/uvos-server/trunk/src/main/package/distributions/Default/src/etc/unicore/uvos-server/log4j.properties 2011-06-19 20:50:49 UTC (rev 10530) @@ -0,0 +1,25 @@ +# Set root category priority to INFO and its only appender to CONSOLE. +log4j.rootLogger=INFO, LOGFILE +#log4j.rootCategory=INFO, CONSOLE, LOGFILE + + +log4j.logger.pl.edu.icm=INFO +log4j.logger.org.codehaus.xfire.handler.DefaultFaultHandler=WARN +log4j.logger.pl.edu.icm.unicore.security.xfireutil=INFO +log4j.logger.org.springframework=WARN +log4j.logger.pl.edu.icm.uvos.webapp.actions=INFO +log4j.logger.org.mortbay.log=FATAL + +# CONSOLE is set to be a ConsoleAppender using a PatternLayout. +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=DEBUG +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=[%t] %-5p %c{1}: %m%n + +# LOGFILE is set to be a file appender using a PatternLayout with daily rolling. +log4j.appender.LOGFILE=org.apache.log4j.DailyRollingFileAppender +log4j.appender.LOGFILE.DatePattern='.'yyyy-MM-dd +log4j.appender.LOGFILE.File=/var/log/unicore/uvos-server/uvos.log +log4j.appender.LOGFILE.Append=true +log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout +log4j.appender.LOGFILE.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c %x - %m%n This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ppi...@us...> - 2012-09-29 06:18:47
|
Revision: 14440 http://unicore.svn.sourceforge.net/unicore/?rev=14440&view=rev Author: ppiernik Date: 2012-09-29 06:18:40 +0000 (Sat, 29 Sep 2012) Log Message: ----------- fix package Modified Paths: -------------- uvos/uvos-server/trunk/src/main/package/conf.properties uvos/uvos-server/trunk/src/main/package/distributions/Debian/debian/postinst uvos/uvos-server/trunk/src/main/package/distributions/RedHat/component.spec_template Modified: uvos/uvos-server/trunk/src/main/package/conf.properties =================================================================== --- uvos/uvos-server/trunk/src/main/package/conf.properties 2012-09-28 17:12:29 UTC (rev 14439) +++ uvos/uvos-server/trunk/src/main/package/conf.properties 2012-09-29 06:18:40 UTC (rev 14440) @@ -9,8 +9,6 @@ files.etc.1=src/main/conf/mail* files.etc.2=src/main/conf/crlcheck.properties files.etc.3=src/main/conf/attributeFilters.properties -files.etc.db.1=src/main/conf/db/*.sql -files.etc.db.2=src/main/conf/db/README dirs.etc.attributeTypes.1=src/main/conf/attributeTypes Modified: uvos/uvos-server/trunk/src/main/package/distributions/Debian/debian/postinst =================================================================== --- uvos/uvos-server/trunk/src/main/package/distributions/Debian/debian/postinst 2012-09-28 17:12:29 UTC (rev 14439) +++ uvos/uvos-server/trunk/src/main/package/distributions/Debian/debian/postinst 2012-09-29 06:18:40 UTC (rev 14440) @@ -32,21 +32,6 @@ chown unicore:unicore /etc/unicore/uvos-server/db chmod 750 /etc/unicore/uvos-server/db - chown unicore:unicore /etc/unicore/uvos-server/db/*.sql - chmod 640 /etc/unicore/uvos-server/db/*.sql - - chown unicore:unicore /etc/unicore/uvos-server/db/mapconfig.xml - chmod 640 /etc/unicore/uvos-server/db/mapconfig.xml - - chown unicore:unicore /etc/unicore/uvos-server/db/README - chmod 640 /etc/unicore/uvos-server/db/README - - chown unicore:unicore /etc/unicore/uvos-server/db/maps - chmod 750 /etc/unicore/uvos-server/db/maps - - chown unicore:unicore /etc/unicore/uvos-server/db/maps/*.xml - chmod 640 /etc/unicore/uvos-server/db/maps/*.xml - chown unicore:unicore /etc/unicore/uvos-server/db/dbUpdate chmod 750 /etc/unicore/uvos-server/db/dbUpdate @@ -113,8 +98,9 @@ #jar files chmod 755 /usr/share/unicore/uvos-server/lib chmod 644 /usr/share/unicore/uvos-server/lib/*.jar - chmod 755 /usr/share/unicore/uvos-server/lib/endorsed - chmod 644 /usr/share/unicore/uvos-server/lib/endorsed/*.jar + +# chmod 755 /usr/share/unicore/uvos-server/lib/endorsed +# chmod 644 /usr/share/unicore/uvos-server/lib/endorsed/*.jar Modified: uvos/uvos-server/trunk/src/main/package/distributions/RedHat/component.spec_template =================================================================== --- uvos/uvos-server/trunk/src/main/package/distributions/RedHat/component.spec_template 2012-09-28 17:12:29 UTC (rev 14439) +++ uvos/uvos-server/trunk/src/main/package/distributions/RedHat/component.spec_template 2012-09-29 06:18:40 UTC (rev 14440) @@ -46,8 +46,6 @@ %attr(640, unicore, unicore) %config(noreplace) "/etc/unicore/uvos-server/*.properties" %attr(750, unicore, unicore) %dir "/etc/unicore/uvos-server/db" -%attr(640, unicore, unicore) %config(noreplace) "/etc/unicore/uvos-server/db/*.sql" -%attr(640, unicore, unicore) %config(noreplace) "/etc/unicore/uvos-server/db/README" %attr(750, unicore, unicore) %dir "/etc/unicore/uvos-server/db/dbUpdate" %attr(640, unicore, unicore) %config(noreplace) "/etc/unicore/uvos-server/db/dbUpdate/update.properties" %attr(750, unicore, unicore) %dir "/etc/unicore/uvos-server/db/dbUpdate/from-1.0-to-1.1" @@ -91,8 +89,8 @@ # %attr(755, root, root) %dir "/usr/share/unicore/uvos-server/lib" %attr(644, root, root) "/usr/share/unicore/uvos-server/lib/*.jar" -%attr(755, root, root) %dir "/usr/share/unicore/uvos-server/lib/endorsed" -%attr(644, root, root) "/usr/share/unicore/uvos-server/lib/endorsed/*.jar" +#%attr(755, root, root) %dir "/usr/share/unicore/uvos-server/lib/endorsed" +#%attr(644, root, root) "/usr/share/unicore/uvos-server/lib/endorsed/*.jar" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |