Author: snoopdave
Date: Thu May 24 12:00:26 2007
New Revision: 541387
URL: http://svn.apache.org/viewvc?view=rev&rev=541387
Log:
Latest from trunk
Added:
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/menu.jsp
- copied unchanged from r541345,
roller/trunk/web/WEB-INF/jsps/tiles/menu.jsp
Modified:
roller/branches/roller_4.0_newbackend/tools/roller-planet/roller-planet-business.jar
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet-hibernate.cfg.xml
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties
Modified:
roller/branches/roller_4.0_newbackend/tools/roller-planet/roller-planet-business.jar
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/tools/roller-planet/roller-planet-business.jar?view=diff&rev=541387&r1=541386&r2=541387
==============================================================================
Binary files - no diff available.
Modified:
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet-hibernate.cfg.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet-hibernate.cfg.xml?view=diff&rev=541387&r1=541386&r2=541387
==============================================================================
---
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet-hibernate.cfg.xml
(original)
+++
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet-hibernate.cfg.xml
Thu May 24 12:00:26 2007
@@ -22,11 +22,10 @@
<hibernate-configuration>
<session-factory>
- <!-- You can override this via the jdbc.XXX properties in
planet-custom.properties -->
- <property
name="connection.datasource">java:comp/env/jdbc/rollerdb</property>
-
- <!-- You can override this via the hibernate.dialect property in
roller-custom.properties -->
- <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+ <!--
+ Specify your Roller database configuration parameters
+ in your roller-custom.properties override file, not here.
+ -->
<property name="show_sql">false</property>
Modified:
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties?view=diff&rev=541387&r1=541386&r2=541387
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties
(original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/planet.properties
Thu May 24 12:00:26 2007
@@ -41,7 +41,6 @@
# PlanetConfig.getProperty("propname");
persistence.planet.classname=org.apache.roller.planet.business.jpa.JPAPlanetImpl
-#persistence.planet.classname=org.apache.roller.planet.business.hibernate.HibernatePlanetImpl
# You MUST override and set these three properties correctly:
cache.dir=/var/planet/cache
@@ -55,19 +54,4 @@
feedfetcher.classname=\
org.apache.roller.planet.business.RollerRomeFeedFetcher
-# How the hibernate config is built
-hibernate.dialect=org.hibernate.dialect.MySQLDialect
-# Hibernate config for Roller Planet (a classpath-based path)
-# NO NEED TO OVERRIDE this unless you are customizing Roller
-hibernate.configResource=/planet-hibernate.cfg.xml
-
-# JDBC configuration parameters for standalone tasks
-# Don't override these in the roller-custom.properties file you use with the
-# Roller webapp, but for the standalone tasks that you run outside of Roller
-# (e.g. refresh entries) you'll need to override these properties. Do it in a
-# separate planet-custom.properties file.
-jdbc.driverClass=
-jdbc.connectionURL=
-jdbc.username=
-jdbc.password=
