Author: snoopdave
Date: Thu May 24 10:54:12 2007
New Revision: 541369
URL: http://svn.apache.org/viewvc?view=rev&rev=541369
Log:
Merging latest from trunk
Added:
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/DatabaseProvider.java
- copied unchanged from r541345,
roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/DatabaseProvider.java
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/hibernate.cfg.xml
roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/planet.properties
roller/branches/roller_4.0_newbackend/build.xml
roller/branches/roller_4.0_newbackend/components/core/src/java/org/apache/roller/business/hibernate/HibernatePersistenceStrategy.java
roller/branches/roller_4.0_newbackend/merges.txt
roller/branches/roller_4.0_newbackend/properties.xmlf
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetImpl.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.java
roller/branches/roller_4.0_newbackend/tools/roller-core/roller-core.jar
roller/branches/roller_4.0_newbackend/web/WEB-INF/security.xml
roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml
roller/branches/roller_4.0_newbackend/web/WEB-INF/web.xml
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java?view=diff&rev=541369&r1=541368&r2=541369
==============================================================================
---
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
(original)
+++
roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/core/PlanetContext.java
Thu May 24 10:54:12 2007
@@ -133,9 +133,7 @@
private void upgradeDatabaseIfNeeded() throws RollerException {
// try {
-// InitialContext ic = new InitialContext();
-// DataSource ds =
(DataSource)ic.lookup("java:comp/env/jdbc/rollerdb");
-// Connection con = ds.getConnection();
+// Connection con = // get connection somehow
// UpgradeDatabase.upgradeDatabase(con,
RollerFactory.getRoller().getVersion());
// con.close();
// } catch (NamingException e) {
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/hibernate.cfg.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/hibernate.cfg.xml?view=diff&rev=541369&r1=541368&r2=541369
==============================================================================
---
roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/hibernate.cfg.xml
(original)
+++
roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/hibernate.cfg.xml
Thu May 24 10:54:12 2007
@@ -22,11 +22,10 @@
<hibernate-configuration>
<session-factory>
- <!-- you can override with JDBC connection via
planet-custom.properties -->
- <property
name="connection.datasource">java:comp/env/jdbc/rollerdb</property>
-
- <!-- you can override the dialect via planet-custom.properties -->
- <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+ <!--
+ Specify your Planet database configuration parameters
+ in your planet-custom.properties override file, not here.
+ -->
<property name="show_sql">false</property>
Modified:
roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/planet.properties
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/planet.properties?view=diff&rev=541369&r1=541368&r2=541369
==============================================================================
---
roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/planet.properties
(original)
+++
roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/planet.properties
Thu May 24 10:54:12 2007
@@ -40,18 +40,47 @@
# properties in this file are accessed like this ...
# PlanetConfig.getProperty("propname");
-# You MUST override and set these three properties correctly:
+
+#----------------------------------------------------
+# Manditory properties
+# You MUST ensure that these properies are set correctly.
+# If not, you MUST override them in your planet-custom.properties file.
+
cache.dir=/var/planet/cache
output.dir=/usr/local/planet/webapp
template.dir=/usr/local/planet/webapp/WEB-INF/templates
+# Specify database configuration type of 'jndi' or 'jdbc'
+database.configurationType=jndi
+
+# For database configuration type 'jndi',this will be used
+database.jndi.name=jdbc/rollerdb
+
+# For database configuration type of 'jdbc', you MUST override these
+database.jdbc.driverClass=
+database.jdbc.connectionURL=
+database.jdbc.username=
+database.jdbc.password=
+
+# Hibernate dialect: You must override this to use a database other than MySQL4
+hibernate.dialect=org.hibernate.dialect.MySQLDialect
+
+
+#----------------------------------------------------
+# Optional properties
+
+
# Number of Technorati queries allowed per day
planet.aggregator.technorati.limit=500
-# Business layer implementation to be used
+# Business layer implementation to be used - don't touch unless you are
customizing Planet
persistence.planet.classname=\
org.apache.roller.planet.business.hibernate.HibernatePlanetImpl
+# Connection provider to be used - don't touch unless you are customizing
Planet
+hibernate.connectionProvider=\
+org.apache.roller.planet.business.hibernate.HibernateConnectionProvider
+
# choose a url strategy
urlstrategy.classname=\
org.apache.roller.planet.business.MultiPlanetURLStrategy
@@ -105,20 +134,3 @@
org.apache.roller.planet.ui.rendering.model.PlanetGroupModel,\
org.apache.roller.planet.ui.rendering.model.PlanetURLModel,\
org.apache.roller.planet.ui.rendering.model.UtilitiesModel
-
-# Hibernate dialect: You must override this to use a database other than MySQL4
-hibernate.dialect=org.hibernate.dialect.MySQLDialect
-
-# Hibernate config resource (a classpath-based path)
-# No need to override this unless you are doing
-hibernate.configResource=/hibernate.cfg.xml
-
-# JDBC configuration. Don't override these in the planet-custom.properties file
-# you use with the Planet webapp, but for the standalone tasks (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=
-
