You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/05/30 16:01:47 UTC
svn commit: r542821 [2/2] - in /roller/branches/roller_guice: ./
apps/planet/nbproject/
apps/planet/src/java/org/apache/roller/planet/business/hibernate/
apps/weblogger/ apps/weblogger/custom/ apps/weblogger/custom/src/
apps/weblogger/custom/web/ apps/...
Modified: roller/branches/roller_guice/apps/planet/nbproject/project.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/nbproject/project.xml?view=diff&rev=542821&r1=542820&r2=542821
==============================================================================
--- roller/branches/roller_guice/apps/planet/nbproject/project.xml (original)
+++ roller/branches/roller_guice/apps/planet/nbproject/project.xml Wed May 30 06:58:11 2007
@@ -43,6 +43,30 @@
<target>clean</target>
<target>build</target>
</action>
+ <action name="debug.single">
+ <target>debug-selected-files</target>
+ <context>
+ <property>classname</property>
+ <folder>./src/java</folder>
+ <pattern>\.java$</pattern>
+ <format>java-name</format>
+ <arity>
+ <one-file-only/>
+ </arity>
+ </context>
+ </action>
+ <action name="debug.test.single">
+ <target>test-selected-files</target>
+ <context>
+ <property>classname</property>
+ <folder>./test/java</folder>
+ <pattern>\.java$</pattern>
+ <format>java-name</format>
+ <arity>
+ <one-file-only/>
+ </arity>
+ </context>
+ </action>
</ide-actions>
<view>
<items>
@@ -85,6 +109,7 @@
<web-data xmlns="http://www.netbeans.org/ns/freeform-project-web/1">
<web-module>
<doc-root>web</doc-root>
+ <classpath/>
<context-path>/planet</context-path>
<j2ee-spec-level>1.5</j2ee-spec-level>
</web-module>
Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java?view=diff&rev=542821&r1=542820&r2=542821
==============================================================================
--- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java (original)
+++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetImpl.java Wed May 30 06:58:11 2007
@@ -25,7 +25,7 @@
import org.apache.roller.planet.config.PlanetConfig;
import org.apache.roller.planet.business.Planet;
import org.apache.roller.planet.business.PlanetManager;
-import org.apache.roller.business.hibernate.HibernatePersistenceStrategy;
+import org.apache.roller.planet.business.hibernate.HibernatePersistenceStrategy;
import org.apache.roller.planet.business.PropertiesManager;
import org.apache.roller.planet.business.URLStrategy;
@@ -58,7 +58,7 @@
* Create HibernatePlanetImpl using Hibernate XML config file or config
* file plus JDBC overrides from planet-custom.properties.
*/
- protected HibernatePlanetImpl() throws RollerException {
+ public HibernatePlanetImpl() throws RollerException {
strategy = getStrategy();
Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java?view=diff&rev=542821&r1=542820&r2=542821
==============================================================================
--- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java (original)
+++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java Wed May 30 06:58:11 2007
@@ -29,7 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.business.hibernate.HibernatePersistenceStrategy;
+import org.apache.roller.planet.business.hibernate.HibernatePersistenceStrategy;
import org.apache.roller.planet.business.AbstractManagerImpl;
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.PlanetData;
Modified: roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java?view=diff&rev=542821&r1=542820&r2=542821
==============================================================================
--- roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java (original)
+++ roller/branches/roller_guice/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePropertiesManagerImpl.java Wed May 30 06:58:11 2007
@@ -28,7 +28,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
-import org.apache.roller.business.hibernate.HibernatePersistenceStrategy;
+import org.apache.roller.planet.business.hibernate.HibernatePersistenceStrategy;
import org.apache.roller.planet.business.AbstractManagerImpl;
import org.apache.roller.planet.business.PropertiesManager;
import org.apache.roller.planet.config.PlanetRuntimeConfig;
Propchange: roller/branches/roller_guice/apps/weblogger/docs/examples/plugins/pluginmodel/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1,2 @@
+build
+dist
Propchange: roller/branches/roller_guice/apps/weblogger/docs/examples/rollertask/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1 @@
+logs
Propchange: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/search/operations/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1,2 @@
+.LCKIndexOperation.java~
+.LCKReIndexEntryOperation.java~
Propchange: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/utils/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1 @@
+.LCKPasswordUtility.java~
Propchange: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1,4 @@
+.LCKWeblogEntryData.java~
+.LCKRefererData.java~
+.LCKPlanetEntryData.java~
+.LCKUserData.java~
Propchange: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/filters/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1 @@
+.LCKBreadCrumbFilter.java~
Propchange: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/menu/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1 @@
+.LCKBaseRollerMenu.java~
Propchange: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/filters/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1,2 @@
+.LCKWeblogPageCacheFilter.java~
+.LCKIfModifiedWeblogPageCacheFilter.java~
Propchange: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1 @@
+.LCKPlanetModel.java~
Propchange: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1 @@
+.LCKPlanetEntriesPager.java~
Propchange: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1,3 @@
+.LCKCommentServlet.java~
+.LCKPageServlet.java~
+.LCKPlanetFeedServlet.java~
Propchange: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1 @@
+.LCKOldPageHelper.java~
Propchange: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1 @@
+.LCKRollerAtomHandler.java~
Propchange: roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/business/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1,3 @@
+.LCKPlanetManagerTest.java~
+.LCKPlanetManagerLocalTest.java~
+.LCKWeblogEntryTest.java~
Propchange: roller/branches/roller_guice/apps/weblogger/test/java/org/apache/roller/weblogger/util/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1 @@
+.LCKUtilitiesTest.java~
Propchange: roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1 @@
+ApplicationResources.properties~
Propchange: roller/branches/roller_guice/apps/weblogger/web/theme/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1,2 @@
+tiles-simplepage.jsp~
+tiles-mainmenupage.jsp~
Propchange: roller/branches/roller_guice/apps/weblogger/web/themes/sotto/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 30 06:58:11 2007
@@ -0,0 +1 @@
+.LCKWeblog.vm~
Added: roller/branches/roller_guice/merges.txt
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/merges.txt?view=auto&rev=542821
==============================================================================
--- roller/branches/roller_guice/merges.txt (added)
+++ roller/branches/roller_guice/merges.txt Wed May 30 06:58:11 2007
@@ -0,0 +1,8 @@
+
+Latest
+
+May 30, 2007
+svn merge -r 541742:542748 https://svn.apache.org/repos/asf/roller/trunk
+
+May 25, 2007
+svn merge -r 539779:541742 https://svn.apache.org/repos/asf/roller/trunk
Modified: roller/branches/roller_guice/nbproject/project.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/nbproject/project.xml?view=diff&rev=542821&r1=542820&r2=542821
==============================================================================
--- roller/branches/roller_guice/nbproject/project.xml (original)
+++ roller/branches/roller_guice/nbproject/project.xml Wed May 30 06:58:11 2007
@@ -12,14 +12,14 @@
<location>web</location>
</source-folder>
<source-folder>
- <label>src</label>
+ <label>apps/weblogger/src/java</label>
<type>java</type>
- <location>src</location>
+ <location>apps/weblogger/src/java</location>
</source-folder>
<source-folder>
- <label>tests</label>
+ <label>apps/weblogger/test/java</label>
<type>java</type>
- <location>tests</location>
+ <location>apps/weblogger/test/java</location>
</source-folder>
<source-folder>
<label>apps/planet/src/java</label>
@@ -31,26 +31,6 @@
<type>java</type>
<location>components/core/src/java</location>
</source-folder>
- <source-folder>
- <label>sandbox/scripting/bsf/src</label>
- <type>java</type>
- <location>sandbox/scripting/bsf/src</location>
- </source-folder>
- <source-folder>
- <label>sandbox/scripting/groovy/src</label>
- <type>java</type>
- <location>sandbox/scripting/groovy/src</location>
- </source-folder>
- <source-folder>
- <label>build/generated/business</label>
- <type>java</type>
- <location>build/generated/business</location>
- </source-folder>
- <source-folder>
- <label>build/generated/web</label>
- <type>java</type>
- <location>build/generated/web</location>
- </source-folder>
</folders>
<ide-actions>
<action name="build">
@@ -107,12 +87,12 @@
<location>web</location>
</source-folder>
<source-folder style="packages">
- <label>src</label>
- <location>src</location>
+ <label>apps/weblogger/src/java</label>
+ <location>apps/weblogger/src/java</location>
</source-folder>
<source-folder style="packages">
- <label>tests</label>
- <location>tests</location>
+ <label>apps/weblogger/test/java</label>
+ <location>apps/weblogger/test/java</location>
</source-folder>
<source-folder style="packages">
<label>apps/planet/src/java</label>
@@ -122,22 +102,6 @@
<label>components/core/src/java</label>
<location>components/core/src/java</location>
</source-folder>
- <source-folder style="packages">
- <label>sandbox/scripting/bsf/src</label>
- <location>sandbox/scripting/bsf/src</location>
- </source-folder>
- <source-folder style="packages">
- <label>sandbox/scripting/groovy/src</label>
- <location>sandbox/scripting/groovy/src</location>
- </source-folder>
- <source-folder style="packages">
- <label>build/generated/business</label>
- <location>build/generated/business</location>
- </source-folder>
- <source-folder style="packages">
- <label>build/generated/web</label>
- <location>build/generated/web</location>
- </source-folder>
<source-file>
<location>build.xml</location>
</source-file>
@@ -155,18 +119,14 @@
</general-data>
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
<compilation-unit>
- <package-root>components/core/src/java</package-root>
- <package-root>src</package-root>
- <package-root>build/generated/business</package-root>
- <package-root>build/generated/web</package-root>
- <package-root>tests</package-root>
<package-root>apps/planet/src/java</package-root>
<package-root>apps/planet/test/java</package-root>
<package-root>sandbox/jdobackend/src</package-root>
- <package-root>sandbox/scripting/bsf/src</package-root>
- <package-root>custom/src</package-root>
<package-root>sandbox/scripting/jruby/src</package-root>
- <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/taglibs-string.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:tools/lib/jdom.jar:tools/spring-1.2/acegi-security-0.9.0.jar:t
ools/spring-1.2/spring.jar:tools/lib/rome-0.8.jar:tools/lib/rome-fetcher-0.8.jar:tools/lib/commons-codec-1.3.jar:tools/hibernate-3.1/hibernate3.jar:contrib/lib/textile4j-1.20.jar:tools/buildtime/derby.jar:tools/buildtime/ant-1.6.2/ant.jar:tools/buildtime/derbynet.jar:tools/lib/rome-0.9.jar:tools/lib/rome-fetcher-0.9.jar:tools/buildtime/activation.jar:tools/buildtime/mail.jar:tools/spring-1.2/spring.jar:../../../../../Applications/Java/groovy/embeddable/groovy-all-1.0.jar:sandbox/scripting/bsf/lib/bsf.jar:tools/lib/commons-collections-3.1.jar:tools/lib/commons-lang-2.1.jar:tools/lib/commons-logging-1.0.4.jar:tools/lib/velocity-1.5.jar:tools/lib/velocity-dep-1.5.jar:tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar:tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar:tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar:tools/spring-1.2/acegi-security-1.0.3.jar:tools/struts-2.0.6/lib/antlr-2.7.2.jar:tools/struts-2.0.6/lib/commons-beanutils-1.6.jar:tools/stru
ts-2.0.6/lib/commons-chain-1.1.jar:tools/struts-2.0.6/lib/commons-fileupload-1.2.jar:tools/struts-2.0.6/lib/commons-io-1.3.1.jar:tools/struts-2.0.6/lib/commons-validator-1.3.0.jar:tools/struts-2.0.6/lib/freemarker-2.3.8.jar:tools/struts-2.0.6/lib/ognl-2.6.11.jar:tools/struts-2.0.6/lib/oro-2.0.8.jar:tools/struts-2.0.6/lib/struts2-core-2.0.6.jar:tools/struts-2.0.6/lib/struts2-spring-plugin-2.0.6.jar:tools/struts-2.0.6/lib/struts2-tiles-plugin-2.0.6.jar:tools/struts-2.0.6/lib/tiles-api-2.0-20070207.130156-4.jar:tools/struts-2.0.6/lib/tiles-core-2.0-20070207.130156-4.jar:tools/struts-2.0.6/lib/xwork-2.0.1.jar:tools/lib/guice-1.0.jar</classpath>
+ <package-root>components/core/src/java</package-root>
+ <package-root>apps/weblogger/src/java</package-root>
+ <package-root>apps/weblogger/test/java</package-root>
+ <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/taglibs-string.jar:tools/struts-1.2.4/lib/antlr.jar:tools/struts-1.2.4/lib/commons-beanutils.jar:tools/struts-1.2.4/lib/commons-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standard-1.0.3/lib/jaxen-full.jar:tools/standard-1.0.3/lib/jstl.jar:tools/standard-1.0.3/lib/standard.jar:tools/buildtime/tomcat-5.0.28/servlet-api.jar:tools/buildtime/tomcat-5.0.28/jsp-api.jar:tools/lib/jdom.jar:tools/spring-1.2/acegi-security-0.9.0.jar:t
ools/spring-1.2/spring.jar:tools/lib/rome-0.8.jar:tools/lib/rome-fetcher-0.8.jar:tools/lib/commons-codec-1.3.jar:tools/hibernate-3.1/hibernate3.jar:contrib/lib/textile4j-1.20.jar:tools/buildtime/derby.jar:tools/buildtime/ant-1.6.2/ant.jar:tools/buildtime/derbynet.jar:tools/lib/rome-0.9.jar:tools/lib/rome-fetcher-0.9.jar:tools/buildtime/activation.jar:tools/buildtime/mail.jar:tools/spring-1.2/spring.jar:../../../../../Applications/Java/groovy/embeddable/groovy-all-1.0.jar:sandbox/scripting/bsf/lib/bsf.jar:tools/lib/commons-collections-3.1.jar:tools/lib/commons-lang-2.1.jar:tools/lib/commons-logging-1.0.4.jar:tools/lib/velocity-1.5.jar:tools/lib/velocity-dep-1.5.jar:tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar:tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar:tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar:tools/spring-1.2/acegi-security-1.0.3.jar:tools/struts-2.0.6/lib/antlr-2.7.2.jar:tools/struts-2.0.6/lib/commons-beanutils-1.6.jar:tools/stru
ts-2.0.6/lib/commons-chain-1.1.jar:tools/struts-2.0.6/lib/commons-fileupload-1.2.jar:tools/struts-2.0.6/lib/commons-io-1.3.1.jar:tools/struts-2.0.6/lib/commons-validator-1.3.0.jar:tools/struts-2.0.6/lib/freemarker-2.3.8.jar:tools/struts-2.0.6/lib/ognl-2.6.11.jar:tools/struts-2.0.6/lib/oro-2.0.8.jar:tools/struts-2.0.6/lib/struts2-core-2.0.6.jar:tools/struts-2.0.6/lib/struts2-spring-plugin-2.0.6.jar:tools/struts-2.0.6/lib/struts2-tiles-plugin-2.0.6.jar:tools/struts-2.0.6/lib/tiles-api-2.0-20070207.130156-4.jar:tools/struts-2.0.6/lib/tiles-core-2.0-20070207.130156-4.jar:tools/struts-2.0.6/lib/xwork-2.0.1.jar:tools/roller-core/roller-core.jar:tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar:tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar:tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar:tools/openjpa-0.9.7/openjpa-0.9.7-incubating.jar:tools/openjpa-0.9.7/serp-1.11.0.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
</java-data>
Modified: roller/branches/roller_guice/src/org/apache/roller/business/RollerFactory.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/src/org/apache/roller/business/RollerFactory.java?view=diff&rev=542821&r1=542820&r2=542821
==============================================================================
--- roller/branches/roller_guice/src/org/apache/roller/business/RollerFactory.java (original)
+++ roller/branches/roller_guice/src/org/apache/roller/business/RollerFactory.java Wed May 30 06:58:11 2007
@@ -35,6 +35,15 @@
private static Injector injector = null;
+ private static final String DEFAULT_IMPL =
+ "org.apache.roller.business.jpa.JPARollerImpl";
+ //"org.apache.roller.business.hibernate.HibernateRollerImpl";
+ //"org.apache.roller.business.datamapper.jpa.JPARollerImpl";
+
+ private static Roller rollerInstance = null;
+
+
+
// non-instantiable
private RollerFactory() {
// hello all you beautiful people
Modified: roller/branches/roller_guice/src/org/apache/roller/business/hibernate/HibernatePersistenceStrategy.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/src/org/apache/roller/business/hibernate/HibernatePersistenceStrategy.java?view=diff&rev=542821&r1=542820&r2=542821
==============================================================================
--- roller/branches/roller_guice/src/org/apache/roller/business/hibernate/HibernatePersistenceStrategy.java (original)
+++ roller/branches/roller_guice/src/org/apache/roller/business/hibernate/HibernatePersistenceStrategy.java Wed May 30 06:58:11 2007
@@ -20,9 +20,7 @@
import com.google.inject.Singleton;
import java.io.StringBufferInputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.Properties;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -32,12 +30,7 @@
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
import org.apache.roller.RollerException;
-import org.apache.roller.config.RollerConfig;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.DOMOutputter;
+import org.hibernate.cfg.Environment;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -48,7 +41,6 @@
* This class serves as a helper/util class for all of the Hibernate
* manager implementations by providing a set of basic persistence methods
* that can be easily reused.
- *
*/
@Singleton
public class HibernatePersistenceStrategy {
@@ -65,154 +57,26 @@
return new InputSource(new StringBufferInputStream(""));
}
};
-
- public HibernatePersistenceStrategy() throws RollerException {
- try {
- if (StringUtils.isNotEmpty(RollerConfig.getProperty("jdbc.driverClass"))) {
- // create and configure for JDBC access
- initViaJDBCProperties(
- RollerConfig.getProperty("hibernate.configResource"),
- RollerConfig.getProperty("hibernate.dialect"),
- RollerConfig.getProperty("jdbc.driverClass"),
- RollerConfig.getProperty("jdbc.connectionURL"),
- RollerConfig.getProperty("jdbc.username"),
- RollerConfig.getProperty("jdbc.password"));
- } else {
- // create an configure via config resource only
- initViaDataSource(
- RollerConfig.getProperty("hibernate.configResource"),
- RollerConfig.getProperty("hibernate.dialect"));
- }
- } catch(Throwable t) {
- // if this happens then we are screwed
- log.fatal("Error initializing Hibernate", t);
- throw new RollerException(t);
- }
- }
-
- /**
- * Construct self using Hibernate config resource and optional dialect.
- * @param configResouce Classpath-based path to Hibernate config file (e.g. "/hibernate.cgf.xml")
- * @parma dialect Classname of Hibernate dialect to be used (overriding any specified in the configResource)
- */
- private void initViaDataSource(
- String configResource,
- String dialect) throws Exception {
-
- log.info("configResource: " + configResource);
- log.info("dialect: " + dialect);
-
- // read configResource into DOM form
- SAXBuilder builder = new SAXBuilder();
- builder.setEntityResolver(noOpEntityResolver);
- Document configDoc = builder.build(
- getClass().getResourceAsStream(configResource));
- Element root = configDoc.getRootElement();
- Element sessionFactoryElem = root.getChild("session-factory");
-
- // remove any existing connection.datasource and dialect properties
- List propertyElems = sessionFactoryElem.getChildren("property");
- List removeList = new ArrayList();
- for (Iterator it = propertyElems.iterator(); it.hasNext();) {
- Element elem = (Element) it.next();
- if (elem.getAttribute("name") != null
- && elem.getAttribute("name").getValue().equals("dialect")) {
- removeList.add(elem);
- }
- }
- for (Iterator it = removeList.iterator(); it.hasNext();) {
- Element elem = (Element) it.next();
- sessionFactoryElem.removeContent(elem);
- }
-
- // add Roller dialect property
- Element prop = new Element("property").setAttribute(
- new Attribute("name","dialect"));
- prop.addContent(dialect);
- sessionFactoryElem.addContent(prop);
-
- Configuration config = new Configuration();
- DOMOutputter outputter = new DOMOutputter();
- config.configure(outputter.output(configDoc));
- this.sessionFactory = config.buildSessionFactory();
- }
- /**
- * Construct self using Hibernate config resource and optional dialect.
- * @param configResouce Classpath-based path to Hibernate config file (e.g. "/hibernate.cgf.xml")
- * @parma dialect Classname of Hibernate dialect to be used (or null to use one specified in configResource)
+ /**
+ * Persistence strategy configures itself by using Roller properties:
+ * 'hibernate.configResource' - the resource name of Roller's Hibernate XML configuration file,
+ * 'hibernate.dialect' - the classname of the Hibernate dialect to be used,
+ * 'hibernate.connectionProvider - the classname of Roller's connnection provider impl.
*/
- private void initViaJDBCProperties(
- String configResource,
- String dialect,
- String driverClass,
- String connectionURL,
- String username,
- String password) throws Exception {
-
- log.info("configResource: " + configResource);
- log.info("dialect: " + dialect);
- log.info("driverClass: " + driverClass);
- log.info("connectionURL: " + connectionURL);
- log.info("username: " + username);
-
- // read configResource into DOM form
- SAXBuilder builder = new SAXBuilder();
- builder.setEntityResolver(noOpEntityResolver);
- Document configDoc = builder.build(
- getClass().getResourceAsStream(configResource));
- Element root = configDoc.getRootElement();
- Element sessionFactoryElem = root.getChild("session-factory");
+ public HibernatePersistenceStrategy(String configResource, String dialect, String connectionProvider) {
- // remove any existing connection.datasource and dialect properties
- List propertyElems = sessionFactoryElem.getChildren("property");
- List removeList = new ArrayList();
- for (Iterator it = propertyElems.iterator(); it.hasNext();) {
- Element elem = (Element) it.next();
- if (elem.getAttribute("name") != null
- && elem.getAttribute("name").getValue().equals("connection.datasource")) {
- removeList.add(elem);
- }
- if (elem.getAttribute("name") != null
- && elem.getAttribute("name").getValue().equals("dialect")) {
- removeList.add(elem);
- }
- }
- for (Iterator it = removeList.iterator(); it.hasNext();) {
- Element elem = (Element) it.next();
- sessionFactoryElem.removeContent(elem);
- }
-
- // add JDBC connection params instead
- Element prop = new Element("property").setAttribute(
- new Attribute("name","hibernate.connection.driver_class"));
- prop.addContent(driverClass);
- sessionFactoryElem.addContent(prop);
+ // Read Hibernate config file specified by Roller config
+ Configuration config = new Configuration();
+ config.configure(configResource);
- prop = new Element("property").setAttribute(
- new Attribute("name","hibernate.connection.url"));
- prop.addContent(connectionURL);
- sessionFactoryElem.addContent(prop);
-
- prop = new Element("property").setAttribute(
- new Attribute("name","hibernate.connection.username"));
- prop.addContent(username);
- sessionFactoryElem.addContent(prop);
-
- prop = new Element("property").setAttribute(
- new Attribute("name","hibernate.connection.password"));
- prop.addContent(password);
- sessionFactoryElem.addContent(prop);
+ // Add dialect specified by Roller config and our connection provider
+ Properties props = new Properties();
+ props.put(Environment.DIALECT, dialect);
+ props.put(Environment.CONNECTION_PROVIDER, connectionProvider);
+ config.mergeProperties(props);
- prop = new Element("property").setAttribute(
- new Attribute("name","dialect"));
- prop.addContent(dialect);
- sessionFactoryElem.addContent(prop);
-
- Configuration config = new Configuration();
- DOMOutputter outputter = new DOMOutputter();
- config.configure(outputter.output(configDoc));
- this.sessionFactory = config.buildSessionFactory();
+ this.sessionFactory = config.buildSessionFactory();
}
Modified: roller/branches/roller_guice/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java?view=diff&rev=542821&r1=542820&r2=542821
==============================================================================
--- roller/branches/roller_guice/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java (original)
+++ roller/branches/roller_guice/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java Wed May 30 06:58:11 2007
@@ -24,6 +24,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.business.RollerImpl;
+import org.apache.roller.business.hibernate.HibernatePersistenceStrategy;
/**
* A Hibernate specific implementation of the Roller business layer.
@@ -42,6 +43,24 @@
@Inject
public HibernateRollerImpl(HibernatePersistenceStrategy strategy) throws RollerException {
this.strategy = strategy;
+ }
+
+
+ /**
+ * Instantiates and returns an instance of HibernateRollerImpl.
+ */
+ public static Roller instantiate() throws RollerException {
+ if (me == null) {
+ mLogger.debug("Instantiating HibernateRollerImpl");
+ me = new HibernateRollerImpl();
+
+ // Now that Roller has been instantiated, initialize individual managers
+ me.getPropertiesManager();
+ me.getIndexManager();
+ me.getThemeManager();
+ }
+
+ return me;
}
Modified: roller/branches/roller_guice/tools/roller-planet/roller-planet-business.jar
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/tools/roller-planet/roller-planet-business.jar?view=diff&rev=542821&r1=542820&r2=542821
==============================================================================
Binary files - no diff available.
Modified: roller/branches/roller_guice/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/web/WEB-INF/classes/roller.properties?view=diff&rev=542821&r1=542820&r2=542821
==============================================================================
--- roller/branches/roller_guice/web/WEB-INF/classes/roller.properties (original)
+++ roller/branches/roller_guice/web/WEB-INF/classes/roller.properties Wed May 30 06:58:11 2007
@@ -43,9 +43,39 @@
#---------------------------------
# Database configuration settings
+# 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=
+
+#---------------------------------
+# Mail server connection parameters
+
+# Specify mail configuration type of 'jndi' or 'properties'
+mail.configurationType=jndi
+
+# For mail configuration type 'jndi', this will be used
+mail.jndi.name=mail/Session
+
+# For database configuration type of 'properties', you MUST override these
+mail.hostname=
+mail.username
+mail.password
+
+#---------------------------------
# Hibernate dialect: You MUST override this to use a database other than MySQL4
hibernate.dialect=org.hibernate.dialect.MySQLDialect
+# No need to touch these two settings unless you are customizing Roller
+hibernate.connectionProvider=org.apache.roller.business.hibernate.HibernateConnectionProvider
+
#---------------------------------
# User management settings
@@ -330,7 +360,9 @@
# Persistence settings
#persistence.roller.classname=org.apache.roller.business.hibernate.HibernateRollerImpl
-#persistence.filemanager.classname=org.apache.roller.business.FileManagerImpl
+persistence.roller.classname=org.apache.roller.business.jpa.JPARollerImpl
+
+persistence.filemanager.classname=org.apache.roller.business.FileManagerImpl
guice.backend.module=org.apache.roller.business.hibernate.HibernateModule
@@ -574,20 +606,6 @@
# editor theme to be used (corresponds to directory name under /theme)
editor.theme=tan
-
-# Hibernate config resource (a classpath-based path)
-# NO NEED TO OVERRIDE this unless you are customizing Roller
-hibernate.configResource=/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 roller-custom.properties file.
-jdbc.driverClass=
-jdbc.connectionURL=
-jdbc.username=
-jdbc.password=
#---------------------------------
# Experimental settings