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/06/03 16:00:41 UTC
svn commit: r543893 [1/4] - in /roller/branches/roller_guice/apps:
planet/nbproject/ weblogger/ weblogger/nbproject/
weblogger/src/java/org/apache/roller/weblogger/
weblogger/src/java/org/apache/roller/weblogger/business/
weblogger/src/java/org/apache/...
Author: snoopdave
Date: Sun Jun 3 07:00:36 2007
New Revision: 543893
URL: http://svn.apache.org/viewvc?view=rev&rev=543893
Log:
Merging from trunk
Added:
roller/branches/roller_guice/apps/weblogger/sign-release.sh
- copied unchanged from r543760, roller/trunk/apps/weblogger/sign-release.sh
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
- copied unchanged from r543760, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
- copied unchanged from r543760, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetGroups.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetGroupsBean.java
- copied unchanged from r543760, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetGroupsBean.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java
- copied unchanged from r543760, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptionsBean.java
- copied unchanged from r543760, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptionsBean.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetUIAction.java
- copied unchanged from r543760, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/ui/PlanetUIAction.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewThemeImageServlet.java
- copied unchanged from r543760, roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewThemeImageServlet.java
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/PlanetConfig.jsp
- copied unchanged from r543760, roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetConfig.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/PlanetGroups.jsp
- copied unchanged from r543760, roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetGroups.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
- copied unchanged from r543760, roller/trunk/apps/weblogger/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
Removed:
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/RollerException.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/BasePageModel.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RequestConstants.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/RollerRequest.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/HybridTag.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/VelocityTag.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/menu/
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateAdd.java
Modified:
roller/branches/roller_guice/apps/planet/nbproject/project.xml
roller/branches/roller_guice/apps/weblogger/build.xml
roller/branches/roller_guice/apps/weblogger/nbproject/ (props changed)
roller/branches/roller_guice/apps/weblogger/nbproject/project.xml
roller/branches/roller_guice/apps/weblogger/properties.xmlf
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/RollerPermissionsException.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateAutoPingManagerImpl.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedTheme.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/BookmarkDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/CommentDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/EntryAttributeDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/FolderDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/RefererDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/TemplateWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/UserDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryTagDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WebsiteDataWrapper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/FeedModel.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/MenuModel.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/URLModel.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/CommentsPager.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/util/ParsedRequest.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUserBean.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/admin/ModifyUser.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Members.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogRemove.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIActionInterceptor.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIActionPrepareInterceptor.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UISecurityInterceptor.java
roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/util/URLUtilities.java
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/ApplicationResources.properties
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/META-INF/tlds/roller.tld
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/roller.properties
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/classes/struts.xml
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/CommonPingTargets.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/CreateUser.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/CreateWeblog.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Profile.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/core/Register.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/Comments.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CommentsSidebar.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/CustomPingTargets.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntriesSidebar.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/EntryEdit.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplateEdit.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/TemplatesSidebar.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/ThemeEdit.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/jsps/editor/WeblogConfig.jsp
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/security.xml
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/tiles.xml
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/deprecated/navbar.vm
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/feeds.vm
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-comments-atom.vm
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-entries-atom.vm
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/site-entries-rss.vm
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-comments-atom.vm
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-comments-rss.vm
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-entries-atom.vm
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-entries-rss.vm
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/templates/feeds/weblog-search-atom.vm
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/velocity/weblog.vm
roller/branches/roller_guice/apps/weblogger/web/WEB-INF/web.xml
roller/branches/roller_guice/apps/weblogger/web/index.jsp
roller/branches/roller_guice/apps/weblogger/web/themes/basic/theme.xml
roller/branches/roller_guice/apps/weblogger/web/themes/brushedmetal/theme.xml
roller/branches/roller_guice/apps/weblogger/web/themes/frontpage/theme.xml
roller/branches/roller_guice/apps/weblogger/web/themes/sotto/theme.xml
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=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/planet/nbproject/project.xml (original)
+++ roller/branches/roller_guice/apps/planet/nbproject/project.xml Sun Jun 3 07:00:36 2007
@@ -4,7 +4,7 @@
<configuration>
<general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
<!-- Do not use Project Properties customizer when editing this file manually. -->
- <name>roller_planet</name>
+ <name>roller_planet_guice</name>
<properties>
<property name="ant.script">build.xml</property>
</properties>
Modified: roller/branches/roller_guice/apps/weblogger/build.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/build.xml?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/build.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/build.xml Sun Jun 3 07:00:36 2007
@@ -220,6 +220,7 @@
<!-- Copy in resources -->
<copy todir="${build.compile.web}">
<fileset dir="${ro.src}">
+ <exclude name="**/META-INF/**"/> <!-- don't copy persistence.xml -->
<exclude name="**/*.java"/>
<exclude name="**/*.html"/>
<exclude name="**/*.png"/>
Propchange: roller/branches/roller_guice/apps/weblogger/nbproject/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jun 3 07:00:36 2007
@@ -0,0 +1 @@
+private
Modified: roller/branches/roller_guice/apps/weblogger/nbproject/project.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/nbproject/project.xml?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/nbproject/project.xml (original)
+++ roller/branches/roller_guice/apps/weblogger/nbproject/project.xml Sun Jun 3 07:00:36 2007
@@ -4,7 +4,7 @@
<configuration>
<general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
<!-- Do not use Project Properties customizer when editing this file manually. -->
- <name>roller_trunk</name>
+ <name>roller_weblogger_guice</name>
<properties>
<property name="ant.script">build.xml</property>
</properties>
@@ -102,7 +102,7 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
<compilation-unit>
<package-root>src/java</package-root>
- <classpath mode="compile">../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/commons-betwixt-1.0-beta-1.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/commons-codec-1.3.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/commons-collections-3.2.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/commons-httpclient-2.0.2.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/commons-id-0.1-SNAPSHOT.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/commons-lang-2.1.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/commons-logging-1.0.4.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/jaxen-full.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/jdom.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/log4j-1.2.11.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/lucene-1.4.3.jar:../../../../../../work
space/roller_bsc/roller-trunk/tools/lib/rome-0.9.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/rome-fetcher-0.9.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/saxpath.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/velocity-1.5.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/lib/taglibs-string.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-1.2.4/lib/antlr.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-1.2.4/lib/commons-beanutils.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-1.2.4/lib/commons-digester.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-1.2.4/lib/commons-validator.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-1.2.4/lib/jakarta-oro.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-1.2.4/lib/struts-el.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts
-1.2.4/lib/struts.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/antlr-2.7.2.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/commons-beanutils-1.6.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/commons-chain-1.1.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/commons-fileupload-1.2.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/commons-io-1.3.1.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/commons-validator-1.3.0.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/freemarker-2.3.8.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/ognl-2.6.11.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/oro-2.0.8.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/struts2-core-2.0.6.jar:../
../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/struts2-spring-plugin-2.0.6.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/struts2-tiles-plugin-2.0.6.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/tiles-api-2.0-20070207.130156-4.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/tiles-core-2.0-20070207.130156-4.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/struts-2.0.6/lib/xwork-2.0.1.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/buildtime/tomcat-5.0.28/jsp-api.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/buildtime/tomcat-5.0.28/servlet-api.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/buildtime/activation.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/buildtime/mail.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar:../../../..
/../../workspace/roller_bsc/roller-trunk/tools/jakarta-taglibs-standard-1.1.2/lib/serializer.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/hibernate-3.1/hibernate3.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/hibernate-3.1/lib/asm-attrs.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/hibernate-3.1/lib/asm.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/hibernate-3.1/lib/cglib-2.1.3.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/hibernate-3.1/lib/dom4j-1.6.1.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/hibernate-3.1/lib/ehcache-1.1.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/hibernate-3.1/lib/jdbc2_0-stdext.jar:../../../../../../workspace/roller_bsc/roller-trunk
/tools/hibernate-3.1/lib/jta.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/openjpa-0.9.7/openjpa-0.9.7-incubating.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/openjpa-0.9.7/serp-1.11.0.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/spring-1.2/acegi-security-1.0.3.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/spring-1.2/spring.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/roller-core/roller-core.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/roller-planet/roller-planet-business.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/xmlrpc-3.0/lib/ws-commons-
util-1.0.1.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar:../../../../../../workspace/roller_bsc/roller-trunk/tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar</classpath>
+ <classpath mode="compile">../../tools/lib/commons-betwixt-1.0-beta-1.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.2.jar:../../tools/lib/commons-digester-1.6.jar:../../tools/lib/commons-httpclient-2.0.2.jar:../../tools/lib/commons-id-0.1-SNAPSHOT.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/concurrent-1.3.2.jar:../../tools/lib/guice-1.0.jar:../../tools/lib/jaxen-full.jar:../../tools/lib/jdom.jar:../../tools/lib/log4j-1.2.11.jar:../../tools/lib/lucene-1.4.3.jar:../../tools/lib/rome-0.9.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/saxpath.jar:../../tools/lib/taglibs-string.jar:../../tools/lib/velocity-1.5.jar:../../tools/hibernate-3.1/hibernate3.jar:../../tools/struts-2.0.6/lib/antlr-2.7.2.jar:../../tools/struts-2.0.6/lib/commons-beanutils-1.6.jar:../../tools/struts-2.0.6/lib/commons-chain-1.1.jar:../../tools/struts-2.0.6/lib/commons-fileupload-1.2.jar:../../tool
s/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/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:../../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/spring-1.2/spring.jar:../../tools/roller-core/roller-core.jar:../../tools/roller-planet/roller-planet-business.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
<compilation-unit>
@@ -113,6 +113,7 @@
<web-data xmlns="http://www.netbeans.org/ns/freeform-project-web/1">
<web-module>
<doc-root>web</doc-root>
+ <classpath/>
<context-path>/roller</context-path>
<j2ee-spec-level>1.5</j2ee-spec-level>
</web-module>
Modified: roller/branches/roller_guice/apps/weblogger/properties.xmlf
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/properties.xmlf?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/properties.xmlf (original)
+++ roller/branches/roller_guice/apps/weblogger/properties.xmlf Sun Jun 3 07:00:36 2007
@@ -107,6 +107,7 @@
<include name="rome-0.9.jar"/>
<include name="rome-fetcher-0.9.jar"/>
<include name="velocity-1.5.jar"/>
+ <include name="guice-1.0.jar"/>
</fileset>
<fileset id="presentation.jars" dir="${ro.tools}/lib">
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/RollerPermissionsException.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/RollerPermissionsException.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/RollerPermissionsException.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/RollerPermissionsException.java Sun Jun 3 07:00:36 2007
@@ -17,6 +17,8 @@
*/
package org.apache.roller.weblogger;
+import org.apache.roller.RollerException;
+
/**
* Thrown when persistence session user lacks one or more required permissions.
*/
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/RollerImpl.java Sun Jun 3 07:00:36 2007
@@ -22,15 +22,16 @@
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.business.pings.AutoPingManager;
+import org.apache.roller.weblogger.business.pings.PingQueueManager;
+import org.apache.roller.weblogger.business.pings.PingTargetManager;
+import org.apache.roller.weblogger.business.referrers.RefererManager;
import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager;
import org.apache.roller.weblogger.business.referrers.ReferrerQueueManagerImpl;
-import org.apache.roller.weblogger.business.runnable.ThreadManagerImpl;
-import org.apache.roller.weblogger.business.search.IndexManagerImpl;
import org.apache.roller.weblogger.business.search.IndexManager;
import org.apache.roller.weblogger.business.runnable.ThreadManager;
import org.apache.roller.weblogger.business.themes.ThemeManager;
-import org.apache.roller.weblogger.business.themes.ThemeManagerImpl;
-
/**
* The abstract version of the Roller implementation.
@@ -38,21 +39,42 @@
* Here we put code that pertains to *all* implementations of the Roller
* interface, regardless of their persistence strategy.
*/
+@com.google.inject.Singleton
public abstract class RollerImpl implements Roller {
-
private static Log mLogger = LogFactory.getLog(RollerImpl.class);
- private FileManager fileManager = null;
- private IndexManager indexManager = null;
- private ThreadManager threadManager = null;
- private ThemeManager themeManager = null;
- private PluginManager pluginManager = null;
+ private AutoPingManager autoPingManager = null;
+ private BookmarkManager bookmarkManager = null;
+ private FileManager fileManager = null;
+ private IndexManager indexManager = null;
+ private PingQueueManager pingQueueManager = null;
+ private PingTargetManager pingTargetManager = null;
+ private PluginManager pluginManager = null;
+ private PropertiesManager propertiesManager = null;
+ private RefererManager refererManager = null;
+ private ThemeManager themeManager = null;
+ private ThreadManager threadManager = null;
+ private UserManager userManager = null;
+ private WeblogManager weblogManager = null;
private String version = null;
private String buildTime = null;
private String buildUser = null;
- public RollerImpl() {
+ public RollerImpl(
+ AutoPingManager autoPingManager,
+ BookmarkManager bookmarkManager,
+ FileManager fileManager,
+ IndexManager indexManager,
+ PingQueueManager pingQueueManager,
+ PingTargetManager pingTargetManager,
+ PluginManager pluginManager,
+ PropertiesManager propertiesManager,
+ RefererManager refererManager,
+ ThemeManager themeManager,
+ ThreadManager threadManager,
+ UserManager userManager,
+ WeblogManager weblogManager) throws RollerException {
Properties props = new Properties();
try {
@@ -71,9 +93,6 @@
* @see org.apache.roller.weblogger.model.Roller#getFileManager()
*/
public FileManager getFileManager() {
- if (fileManager == null) {
- fileManager = new FileManagerImpl();
- }
return fileManager;
}
@@ -82,9 +101,6 @@
* @see org.apache.roller.weblogger.model.Roller#getThreadManager()
*/
public ThreadManager getThreadManager() {
- if (threadManager == null) {
- threadManager = new ThreadManagerImpl();
- }
return threadManager;
}
@@ -93,9 +109,6 @@
* @see org.apache.roller.weblogger.model.Roller#getIndexManager()
*/
public IndexManager getIndexManager() {
- if (indexManager == null) {
- indexManager = new IndexManagerImpl();
- }
return indexManager;
}
@@ -104,9 +117,6 @@
* @see org.apache.roller.weblogger.model.Roller#getThemeManager()
*/
public ThemeManager getThemeManager() {
- if (themeManager == null) {
- themeManager = new ThemeManagerImpl();
- }
return themeManager;
}
@@ -119,22 +129,91 @@
}
+
+ /**
+ * @see org.apache.roller.weblogger.model.Roller#getUserManager()
+ */
+ public UserManager getUserManager() {
+ return userManager;
+ }
+
+
+ /**
+ * @see org.apache.roller.weblogger.model.Roller#getBookmarkManager()
+ */
+ public BookmarkManager getBookmarkManager() {
+ return bookmarkManager;
+ }
+
+
+ /**
+ * @see org.apache.roller.weblogger.model.Roller#getWeblogManager()
+ */
+ public WeblogManager getWeblogManager() {
+ return weblogManager;
+ }
+
+
+ /**
+ * @see org.apache.roller.weblogger.model.Roller#getRefererManager()
+ */
+ public RefererManager getRefererManager() {
+ return refererManager;
+ }
+
+
+ /**
+ * @see org.apache.roller.weblogger.model.Roller#getPropertiesManager()
+ */
+ public PropertiesManager getPropertiesManager() {
+ return propertiesManager;
+ }
+
+
+ /**
+ * @see org.apache.roller.weblogger.model.Roller#getPingTargetManager()
+ */
+ public PingQueueManager getPingQueueManager() {
+ return pingQueueManager;
+ }
+
+
+ /**
+ * @see org.apache.roller.weblogger.model.Roller#getPingTargetManager()
+ */
+ public AutoPingManager getAutopingManager() {
+ return autoPingManager;
+ }
+
+
+ /**
+ * @see org.apache.roller.weblogger.model.Roller#getPingTargetManager()
+ */
+ public PingTargetManager getPingTargetManager() {
+ return pingTargetManager;
+ }
+
+
/**
* @see org.apache.roller.weblogger.model.Roller#getPluginManager()
*/
public PluginManager getPagePluginManager() {
- if (pluginManager == null) {
- pluginManager = new PluginManagerImpl();
- }
return pluginManager;
}
public void release() {
try {
- if (fileManager != null) fileManager.release();
- if (threadManager != null) threadManager.release();
- if (pluginManager != null) pluginManager.release();
+ autoPingManager.release();
+ bookmarkManager.release();
+ fileManager.release();
+ pingTargetManager.release();
+ pingQueueManager.release();
+ pluginManager.release();
+ refererManager.release();
+ threadManager.release();
+ userManager.release();
+ weblogManager.release();
} catch(Throwable e) {
mLogger.error("Error calling Roller.release()", e);
}
@@ -144,9 +223,9 @@
public void shutdown() {
try {
HitCountQueue.getInstance().shutdown();
- if (getReferrerQueueManager() != null) getReferrerQueueManager().shutdown();
- if (indexManager != null) indexManager.shutdown();
- if (threadManager != null) threadManager.shutdown();
+ getReferrerQueueManager().shutdown();
+ indexManager.shutdown();
+ threadManager.shutdown();
} catch(Throwable e) {
mLogger.error("Error calling Roller.shutdown()", e);
}
@@ -168,5 +247,4 @@
public String getBuildUser() {
return buildUser;
}
-
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateAutoPingManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateAutoPingManagerImpl.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateAutoPingManagerImpl.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateAutoPingManagerImpl.java Sun Jun 3 07:00:36 2007
@@ -22,7 +22,6 @@
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.criterion.Expression;
-import org.apache.roller.RollerException;
import org.apache.roller.weblogger.pojos.AutoPing;
import org.apache.roller.weblogger.pojos.PingTarget;
import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -33,6 +32,7 @@
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.RollerException;
import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.config.PingConfig;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernatePersistenceStrategy.java Sun Jun 3 07:00:36 2007
@@ -22,12 +22,13 @@
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.roller.RollerException;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
-import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.config.RollerConfig;
import org.hibernate.cfg.Environment;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -40,6 +41,7 @@
* manager implementations by providing a set of basic persistence methods
* that can be easily reused.
*/
+@com.google.inject.Singleton
public class HibernatePersistenceStrategy {
static final long serialVersionUID = 2561090040518169098L;
@@ -61,11 +63,17 @@
* 'hibernate.dialect' - the classname of the Hibernate dialect to be used,
* 'hibernate.connectionProvider - the classname of Roller's connnection provider impl.
*/
- public HibernatePersistenceStrategy(String configResource, String dialect, String connectionProvider) {
+ public HibernatePersistenceStrategy() throws RollerException {
+ String dialect =
+ RollerConfig.getProperty("hibernate.dialect");
+ String connectionProvider =
+ RollerConfig.getProperty("hibernate.connectionProvider");
+ String configuration =
+ RollerConfig.getProperty("hibernate.configuration");
// Read Hibernate config file specified by Roller config
Configuration config = new Configuration();
- config.configure(configResource);
+ config.configure(configuration);
// Add dialect specified by Roller config and our connection provider
Properties props = new Properties();
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateRollerImpl.java Sun Jun 3 07:00:36 2007
@@ -22,205 +22,67 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.weblogger.business.RollerImpl;
-import org.apache.roller.weblogger.config.RollerConfig;
import org.apache.roller.weblogger.business.BookmarkManager;
+import org.apache.roller.weblogger.business.FileManager;
+import org.apache.roller.weblogger.business.PluginManager;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
import org.apache.roller.weblogger.business.pings.PingQueueManager;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
import org.apache.roller.weblogger.business.PropertiesManager;
import org.apache.roller.weblogger.business.referrers.RefererManager;
-import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.business.runnable.ThreadManager;
-import org.apache.roller.weblogger.business.hibernate.HibernatePersistenceStrategy;
+import org.apache.roller.weblogger.business.search.IndexManager;
+import org.apache.roller.weblogger.business.themes.ThemeManager;
+
/**
* A Hibernate specific implementation of the Roller business layer.
*/
-public class HibernateRollerImpl extends RollerImpl {
-
+public class HibernateRollerImpl extends RollerImpl {
static final long serialVersionUID = 5256135928578074652L;
-
private static Log mLogger = LogFactory.getLog(HibernateRollerImpl.class);
// a persistence utility class
private HibernatePersistenceStrategy strategy = null;
- // references to the managers we maintain
- private BookmarkManager bookmarkManager = null;
- private PropertiesManager propertiesManager = null;
- private RefererManager refererManager = null;
- private UserManager userManager = null;
- private WeblogManager weblogManager = null;
- private PingQueueManager pingQueueManager = null;
- private AutoPingManager autoPingManager = null;
- private PingTargetManager pingTargetManager = null;
- private ThreadManager threadManager = null;
-
-
- protected HibernateRollerImpl() throws RollerException {
- try {
- String dialect =
- RollerConfig.getProperty("hibernate.dialect");
- String connectionProvider =
- RollerConfig.getProperty("hibernate.connectionProvider");
- strategy = new HibernatePersistenceStrategy(
- "/hibernate.cfg.xml", dialect, connectionProvider);
- } catch(Throwable t) {
- // if this happens then we are screwed
- mLogger.fatal("Error initializing Hibernate", t);
- throw new RollerException(t);
- }
- }
-
-
- /**
- * Instantiates and returns an instance of HibernateRollerImpl.
- */
- public static Roller instantiate() throws RollerException {
- mLogger.debug("Instantiating HibernateRollerImpl");
- Roller roller = new HibernateRollerImpl();
-
- // Now that Roller has been instantiated, initialize individual managers
- roller.getPropertiesManager();
- roller.getIndexManager();
- roller.getThemeManager();
- return roller;
- }
-
-
- public void flush() throws RollerException {
- this.strategy.flush();
- }
-
-
- public void release() {
-
- // release our own stuff first
- if (bookmarkManager != null) bookmarkManager.release();
- if (refererManager != null) refererManager.release();
- if (userManager != null) userManager.release();
- if (weblogManager != null) weblogManager.release();
- if (pingTargetManager != null) pingTargetManager.release();
- if (pingQueueManager != null) pingQueueManager.release();
- if (autoPingManager != null) autoPingManager.release();
- if( threadManager != null) threadManager.release();
+ @com.google.inject.Inject
+ public HibernateRollerImpl(
+ HibernatePersistenceStrategy strategy,
+ AutoPingManager autoPingManager,
+ BookmarkManager bookmarkManager,
+ FileManager fileManager,
+ IndexManager indexManager,
+ PingQueueManager pingQueueManager,
+ PingTargetManager pingTargetManager,
+ PluginManager pluginManager,
+ PropertiesManager propertiesManager,
+ RefererManager refererManager,
+ ThemeManager themeManager,
+ ThreadManager threadManager,
+ UserManager userManager,
+ WeblogManager weblogManager) throws RollerException {
- // tell Hibernate to close down
- this.strategy.release();
-
- // then let parent do its thing
- super.release();
+ super(
+ autoPingManager,
+ bookmarkManager,
+ fileManager,
+ indexManager,
+ pingQueueManager,
+ pingTargetManager,
+ pluginManager,
+ propertiesManager,
+ refererManager,
+ themeManager,
+ threadManager,
+ userManager,
+ weblogManager);
+ this.strategy = strategy;
}
-
-
- public void shutdown() {
- // do our own shutdown first
- this.release();
-
- // then let parent do its thing
- super.shutdown();
- }
-
-
- /**
- * @see org.apache.roller.weblogger.model.Roller#getUserManager()
- */
- public UserManager getUserManager() {
- if ( userManager == null ) {
- userManager = new HibernateUserManagerImpl(strategy);
- }
- return userManager;
- }
-
-
- /**
- * @see org.apache.roller.weblogger.model.Roller#getBookmarkManager()
- */
- public BookmarkManager getBookmarkManager() {
- if ( bookmarkManager == null ) {
- bookmarkManager = new HibernateBookmarkManagerImpl(strategy);
- }
- return bookmarkManager;
- }
-
-
- /**
- * @see org.apache.roller.weblogger.model.Roller#getWeblogManager()
- */
- public WeblogManager getWeblogManager() {
- if ( weblogManager == null ) {
- weblogManager = new HibernateWeblogManagerImpl(strategy);
- }
- return weblogManager;
- }
-
-
- /**
- * @see org.apache.roller.weblogger.model.Roller#getRefererManager()
- */
- public RefererManager getRefererManager() {
- if ( refererManager == null ) {
- refererManager = new HibernateRefererManagerImpl(strategy);
- }
- return refererManager;
- }
-
-
- /**
- * @see org.apache.roller.weblogger.model.Roller#getPropertiesManager()
- */
- public PropertiesManager getPropertiesManager() {
- if (propertiesManager == null) {
- propertiesManager = new HibernatePropertiesManagerImpl(strategy);
- }
- return propertiesManager;
- }
-
-
- /**
- * @see org.apache.roller.weblogger.model.Roller#getPingTargetManager()
- */
- public PingQueueManager getPingQueueManager() {
- if (pingQueueManager == null) {
- pingQueueManager = new HibernatePingQueueManagerImpl(strategy);
- }
- return pingQueueManager;
- }
-
-
- /**
- * @see org.apache.roller.weblogger.model.Roller#getPingTargetManager()
- */
- public AutoPingManager getAutopingManager() {
- if (autoPingManager == null) {
- autoPingManager = new HibernateAutoPingManagerImpl(this, strategy);
- }
- return autoPingManager;
- }
-
-
- /**
- * @see org.apache.roller.weblogger.model.Roller#getPingTargetManager()
- */
- public PingTargetManager getPingTargetManager() {
- if (pingTargetManager == null) {
- pingTargetManager = new HibernatePingTargetManagerImpl(strategy);
- }
- return pingTargetManager;
- }
-
-
- /**
- * @see org.apache.roller.weblogger.model.Roller#getThreadManager()
- */
- public ThreadManager getThreadManager() {
- if (threadManager == null) {
- threadManager = new HibernateThreadManagerImpl(strategy);
- }
- return threadManager;
- }
-
+ public void flush() throws RollerException {
+ this.strategy.flush();
+ }
}
+
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateUserManagerImpl.java Sun Jun 3 07:00:36 2007
@@ -223,6 +223,11 @@
}
public void removePermissions(WeblogPermission perms) throws RollerException {
+
+ // make sure associations are broken
+ perms.getWebsite().getPermissions().remove(perms);
+ perms.getUser().getPermissions().remove(perms);
+
this.strategy.remove(perms);
}
@@ -383,6 +388,10 @@
perms.setUser(user);
perms.setPermissionMask(mask);
this.strategy.store(perms);
+
+ // manage associations
+ website.getPermissions().add(perms);
+ user.getPermissions().add(perms);
return perms;
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPARollerImpl.java Sun Jun 3 07:00:36 2007
@@ -30,16 +30,21 @@
import org.apache.roller.RollerException;
import org.apache.roller.weblogger.business.BookmarkManager;
import org.apache.roller.weblogger.business.DatabaseProvider;
+import org.apache.roller.weblogger.business.FileManager;
+import org.apache.roller.weblogger.business.PluginManager;
import org.apache.roller.weblogger.business.PropertiesManager;
import org.apache.roller.weblogger.business.Roller;
import org.apache.roller.weblogger.business.RollerImpl;
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.business.hibernate.HibernatePersistenceStrategy;
import org.apache.roller.weblogger.business.runnable.ThreadManager;
import org.apache.roller.weblogger.business.pings.AutoPingManager;
import org.apache.roller.weblogger.business.pings.PingQueueManager;
import org.apache.roller.weblogger.business.pings.PingTargetManager;
import org.apache.roller.weblogger.business.referrers.RefererManager;
+import org.apache.roller.weblogger.business.search.IndexManager;
+import org.apache.roller.weblogger.business.themes.ThemeManager;
import org.apache.roller.weblogger.config.RollerConfig;
@@ -73,7 +78,39 @@
* Single constructor.
* @throws org.apache.roller.RollerException on any error
*/
- protected JPARollerImpl() throws RollerException {
+ @com.google.inject.Inject
+ public JPARollerImpl(
+ JPAPersistenceStrategy strategy,
+ AutoPingManager autoPingManager,
+ BookmarkManager bookmarkManager,
+ FileManager fileManager,
+ IndexManager indexManager,
+ PingQueueManager pingQueueManager,
+ PingTargetManager pingTargetManager,
+ PluginManager pluginManager,
+ PropertiesManager propertiesManager,
+ RefererManager refererManager,
+ ThemeManager themeManager,
+ ThreadManager threadManager,
+ UserManager userManager,
+ WeblogManager weblogManager) throws RollerException {
+
+ super(
+ autoPingManager,
+ bookmarkManager,
+ fileManager,
+ indexManager,
+ pingQueueManager,
+ pingTargetManager,
+ pluginManager,
+ propertiesManager,
+ refererManager,
+ themeManager,
+ threadManager,
+ userManager,
+ weblogManager);
+ this.strategy = strategy;
+
// Add OpenJPA, Toplink and Hibernate properties to Roller config.
Properties props = new Properties();
@@ -125,7 +162,7 @@
* @throws org.apache.roller.RollerException on any error
* @return the singleton
*/
- public static Roller instantiate() throws RollerException {
+ /*public static Roller instantiate() throws RollerException {
logger.debug("Instantiating JPARollerImpl");
Roller roller = new JPARollerImpl();
@@ -134,7 +171,7 @@
roller.getIndexManager();
roller.getThemeManager();
return roller;
- }
+ }*/
public void flush() throws RollerException {
this.strategy.flush();
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedTheme.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedTheme.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedTheme.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedTheme.java Sun Jun 3 07:00:36 2007
@@ -48,6 +48,8 @@
public abstract List getResources();
+ public abstract ThemeResource getPreviewImage();
+
/**
* @see java.lang.Comparable#compareTo(java.lang.Object)
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java Sun Jun 3 07:00:36 2007
@@ -48,6 +48,9 @@
// the filesystem directory where we should read this theme from
private String themeDir = null;
+ // the theme preview image
+ private ThemeResource previewImage = null;
+
// we keep templates in a Map for faster lookups by name
// the Map contains ... (template name, ThemeTemplate)
private Map templatesByName = new HashMap();
@@ -76,6 +79,14 @@
/**
+ * Get a resource representing the preview image for this theme.
+ */
+ public ThemeResource getPreviewImage() {
+ return this.previewImage;
+ }
+
+
+ /**
* Get the collection of all templates associated with this Theme.
*/
public List getTemplates() {
@@ -200,6 +211,14 @@
setCustomStylesheet(themeMetadata.getCustomStylesheet());
setLastModified(new Date());
setEnabled(true);
+
+ // load resource representing preview image
+ File previewFile = new File(this.themeDir + File.separator + themeMetadata.getPreviewImage());
+ if(!previewFile.exists() || !previewFile.canRead()) {
+ log.warn("Couldn't read preview image file ["+themeMetadata.getPreviewImage()+"]");
+ } else {
+ this.previewImage = new SharedThemeResourceFromDir(themeMetadata.getPreviewImage(), previewFile);
+ }
// go through static resources and add them to the theme
String resourcePath = null;
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/BookmarkDataWrapper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/BookmarkDataWrapper.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/BookmarkDataWrapper.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/BookmarkDataWrapper.java Sun Jun 3 07:00:36 2007
@@ -22,124 +22,70 @@
/**
- * Generated wrapper for class: org.apache.roller.weblogger.pojos.BookmarkData
+ * Pojo safety wrapper for WeblogBookmark object.
*/
public class BookmarkDataWrapper {
-
+
// keep a reference to the wrapped pojo
- private WeblogBookmark pojo = null;
-
+ private final WeblogBookmark pojo;
+
// this is private so that we can force the use of the .wrap(pojo) method
private BookmarkDataWrapper(WeblogBookmark toWrap) {
this.pojo = toWrap;
}
-
+
+
// wrap the given pojo if it is not null
public static BookmarkDataWrapper wrap(WeblogBookmark toWrap) {
if(toWrap != null)
return new BookmarkDataWrapper(toWrap);
-
+
return null;
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getId()
- {
+
+
+ public String getId() {
return this.pojo.getId();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getName()
- {
+
+
+ public String getName() {
return this.pojo.getName();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getDescription()
- {
+
+
+ public String getDescription() {
return this.pojo.getDescription();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getUrl()
- {
+
+
+ public String getUrl() {
return this.pojo.getUrl();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.Integer getWeight()
- {
+
+
+ public Integer getWeight() {
return this.pojo.getWeight();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.Integer getPriority()
- {
+
+
+ public Integer getPriority() {
return this.pojo.getPriority();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getImage()
- {
+
+
+ public String getImage() {
return this.pojo.getImage();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getFeedUrl()
- {
+
+
+ public String getFeedUrl() {
return this.pojo.getFeedUrl();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="pojo"
- *
- * This method returns another pojo so we need to wrap the returned pojo.
- */
- public org.apache.roller.weblogger.pojos.wrapper.FolderDataWrapper getFolder()
- {
- return org.apache.roller.weblogger.pojos.wrapper.FolderDataWrapper.wrap(this.pojo.getFolder());
- }
-
- /**
- * this is a special method to access the original pojo
- * we don't really want to do this, but it's necessary
- * because some parts of the rendering process still need the
- * orginal pojo object
- */
- public org.apache.roller.weblogger.pojos.WeblogBookmark getPojo() {
- return this.pojo;
+
+
+ public FolderDataWrapper getFolder() {
+ return FolderDataWrapper.wrap(this.pojo.getFolder());
}
-
+
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/CommentDataWrapper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/CommentDataWrapper.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/CommentDataWrapper.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/CommentDataWrapper.java Sun Jun 3 07:00:36 2007
@@ -23,194 +23,105 @@
/**
- * Generated wrapper for class: org.apache.roller.weblogger.pojos.CommentData
+ * Pojo safety wrapper for WeblogEntryComment object.
*/
public class CommentDataWrapper {
-
+
// keep a reference to the wrapped pojo
- private WeblogEntryComment pojo = null;
-
+ private final WeblogEntryComment pojo;
+
// this is private so that we can force the use of the .wrap(pojo) method
private CommentDataWrapper(WeblogEntryComment toWrap) {
this.pojo = toWrap;
}
-
+
+
// wrap the given pojo if it is not null
public static CommentDataWrapper wrap(WeblogEntryComment toWrap) {
if(toWrap != null)
return new CommentDataWrapper(toWrap);
-
+
return null;
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getId()
- {
+
+
+ public String getId() {
return this.pojo.getId();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="pojo"
- *
- * This method returns another pojo so we need to wrap the returned pojo.
- */
- public org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper getWeblogEntry()
- {
- return org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper.wrap(this.pojo.getWeblogEntry());
- }
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getName()
- {
+
+
+ public WeblogEntryDataWrapper getWeblogEntry() {
+ return WeblogEntryDataWrapper.wrap(this.pojo.getWeblogEntry());
+ }
+
+
+ public String getName() {
return StringEscapeUtils.escapeHtml(this.pojo.getName());
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getEmail()
- {
+
+
+ public String getEmail() {
return StringEscapeUtils.escapeHtml(this.pojo.getEmail());
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getUrl()
- {
+
+
+ public String getUrl() {
return StringEscapeUtils.escapeHtml(this.pojo.getUrl());
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getContent()
- {
+
+
+ public String getContent() {
return StringEscapeUtils.escapeHtml(this.pojo.getContent());
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.sql.Timestamp getPostTime()
- {
+
+
+ public java.sql.Timestamp getPostTime() {
return this.pojo.getPostTime();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getStatus()
- {
+
+
+ public String getStatus() {
return this.pojo.getStatus();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.Boolean getNotify()
- {
+
+
+ public Boolean getNotify() {
return this.pojo.getNotify();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getRemoteHost()
- {
+
+
+ public String getRemoteHost() {
return this.pojo.getRemoteHost();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getReferrer()
- {
+
+
+ public String getReferrer() {
return StringEscapeUtils.escapeHtml(this.pojo.getReferrer());
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getUserAgent()
- {
+
+
+ public String getUserAgent() {
return this.pojo.getUserAgent();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.Boolean getSpam()
- {
+
+
+ public Boolean getSpam() {
return this.pojo.getSpam();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.Boolean getPending()
- {
+
+
+ public Boolean getPending() {
return this.pojo.getPending();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.Boolean getApproved()
- {
+
+
+ public Boolean getApproved() {
return this.pojo.getApproved();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getTimestamp()
- {
+
+
+ public String getTimestamp() {
return this.pojo.getTimestamp();
}
-
- /**
- * this is a special method to access the original pojo
- * we don't really want to do this, but it's necessary
- * because some parts of the rendering process still need the
- * orginal pojo object
- */
- public org.apache.roller.weblogger.pojos.WeblogEntryComment getPojo() {
- return this.pojo;
- }
-
+
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/EntryAttributeDataWrapper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/EntryAttributeDataWrapper.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/EntryAttributeDataWrapper.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/EntryAttributeDataWrapper.java Sun Jun 3 07:00:36 2007
@@ -22,74 +22,45 @@
/**
- * Generated wrapper for class: org.apache.roller.weblogger.pojos.EntryAttributeData
+ * Pojo safety wrapper for WeblogEntryAttribute object.
*/
public class EntryAttributeDataWrapper {
-
+
// keep a reference to the wrapped pojo
- private WeblogEntryAttribute pojo = null;
-
+ private final WeblogEntryAttribute pojo;
+
// this is private so that we can force the use of the .wrap(pojo) method
private EntryAttributeDataWrapper(WeblogEntryAttribute toWrap) {
this.pojo = toWrap;
}
-
+
+
// wrap the given pojo if it is not null
public static EntryAttributeDataWrapper wrap(WeblogEntryAttribute toWrap) {
if(toWrap != null)
return new EntryAttributeDataWrapper(toWrap);
-
+
return null;
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getId()
- {
+
+
+ public String getId() {
return this.pojo.getId();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="pojo"
- *
- * This method returns another pojo so we need to wrap the returned pojo.
- */
- public org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper getEntry()
- {
- return org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper.wrap(this.pojo.getEntry());
- }
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getName()
- {
+
+
+ public WeblogEntryDataWrapper getEntry() {
+ return WeblogEntryDataWrapper.wrap(this.pojo.getEntry());
+ }
+
+
+ public String getName() {
return this.pojo.getName();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getValue()
- {
+
+
+ public String getValue() {
return this.pojo.getValue();
}
-
- /**
- * this is a special method to access the original pojo
- * we don't really want to do this, but it's necessary
- * because some parts of the rendering process still need the
- * orginal pojo object
- */
- public org.apache.roller.weblogger.pojos.WeblogEntryAttribute getPojo() {
- return this.pojo;
- }
-
+
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/FolderDataWrapper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/FolderDataWrapper.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/FolderDataWrapper.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/FolderDataWrapper.java Sun Jun 3 07:00:36 2007
@@ -18,181 +18,127 @@
package org.apache.roller.weblogger.pojos.wrapper;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import org.apache.roller.RollerException;
+import org.apache.roller.weblogger.pojos.WeblogBookmark;
import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
/**
- * Generated wrapper for class: org.apache.roller.weblogger.pojos.FolderData
+ * Pojo safety wrapper for WeblogBookmarkFolder object.
*/
public class FolderDataWrapper {
-
+
// keep a reference to the wrapped pojo
- private WeblogBookmarkFolder pojo = null;
-
+ private final WeblogBookmarkFolder pojo;
+
// this is private so that we can force the use of the .wrap(pojo) method
private FolderDataWrapper(WeblogBookmarkFolder toWrap) {
this.pojo = toWrap;
}
-
+
+
// wrap the given pojo if it is not null
public static FolderDataWrapper wrap(WeblogBookmarkFolder toWrap) {
if(toWrap != null)
return new FolderDataWrapper(toWrap);
-
+
return null;
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getId()
- {
+
+
+ public String getId() {
return this.pojo.getId();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getName()
- {
+
+
+ public String getName() {
return this.pojo.getName();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getDescription()
- {
+
+
+ public String getDescription() {
return this.pojo.getDescription();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getPath()
- {
+
+
+ public String getPath() {
return this.pojo.getPath();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="pojo"
- *
- * This method returns another pojo so we need to wrap the returned pojo.
- */
- public org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper getWebsite()
- {
- return org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper.wrap(this.pojo.getWebsite());
- }
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="pojo"
- *
- * This method returns another pojo so we need to wrap the returned pojo.
- */
- public org.apache.roller.weblogger.pojos.wrapper.FolderDataWrapper getParent()
- {
- return org.apache.roller.weblogger.pojos.wrapper.FolderDataWrapper.wrap(this.pojo.getParent());
- }
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="pojo-collection"
- *
- * This method returns a collection of pojos so we need to wrap
- * each pojo that is part of the collection.
- */
- public java.util.List getFolders()
- {
- java.util.Set initialCollection = this.pojo.getFolders();
-
+
+
+ public WebsiteDataWrapper getWebsite() {
+ return WebsiteDataWrapper.wrap(this.pojo.getWebsite());
+ }
+
+
+ public FolderDataWrapper getParent() {
+ return FolderDataWrapper.wrap(this.pojo.getParent());
+ }
+
+
+ public List getFolders() {
+ Set initialCollection = this.pojo.getFolders();
+
// iterate through and wrap
// we force the use of an ArrayList because it should be good enough to cover
// for any Collection type we encounter.
- java.util.ArrayList wrappedCollection = new java.util.ArrayList(initialCollection.size());
- java.util.Iterator it = initialCollection.iterator();
+ List wrappedCollection = new ArrayList(initialCollection.size());
+ Iterator it = initialCollection.iterator();
int i = 0;
while(it.hasNext()) {
- wrappedCollection.add(i,org.apache.roller.weblogger.pojos.wrapper.FolderDataWrapper.wrap((org.apache.roller.weblogger.pojos.WeblogBookmarkFolder) it.next()));
+ wrappedCollection.add(i,FolderDataWrapper.wrap((WeblogBookmarkFolder) it.next()));
i++;
}
-
+
return wrappedCollection;
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="pojo-collection"
- *
- * This method returns a collection of pojos so we need to wrap
- * each pojo that is part of the collection.
- */
- public java.util.List getBookmarks()
- {
- java.util.Set initialCollection = this.pojo.getBookmarks();
-
+
+
+ public List getBookmarks() {
+ Set initialCollection = this.pojo.getBookmarks();
+
// iterate through and wrap
// we force the use of an ArrayList because it should be good enough to cover
// for any Collection type we encounter.
- java.util.ArrayList wrappedCollection = new java.util.ArrayList(initialCollection.size());
- java.util.Iterator it = initialCollection.iterator();
+ ArrayList wrappedCollection = new ArrayList(initialCollection.size());
+ Iterator it = initialCollection.iterator();
int i = 0;
while(it.hasNext()) {
- wrappedCollection.add(i,org.apache.roller.weblogger.pojos.wrapper.BookmarkDataWrapper.wrap((org.apache.roller.weblogger.pojos.WeblogBookmark) it.next()));
+ wrappedCollection.add(i,BookmarkDataWrapper.wrap((WeblogBookmark) it.next()));
i++;
}
-
+
return wrappedCollection;
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="pojo-collection"
- *
- * This method returns a collection of pojos so we need to wrap
- * each pojo that is part of the collection.
- */
- public java.util.List retrieveBookmarks(boolean subfolders)
- throws org.apache.roller.RollerException
- {
- java.util.List initialCollection = this.pojo.retrieveBookmarks(subfolders);
-
+
+
+ public List retrieveBookmarks(boolean subfolders)
+ throws RollerException {
+
+ List initialCollection = this.pojo.retrieveBookmarks(subfolders);
+
// iterate through and wrap
// we force the use of an ArrayList because it should be good enough to cover
// for any Collection type we encounter.
- java.util.ArrayList wrappedCollection = new java.util.ArrayList(initialCollection.size());
- java.util.Iterator it = initialCollection.iterator();
+ ArrayList wrappedCollection = new ArrayList(initialCollection.size());
+ Iterator it = initialCollection.iterator();
int i = 0;
while(it.hasNext()) {
- wrappedCollection.add(i,org.apache.roller.weblogger.pojos.wrapper.BookmarkDataWrapper.wrap((org.apache.roller.weblogger.pojos.WeblogBookmark) it.next()));
+ wrappedCollection.add(i,BookmarkDataWrapper.wrap((WeblogBookmark) it.next()));
i++;
}
-
+
return wrappedCollection;
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public boolean descendentOf(org.apache.roller.weblogger.pojos.WeblogBookmarkFolder ancestor)
- {
+
+
+ // TODO: this method won't actually work and we probably don't need it here anyways?
+ public boolean descendentOf(WeblogBookmarkFolder ancestor) {
return this.pojo.descendentOf(ancestor);
}
-
- /**
- * this is a special method to access the original pojo
- * we don't really want to do this, but it's necessary
- * because some parts of the rendering process still need the
- * orginal pojo object
- */
- public org.apache.roller.weblogger.pojos.WeblogBookmarkFolder getPojo() {
- return this.pojo;
- }
-
+
}
Modified: roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/RefererDataWrapper.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/RefererDataWrapper.java?view=diff&rev=543893&r1=543892&r2=543893
==============================================================================
--- roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/RefererDataWrapper.java (original)
+++ roller/branches/roller_guice/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/RefererDataWrapper.java Sun Jun 3 07:00:36 2007
@@ -22,194 +22,105 @@
/**
- * Generated wrapper for class: org.apache.roller.weblogger.pojos.RefererData
+ * Pojo safety wrapper for WeblogReferrer object.
*/
public class RefererDataWrapper {
-
+
// keep a reference to the wrapped pojo
- private WeblogReferrer pojo = null;
-
+ private final WeblogReferrer pojo;
+
// this is private so that we can force the use of the .wrap(pojo) method
private RefererDataWrapper(WeblogReferrer toWrap) {
this.pojo = toWrap;
}
-
+
+
// wrap the given pojo if it is not null
public static RefererDataWrapper wrap(WeblogReferrer toWrap) {
if(toWrap != null)
return new RefererDataWrapper(toWrap);
-
+
return null;
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getId()
- {
+
+
+ public String getId() {
return this.pojo.getId();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="pojo"
- *
- * This method returns another pojo so we need to wrap the returned pojo.
- */
- public org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper getWebsite()
- {
- return org.apache.roller.weblogger.pojos.wrapper.WebsiteDataWrapper.wrap(this.pojo.getWebsite());
- }
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="pojo"
- *
- * This method returns another pojo so we need to wrap the returned pojo.
- */
- public org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper getWeblogEntry()
- {
- return org.apache.roller.weblogger.pojos.wrapper.WeblogEntryDataWrapper.wrap(this.pojo.getWeblogEntry());
- }
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getDateString()
- {
+
+
+ public WebsiteDataWrapper getWebsite() {
+ return WebsiteDataWrapper.wrap(this.pojo.getWebsite());
+ }
+
+
+ public WeblogEntryDataWrapper getWeblogEntry() {
+ return WeblogEntryDataWrapper.wrap(this.pojo.getWeblogEntry());
+ }
+
+
+ public String getDateString() {
return this.pojo.getDateString();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getRefererUrl()
- {
+
+
+ public String getRefererUrl() {
return this.pojo.getRefererUrl();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getRefererPermalink()
- {
+
+
+ public String getRefererPermalink() {
return this.pojo.getRefererPermalink();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getRequestUrl()
- {
+
+
+ public String getRequestUrl() {
return this.pojo.getRequestUrl();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getTitle()
- {
+
+
+ public String getTitle() {
return this.pojo.getTitle();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getExcerpt()
- {
+
+
+ public String getExcerpt() {
return this.pojo.getExcerpt();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.Boolean getVisible()
- {
+
+
+ public Boolean getVisible() {
return this.pojo.getVisible();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.Boolean getDuplicate()
- {
+
+
+ public Boolean getDuplicate() {
return this.pojo.getDuplicate();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.Integer getDayHits()
- {
+
+
+ public Integer getDayHits() {
return this.pojo.getDayHits();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.Integer getTotalHits()
- {
+
+
+ public Integer getTotalHits() {
return this.pojo.getTotalHits();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getDisplayUrl(int maxWidth,boolean includeHits)
- {
+
+
+ public String getDisplayUrl(int maxWidth,boolean includeHits) {
return this.pojo.getDisplayUrl(maxWidth,includeHits);
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getUrl()
- {
+
+
+ public String getUrl() {
return this.pojo.getUrl();
}
-
- /**
- * pojo method tagged with @roller.wrapPojoMethod type="simple"
- *
- * Simply returns the same value that the pojo would have returned.
- */
- public java.lang.String getDisplayUrl()
- {
+
+
+ public String getDisplayUrl() {
return this.pojo.getDisplayUrl();
}
-
- /**
- * this is a special method to access the original pojo
- * we don't really want to do this, but it's necessary
- * because some parts of the rendering process still need the
- * orginal pojo object
- */
- public org.apache.roller.weblogger.pojos.WeblogReferrer getPojo() {
- return this.pojo;
- }
-
+
}