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/04/03 22:07:50 UTC
svn commit: r525260 [1/3] - in
/incubator/roller/branches/roller_4.0_newbackend: ./ docs/devguide/
docs/examples/ docs/examples/configs/ docs/examples/configs/resin/
docs/examples/configs/tomcat/ docs/examples/configs/wbloggar/
metadata/database/tmpls/...
Author: snoopdave
Date: Tue Apr 3 13:07:41 2007
New Revision: 525260
URL: http://svn.apache.org/viewvc?view=rev&rev=525260
Log:
Latest changes from trunk
Added:
incubator/roller/branches/roller_4.0_newbackend/docs/examples/configs/
- copied from r525007, incubator/roller/trunk/docs/examples/configs/
incubator/roller/branches/roller_4.0_newbackend/docs/examples/configs/resin/
- copied from r525007, incubator/roller/trunk/docs/examples/configs/resin/
incubator/roller/branches/roller_4.0_newbackend/docs/examples/configs/resin/roller-for-resin3.conf
- copied unchanged from r525007, incubator/roller/trunk/docs/examples/configs/resin/roller-for-resin3.conf
incubator/roller/branches/roller_4.0_newbackend/docs/examples/configs/tomcat/
- copied from r525007, incubator/roller/trunk/docs/examples/configs/tomcat/
incubator/roller/branches/roller_4.0_newbackend/docs/examples/configs/tomcat/mod_jk.conf
- copied unchanged from r525007, incubator/roller/trunk/docs/examples/configs/tomcat/mod_jk.conf
incubator/roller/branches/roller_4.0_newbackend/docs/examples/configs/wbloggar/
- copied from r525007, incubator/roller/trunk/docs/examples/configs/wbloggar/
incubator/roller/branches/roller_4.0_newbackend/docs/examples/configs/wbloggar/wbloggar.txt
- copied unchanged from r525007, incubator/roller/trunk/docs/examples/configs/wbloggar/wbloggar.txt
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/copyjars.sh (with props)
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/ruby1.rb
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/test1.rb
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/
- copied from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/adminprotocol/
- copied from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/adminprotocol/README.txt
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/README.txt
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/adminprotocol/createuser.gy
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/createuser.gy
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/adminprotocol/lib/
- copied from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/lib/
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/adminprotocol/lib/commons-codec-1.3.jar
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/lib/commons-codec-1.3.jar
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/adminprotocol/lib/jdom.jar
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/lib/jdom.jar
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/adminprotocol/lib/roller-rap-sdk.jar
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/lib/roller-rap-sdk.jar
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/adminprotocol/listcollections.gy
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/listcollections.gy
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/adminprotocol/listusers.gy
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/listusers.gy
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/adminprotocol/rap
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/rap
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/
- copied from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/rollerapi/
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/README.txt
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/rollerapi/README.txt
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/checkuser.gy
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/rollerapi/checkuser.gy
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/createblog.gy
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/rollerapi/createblog.gy
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/createcomment.gy
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/rollerapi/createcomment.gy
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/createentry.gy
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/rollerapi/createentry.gy
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/createuser.gy
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/rollerapi/createuser.gy
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/groovy
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/rollerapi/groovy
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/listusers.gy
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/rollerapi/listusers.gy
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/logs/
- copied from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/rollerapi/logs/
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/logs/README.txt
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/rollerapi/logs/README.txt
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/removeuser.gy
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/rollerapi/removeuser.gy
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/roller-custom.properties
- copied unchanged from r525007, incubator/roller/trunk/sandbox/scripting/groovy/examples/rollerapi/roller-custom.properties
incubator/roller/branches/roller_4.0_newbackend/sign-release.sh
- copied unchanged from r525007, incubator/roller/trunk/sign-release.sh
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/
- copied from r525007, incubator/roller/trunk/src/org/apache/roller/business/themes/
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/ThemeManager.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/business/themes/ThemeManager.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/ThemeManagerImpl.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/business/themes/ThemeManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/ThemeMetadata.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/business/themes/ThemeMetadata.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/ThemeMetadataParser.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/business/themes/ThemeMetadataParser.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/ThemeMetadataTemplate.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/business/themes/ThemeMetadataTemplate.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/ThemeNotFoundException.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/business/themes/ThemeNotFoundException.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/ThemeParsingException.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/business/themes/ThemeParsingException.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/
- copied from r525007, incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/BookmarkDataWrapper.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/BookmarkDataWrapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/CommentDataWrapper.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/CommentDataWrapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/EntryAttributeDataWrapper.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/EntryAttributeDataWrapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/FolderDataWrapper.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/FolderDataWrapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/RefererDataWrapper.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/RefererDataWrapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/TemplateWrapper.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/TemplateWrapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/UserDataWrapper.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/UserDataWrapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/WeblogCategoryDataWrapper.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/WeblogCategoryDataWrapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/WeblogEntryDataWrapper.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/WeblogEntryDataWrapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/WeblogEntryTagDataWrapper.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/WeblogEntryTagDataWrapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/WebsiteDataWrapper.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/pojos/wrapper/WebsiteDataWrapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/
- copied from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/AdminServlet.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/AdminServlet.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/AppUrl.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/AppUrl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/Authenticator.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/Authenticator.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/BadRequestException.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/BadRequestException.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/BasicAuthenticator.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/BasicAuthenticator.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/Handler.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/Handler.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/HandlerException.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/HandlerException.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/InternalException.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/InternalException.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/IntrospectionHandler.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/IntrospectionHandler.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/NotAllowedException.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/NotAllowedException.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/NotFoundException.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/NotFoundException.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/RollerMemberHandler.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerMemberHandler.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/RollerUserHandler.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerUserHandler.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/RollerWeblogHandler.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/RollerWeblogHandler.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/UnauthorizedException.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/UnauthorizedException.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/package.html
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/package.html
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/sdk/
- copied from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/sdk/
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/sdk/Entry.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/sdk/Entry.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/sdk/EntrySet.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/sdk/EntrySet.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/sdk/LocaleString.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/sdk/LocaleString.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/sdk/MemberEntry.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/sdk/MemberEntry.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/sdk/MemberEntrySet.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/sdk/MemberEntrySet.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/sdk/Service.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/sdk/Service.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/sdk/UnexpectedRootElementException.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/sdk/UnexpectedRootElementException.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/sdk/UserEntry.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/sdk/UserEntry.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/sdk/UserEntrySet.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/sdk/UserEntrySet.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/sdk/WeblogEntry.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/sdk/WeblogEntry.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/sdk/WeblogEntrySet.java
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/sdk/WeblogEntrySet.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminprotocol/sdk/package.html
- copied unchanged from r525007, incubator/roller/trunk/src/org/apache/roller/webservices/adminprotocol/sdk/package.html
incubator/roller/branches/roller_4.0_newbackend/tools/openjpa-0.9.6/geronimo-jta_1.0.1B_spec-1.0.1.jar (with props)
incubator/roller/branches/roller_4.0_newbackend/tools/spring-1.2/ehcache-1.1.jar (with props)
incubator/roller/branches/roller_4.0_newbackend/web/themes/basic/theme.xml
- copied unchanged from r525007, incubator/roller/trunk/web/themes/basic/theme.xml
incubator/roller/branches/roller_4.0_newbackend/web/themes/brushedmetal/theme.xml
- copied unchanged from r525007, incubator/roller/trunk/web/themes/brushedmetal/theme.xml
incubator/roller/branches/roller_4.0_newbackend/web/themes/frontpage/theme.xml
- copied unchanged from r525007, incubator/roller/trunk/web/themes/frontpage/theme.xml
incubator/roller/branches/roller_4.0_newbackend/web/themes/sotto/theme.xml
- copied unchanged from r525007, incubator/roller/trunk/web/themes/sotto/theme.xml
Removed:
incubator/roller/branches/roller_4.0_newbackend/docs/examples/mod_jk.conf
incubator/roller/branches/roller_4.0_newbackend/docs/examples/roller-for-resin3.conf
incubator/roller/branches/roller_4.0_newbackend/docs/examples/roller.conf
incubator/roller/branches/roller_4.0_newbackend/docs/examples/wbloggar.txt
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/bin/
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/ThemeManager.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/ThemeManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/ThemeNotFoundException.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/adminapi/
Modified:
incubator/roller/branches/roller_4.0_newbackend/build.xml
incubator/roller/branches/roller_4.0_newbackend/docs/devguide/roller-dev-guide.odt
incubator/roller/branches/roller_4.0_newbackend/docs/examples/README.txt
incubator/roller/branches/roller_4.0_newbackend/merges.txt
incubator/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm
incubator/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm
incubator/roller/branches/roller_4.0_newbackend/nbproject/project.xml
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/build.xml
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/src/org/apache/roller/scripting/BSFRenderer.java
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/src/org/apache/roller/scripting/BSFRendererFactory.java
incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/README.txt
incubator/roller/branches/roller_4.0_newbackend/site/README.txt
incubator/roller/branches/roller_4.0_newbackend/site/docs/dev/sitemap.html
incubator/roller/branches/roller_4.0_newbackend/site/docs/index.html
incubator/roller/branches/roller_4.0_newbackend/site/xdocs/index.xml
incubator/roller/branches/roller_4.0_newbackend/site/xdocs/stylesheets/project.xml
incubator/roller/branches/roller_4.0_newbackend/site/xdocs/stylesheets/site.vsl
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/Roller.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/RollerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/UserManager.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/runnable/ScheduledEntriesTask.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/config/RollerRuntimeConfig.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/StaticTemplate.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/Template.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/Theme.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/ThemeTemplate.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.orm.xml
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WeblogTemplate.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WeblogTemplate.orm.xml
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WebsiteData.orm.xml
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/InvitationsAction.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/InviteMemberAction.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/ThemeEditorAction.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/ToggleLinkbackDisplayAction.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/WeblogEntryFormAction.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/WeblogTemplateFormAction.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/formbeans/WeblogTemplateFormEx.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/tags/ShowEntryContentTag.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/tags/ShowEntrySummaryTag.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/tags/ShowEntryTextTag.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/RollerContext.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/RollerSession.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/filters/RequestFilter.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts/actions/CreateWebsiteAction.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts/actions/UserNewAction.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/tags/calendar/BigWeblogCalendarModel.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/WeblogRequestMapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/FeedModel.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/SearchResultsFeedModel.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/URLModel.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/SearchResultsFeedPager.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/FeedServlet.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PreviewResourceServlet.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/ResourceServlet.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/servlets/SearchServlet.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/WeblogPageRequest.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/WeblogPreviewRequest.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/WeblogPreviewResourceRequest.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/cache/SiteWideCache.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/cache/WeblogPageCache.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/ThemeResourceLoader.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/xmlrpc/BaseAPIHandler.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/xmlrpc/MetaWeblogAPIHandler.java
incubator/roller/branches/roller_4.0_newbackend/testdata/roller-custom.properties
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/business/WeblogEntryTest.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/business/WeblogPageTest.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/MockRollerContext.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/webservices/adminapi/AappTest.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/webservices/adminapi/HandlerBaseTest.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/webservices/adminapi/MemberHandlerTest.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/webservices/adminapi/UserHandlerTest.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/webservices/adminapi/WeblogHandlerTest.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/webservices/adminapi/sdk/MemberEntryTest.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/webservices/adminapi/sdk/UserEntryTest.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/webservices/adminapi/sdk/WeblogEntryTest.java
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/roller.properties
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/edit-page.jsp
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/edit-pages-sidebar.jsp
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/theme-editor.jsp
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/CreateWebsite.jsp
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/taglibs-error.jsp
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/taglibs.jsp
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/bannerStatus.jsp
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/head.jsp
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/velocity/weblog.vm
incubator/roller/branches/roller_4.0_newbackend/web/roller-ui/widgets/date.jsp
Modified: incubator/roller/branches/roller_4.0_newbackend/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/build.xml?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/build.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/build.xml Tue Apr 3 13:07:41 2007
@@ -95,7 +95,7 @@
<!-- XDoclet code generation -->
<!-- ********************************************************************* -->
-<target name="generate" depends="gen-wrappers,gen-forms" >
+<target name="generate" depends="gen-forms" >
</target>
<!-- ============================================== -->
@@ -440,8 +440,10 @@
<fileset dir="./contrib/lib" />
<fileset refid="base.jars" />
<fileset refid="presentation.jars" />
+ <!--
<fileset refid="hibernate.jar" />
<fileset refid="hibernate.jars" />
+ -->
<fileset refid="jpa.jars" />
<fileset refid="commons.jars" />
<fileset refid="struts.jars" />
@@ -1050,11 +1052,11 @@
</target>
- <target name="test-aapp" depends="test-aapp-sdk, test-aapp-handler"/>
+ <target name="test-rap" depends="test-rap-sdk, test-rap-handler"/>
- <target name="test-aapp-sdk">
- <mkdir dir="${build.reports}/webservices/adminapi/sdk/xml"/>
- <mkdir dir="${build.reports}/webservices/adminapi/sdk/html"/>
+ <target name="test-rap-sdk">
+ <mkdir dir="${build.reports}/webservices/adminprotocol/sdk/xml"/>
+ <mkdir dir="${build.reports}/webservices/adminprotocol/sdk/html"/>
<junit fork="true" dir="${build.tests}" printsummary="on" showOutput="true">
<syspropertyset>
@@ -1064,23 +1066,23 @@
<path refid="tests.run.path"/>
</classpath>
<formatter type="xml"/>
- <batchtest toDir="${build.reports}/webservices/adminapi/sdk/xml">
+ <batchtest toDir="${build.reports}/webservices/protocol/sdk/xml">
<fileset dir="${build.tests}/WEB-INF/classes">
- <include name="org/apache/roller/webservices/adminapi/sdk/*EntryTest.class"/>
+ <include name="org/apache/roller/webservices/protocol/sdk/*EntryTest.class"/>
</fileset>
</batchtest>
</junit>
- <junitreport todir="${build.reports}/webservices/adminapi/sdk/xml">
- <fileset dir="${build.reports}/webservices/adminapi/sdk/xml">
+ <junitreport todir="${build.reports}/webservices/protocol/sdk/xml">
+ <fileset dir="${build.reports}/webservices/protocol/sdk/xml">
<include name="TEST-*.xml"/>
</fileset>
- <report format="noframes" toDir="${build.reports}/webservices/adminapi/sdk/html"/>
+ <report format="noframes" toDir="${build.reports}/webservices/protocol/sdk/html"/>
</junitreport>
</target>
- <target name="test-aapp-handler">
- <mkdir dir="${build.reports}/webservices/adminapi/xml"/>
- <mkdir dir="${build.reports}/webservices/adminapi/html"/>
+ <target name="test-rap-handler">
+ <mkdir dir="${build.reports}/webservices/protocol/xml"/>
+ <mkdir dir="${build.reports}/webservices/protocol/html"/>
<junit fork="true" dir="${build.tests}" printsummary="on">
<syspropertyset>
@@ -1090,17 +1092,17 @@
<path refid="tests.run.path"/>
</classpath>
<formatter type="xml"/>
- <batchtest toDir="${build.reports}/webservices/adminapi/xml">
+ <batchtest toDir="${build.reports}/webservices/protocol/xml">
<fileset dir="${build.tests}/WEB-INF/classes">
- <include name="org/apache/roller/webservices/adminapi/*HandlerTest.class"/>
+ <include name="org/apache/roller/webservices/protocol/*HandlerTest.class"/>
</fileset>
</batchtest>
</junit>
- <junitreport todir="${build.reports}/webservices/adminapi/xml">
- <fileset dir="${build.reports}/webservices/adminapi/xml">
+ <junitreport todir="${build.reports}/webservices/protocol/xml">
+ <fileset dir="${build.reports}/webservices/protocol/xml">
<include name="TEST-*.xml"/>
</fileset>
- <report format="noframes" toDir="${build.reports}/webservices/adminapi/html"/>
+ <report format="noframes" toDir="${build.reports}/webservices/protocol/html"/>
</junitreport>
</target>
@@ -1231,15 +1233,15 @@
<!-- Experimental Admin API SDK -->
<!-- ********************************************************************* -->
-<!-- build standalone aapp-sdk.jar, for external consumption -->
-<target name="aapp-sdk" depends="build">
+<!-- build standalone rap-sdk.jar, for external consumption -->
+<target name="rap-sdk" depends="build">
<mkdir dir="${build.lib}"/>
- <jar destfile="${build.lib}/roller-aapp-sdk.jar">
+ <jar destfile="${build.lib}/roller-rap-sdk.jar">
<manifest>
<attribute name="Manifest-Version" value="${ro.version}"/>
</manifest>
<fileset dir="${build.compile.web}">
- <include name="org/apache/roller/webservices/adminapi/sdk/*"/>
+ <include name="org/apache/roller/webservices/adminprotocol/sdk/*"/>
</fileset>
</jar>
</target>
Modified: incubator/roller/branches/roller_4.0_newbackend/docs/devguide/roller-dev-guide.odt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/docs/devguide/roller-dev-guide.odt?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
Binary files - no diff available.
Modified: incubator/roller/branches/roller_4.0_newbackend/docs/examples/README.txt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/docs/examples/README.txt?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/docs/examples/README.txt (original)
+++ incubator/roller/branches/roller_4.0_newbackend/docs/examples/README.txt Tue Apr 3 13:07:41 2007
@@ -1,7 +1,7 @@
-
Example Roller configuration and testing files
-rollertask.sh - can be used to run a Roller task on the command-line
-mod_jk.conf - example mod_jk.conf config file for Roller
-roller-for-resin3.conf - example Roller config file for Resin 3
-roller.conf - example Roller config file for Resin
+rollertask - example script for running Roller asks on the command-line
+configs/resin - example configs for Resin
+configs/tomcat - example configs for Tomcat
+configs/wbloggar - example config for w:bloggar blogging client
+
Modified: incubator/roller/branches/roller_4.0_newbackend/merges.txt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/merges.txt?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/merges.txt (original)
+++ incubator/roller/branches/roller_4.0_newbackend/merges.txt Tue Apr 3 13:07:41 2007
@@ -3,7 +3,11 @@
Temporary file to track merges from trunk into the roller_4.0_newbackend branch.
+April 3, 2007: merging latest from trunk
+svn merge -r 520487:525007 https://svn.apache.org/repos/asf/incubator/roller/trunk
+
March 20, 2007: merging latest from trunk (including template editor changes)
+svn merge -r 520393:520486 https://svn.apache.org/repos/asf/incubator/roller/trunk
svn merge -r 517890:520240 https://svn.apache.org/repos/asf/incubator/roller/trunk
March 14, 2007: merging latest from trunk
Modified: incubator/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm (original)
+++ incubator/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/3xx-to-400-migration.vm Tue Apr 3 13:07:41 2007
@@ -6,6 +6,13 @@
#addColumnNull("webpage" "outputtype" "varchar(48)")
+-- add new action column to webpage table, default value is custom
+#addColumnNotNull("webpage" "action" "varchar(16)" "'custom'")
+update webpage set action = 'weblog' where name = 'Weblog';
+
+-- add new custom stylesheet column to website table
+#addColumnNull("website" "customstylesheet" "varchar(128)")
+
-- remove old id column of group subscription table
alter table rag_group_subscription drop column id;
@@ -39,4 +46,4 @@
--alter table website drop column userid;
--alter table website drop column weblogdayid;
--alter table weblogentry drop column publishentry;
---alter table weblogentry drop column link;
\ No newline at end of file
+--alter table weblogentry drop column link;
Modified: incubator/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm (original)
+++ incubator/roller/branches/roller_4.0_newbackend/metadata/database/tmpls/createdb.vm Tue Apr 3 13:07:41 2007
@@ -84,7 +84,8 @@
navbar $db.BOOLEAN_SQL_TYPE_FALSE not null,
templatelang varchar(20) not null,
decorator varchar(255) default null,
- outputtype varchar(48) default null
+ outputtype varchar(48) default null,
+ action varchar(16) not null default 'custom'
);
create index wp_name_idx on webpage( name$!db.INDEXSIZE );
create index wp_link_idx on webpage( link$!db.INDEXSIZE );
@@ -122,7 +123,8 @@
lastmodified $db.TIMESTAMP_SQL_TYPE,
pagemodels varchar(255) default null,
enablemultilang $db.BOOLEAN_SQL_TYPE_FALSE not null,
- showalllangs $db.BOOLEAN_SQL_TYPE_TRUE not null
+ showalllangs $db.BOOLEAN_SQL_TYPE_TRUE not null,
+ customstylesheet varchar(128)
);
create index ws_userid_idx on website(userid);
create index ws_isenabled_idx on website(isenabled);
Modified: incubator/roller/branches/roller_4.0_newbackend/nbproject/project.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/nbproject/project.xml?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/nbproject/project.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/nbproject/project.xml Tue Apr 3 13:07:41 2007
@@ -37,6 +37,16 @@
<location>apps/planet/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>web</label>
<type>doc_root</type>
<location>web</location>
@@ -120,6 +130,14 @@
<label>apps/planet/src/java</label>
<location>apps/planet/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-file>
<location>build.xml</location>
</source-file>
@@ -145,7 +163,9 @@
<package-root>apps/planet/src/java</package-root>
<package-root>apps/planet/test/java</package-root>
<package-root>sandbox/jdobackend/src</package-root>
- <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.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-collections.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-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.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/m
ockrunner-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:tools/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/acegi-security-1.0.1.jar:tools/spring-1.2/spring.jar:sandbox/jdobackend/lib/bcel-5.1.jar:sandbox/jdobackend/lib/jdo2-api-2.0.jar:sandbox/jdobackend/lib/jdom.jar:sandbox/jdobackend/lib/jpox-1.1.0-beta-5.jar:sandb
ox/jdobackend/lib/jpox-1.1.0.jar:sandbox/jdobackend/lib/jpox-enhancer-1.1.0-beta-5.jar:sandbox/jdobackend/lib/jpox-enhancer-1.1.0.jar:sandbox/jdobackend/lib/toplink-essentials.jar</classpath>
+ <package-root>sandbox/scripting/bsf/src</package-root>
+ <package-root>sandbox/scripting/groovy/src</package-root>
+ <classpath mode="compile">tools/buildtime/junit-3.8.1.jar:tools/lib/commons-betwixt-1.0-beta-1.jar:tools/lib/commons-httpclient-2.0.2.jar:tools/lib/concurrent-1.3.2.jar:tools/lib/ekitapplet.jar:tools/lib/jazzy-core.jar:tools/lib/log4j-1.2.4.jar:tools/lib/lucene-1.4.3.jar:tools/lib/taglibs-string.jar:tools/lib/velocity-1.4.jar:tools/lib/velocity-dep-1.4.jar:tools/lib/velocity-tools-1.1.jar:tools/lib/xmlrpc-1.2-b1.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-collections.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-lang-2.0.jar:tools/struts-1.2.4/lib/commons-logging.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/m
ockrunner-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:tools/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/acegi-security-1.0.1.jar:tools/spring-1.2/spring.jar:sandbox/scripting/bsf/lib/bsf.jar:tools/openjpa-0.9.6/geronimo-j2ee-connector_1.5_spec.jar:tools/openjpa-0.9.6/geronimo-jta_1.0.1B_spec-1.0.1.jar:tools/openjp
a-0.9.6/openjpa-all-0.9.6-incubating.jar:tools/openjpa-0.9.6/persistence-api-1.0.jar:tools/openjpa-0.9.6/serp-1.11.0.jar</classpath>
<source-level>1.4</source-level>
</compilation-unit>
</java-data>
Modified: incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/build.xml?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/build.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/build.xml Tue Apr 3 13:07:41 2007
@@ -6,6 +6,7 @@
<path id="scripting.path">
<fileset dir="${rollersrc.dir}/build/webapp/WEB-INF/lib">
+ <include name="roller-core.jar"/>
<include name="roller-web.jar"/>
<include name="roller-business.jar"/>
<include name="commons-logging.jar"/>
Added: incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/copyjars.sh
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/copyjars.sh?view=auto&rev=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/copyjars.sh (added)
+++ incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/copyjars.sh Tue Apr 3 13:07:41 2007
@@ -0,0 +1,4 @@
+cp dist/roller-scripting.jar ../../../build/webapp/WEB-INF/lib
+cp lib/bsf.jar ../../../build/webapp/WEB-INF/lib
+cp /Applications/Java/jruby/lib/jruby.jar ../../../build/webapp/WEB-INF/lib
+cp /Applications/Java/jruby/lib/asm* ../../../build/webapp/WEB-INF/lib
Propchange: incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/copyjars.sh
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/ruby1.rb
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/ruby1.rb?view=auto&rev=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/ruby1.rb (added)
+++ incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/ruby1.rb Tue Apr 3 13:07:41 2007
@@ -0,0 +1,3 @@
+<html>
+</html>
+
Modified: incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/src/org/apache/roller/scripting/BSFRenderer.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/src/org/apache/roller/scripting/BSFRenderer.java?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/src/org/apache/roller/scripting/BSFRenderer.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/src/org/apache/roller/scripting/BSFRenderer.java Tue Apr 3 13:07:41 2007
@@ -18,9 +18,11 @@
package org.apache.roller.scripting;
+import java.io.PrintWriter;
import java.io.Writer;
import java.util.Iterator;
import java.util.Map;
+import org.apache.bsf.BSFException;
import org.apache.bsf.BSFManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -53,8 +55,10 @@
for (Iterator it = model.keySet().iterator(); it.hasNext();) {
String key = (String)it.next();
manager.declareBean(key, model.get(key), model.get(key).getClass());
+ manager.registerBean(key, model.get(key));
}
manager.declareBean("out", writer, Writer.class);
+ manager.registerBean("out", writer);
manager.exec(template.getTemplateLanguage(),
"(java)", 1, 1, template.getContents());
@@ -63,10 +67,22 @@
log.debug("Rendered ["+template.getId()+"] with language ["
+template.getTemplateLanguage()+"] in "+renderTime+" secs");
- } catch (Exception ex) {
- throw new RenderingException("Error during rendering", ex);
+ } catch (BSFException ex) {
+ log.debug("Executing BSF script", ex);
+ renderThrowable(ex, writer);
}
+ finally {}
}
-}
-
+ private void renderThrowable(BSFException ex, Writer writer) {
+ PrintWriter pw = new PrintWriter(writer);
+ if (ex.getTargetException() != null) {
+ pw.println("<p><b>Exception</b>: "+ex.getTargetException()
+ + "<br /><b>Message</b>: "+ex.getTargetException().getMessage()+"</p>");
+ } else {
+ pw.println("<p><b>Exception</b>: "+ex
+ + "<br /><b>Message</b>: "+ex.getMessage()+"</p>");
+ }
+ pw.flush();
+ }
+}
Modified: incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/src/org/apache/roller/scripting/BSFRendererFactory.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/src/org/apache/roller/scripting/BSFRendererFactory.java?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/src/org/apache/roller/scripting/BSFRendererFactory.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/src/org/apache/roller/scripting/BSFRendererFactory.java Tue Apr 3 13:07:41 2007
@@ -27,7 +27,7 @@
import org.apache.roller.util.Utilities;
/**
- * RendererFactory that calls BSF scripting language.
+ * RendererFactory that calls BSF scripting languages (groovy, jruby and javascript).
*/
public class BSFRendererFactory implements RendererFactory {
private static String[] names = {"groovy", "jruby", "javascript"};
Added: incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/test1.rb
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/test1.rb?view=auto&rev=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/test1.rb (added)
+++ incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/test1.rb Tue Apr 3 13:07:41 2007
@@ -0,0 +1,27 @@
+
+require 'java'
+
+puts "--------------------------------------------"
+puts "Hello"
+
+puts "--------------------------------------------"
+a = java.util.ArrayList.new
+
+a.add("foo");
+a.add("bar");
+a.add("baz");
+
+puts a
+
+for i in a
+ puts i
+end
+
+
+puts "--------------------------------------------"
+h = java.util.HashMap.new
+h.put("foo",10)
+
+h.each {|x| puts x}
+
+puts h.keySet()
Modified: incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/README.txt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/README.txt?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/README.txt (original)
+++ incubator/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/README.txt Tue Apr 3 13:07:41 2007
@@ -3,14 +3,19 @@
A) Some scripts that run against the Roller API
- bin/groovy - Runs Groovy with Roller jars in path. Edit it to set paths.
- bin/roller-custom.properties - Database properties for bin/groovy
- bin/listusers.gy - Lists users and roles in Roller system
- bin/createuser.gy - Create a user
- bin/createblog.gy - Create a blog
+ examples/rollerapi/groovy - Runs Groovy with Roller jars in path. Edit it to set paths.
+ examples/rollerapi/roller-custom.properties - Database properties for bin/groovy
+ examples/rollerapi/listusers.gy - Lists users and roles in Roller system
+ examples/rollerapi/createuser.gy - Create a user
+ examples/rollerapi/createblog.gy - Create a blog
-B) A Roller GroovletRenderer that can evaluate a Roller template as Groovy code
+B) Some scripts that run against the Roller Admin Protocol
+
+ examples/adminprotocol
+
+
+C) A Roller GroovletRenderer that can evaluate a Roller template as Groovy code
with Groovlet-style "out" and "html" bindings.
The implementation:
@@ -43,7 +48,7 @@
}
}
-C) A Roller GSPRenderer that can evaluate a Roller template as a Groovy Template
+D) A Roller GSPRenderer that can evaluate a Roller template as a Groovy Template
with GSP-style "out" and "html" bindings.
The implementation:
@@ -80,7 +85,7 @@
</html>
-To use renderers (B) and (C) in Roller:
+To use renderers (C) and (D) in Roller:
1) Put roller-groovy.jar and groovy-all-1.0.jar in WEB-INF/lib
Modified: incubator/roller/branches/roller_4.0_newbackend/site/README.txt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/site/README.txt?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/site/README.txt (original)
+++ incubator/roller/branches/roller_4.0_newbackend/site/README.txt Tue Apr 3 13:07:41 2007
@@ -1,4 +1,4 @@
-README for the Apache Roller site - http://incubator.apache.org/roller
+README for the Apache Roller site - http://roller.apache.org
To update the website:
@@ -12,7 +12,7 @@
3) ssh to people.apache.org
-4) cd /www/incubator.apache.org/roller
+4) cd /www/roller.apache.org
5) svn update
Modified: incubator/roller/branches/roller_4.0_newbackend/site/docs/dev/sitemap.html
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/site/docs/dev/sitemap.html?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/site/docs/dev/sitemap.html (original)
+++ incubator/roller/branches/roller_4.0_newbackend/site/docs/dev/sitemap.html Tue Apr 3 13:07:41 2007
@@ -18,7 +18,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" href="http://incubator.apache.org/style/style.css" type="text/css" />
- <title>ASF Development Infrastructure Document Index - Apache Roller (incubating)</title>
+ <title>ASF Development Infrastructure Document Index - Apache Roller</title>
</head>
<body>
<table border="0" width="100%" cellspacing="0">
@@ -26,7 +26,6 @@
<td align="left" valign="top">
<a href="http://www.apache.org/"><img src="http://incubator.apache.org/images/asf_logo_wide.gif" alt="The Apache Software Foundation" align="left" border="0"/></a>
</td>
- <img src="images/apache-incubator-logo.png" align="right"></img>
</tr>
</table>
<table border="0" width="100%" cellspacing="4">
@@ -68,8 +67,8 @@
<td valign="top" nowrap="nowrap" class="navright">
<div class="menuheader">Related Sites</div>
<menu compact="compact">
- <li><a href="http://incubator.apache.org/projects/roller.html">Roller Incubation Status</a></li>
- <li><a href="http://rollerweblogger.org">Old Roller website</a></li>
+ <li><a href="http://rollerweblogger.org/project">Roller project announcements blog</a></li>
+ <li><a href="http://roller.dev.java.net" />Java.Net Roller Support projet</li>
</menu>
<div class="menuheader"><a
href="http://projects.apache.org/">Related Projects</a></div>
@@ -79,7 +78,6 @@
<li><a href="http://jakarta.apache.org" />Apache Jakarta</li>
<li><a href="http://db.apache.org" />Apache Derby</li>
<li><a href="http://incubator.apache.org/abdera" />Apache Abdera (incubating)</li>
- <li><a href="http://roller.dev.java.net" />Java.Net Roller</li>
<li><a href="http://rome.dev.java.net" />Java.Net ROME</li>
<li><a href="http://blogapps.dev.java.net" />Java.Net Blogapps</li>
</menu>
Modified: incubator/roller/branches/roller_4.0_newbackend/site/docs/index.html
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/site/docs/index.html?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/site/docs/index.html (original)
+++ incubator/roller/branches/roller_4.0_newbackend/site/docs/index.html Tue Apr 3 13:07:41 2007
@@ -19,7 +19,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" href="http://incubator.apache.org/style/style.css" type="text/css" />
<meta name="author" content="The Apache Software Foundation" /><meta name="email" content="apache.AT.apache.DOT.org" />
- <title>Apache Roller (incubating) - open source Java blog server - Apache Roller (incubating)</title>
+ <title>Apache Roller - open source Java blog server - Apache Roller</title>
</head>
<body>
<table border="0" width="100%" cellspacing="0">
@@ -27,7 +27,6 @@
<td align="left" valign="top">
<a href="http://www.apache.org/"><img src="http://incubator.apache.org/images/asf_logo_wide.gif" alt="The Apache Software Foundation" align="left" border="0"/></a>
</td>
- <img src="images/apache-incubator-logo.png" align="right"></img>
</tr>
</table>
<table border="0" width="100%" cellspacing="4">
@@ -67,7 +66,7 @@
</h2>
<div class="section-content">
<p>
- Apache Roller (incubating) is a full-featured, multi-user and group-blog
+ Apache Roller is a full-featured, multi-user and group-blog
server suitable for blog sites large and small. This is the project's
homepage, which provides a brief overview of the software and project as
well as links to
@@ -109,19 +108,11 @@
</h2>
<div class="section-content">
<p>
- As a web application, Roller is a stable and production-ready blog
+ Roller is a stable and production-ready blog
server in it's third major revision. It powers internal and external
employee blogs and Sun, IBM and other companies as well as the JRoller.com
- Java blogging community. But as a project, Roller is in incubation.
-</p>
-<p>
- The Roller project is in the process of moving to the
- <a href="http://www.apache.org">Apache Software Foundation</a> (ASF) and is
- currently part of the <a href="http://incubator.apache.org/">Apache Incubator
- program</a>. The ASF incubation process is designed to ensure that projects
- entering Apache have a strong and diverse community, have Apache compatible
- licensing and work according to the ASF's philosophy and guidelines for
- collaborative development.
+ Java blogging community. Roller graduated from the Apache Incubator in March
+ 2007 and is now an official Apache project.
</p>
</div>
</td>
@@ -129,8 +120,8 @@
<td valign="top" nowrap="nowrap" class="navright">
<div class="menuheader">Related Sites</div>
<menu compact="compact">
- <li><a href="http://incubator.apache.org/projects/roller.html">Roller Incubation Status</a></li>
- <li><a href="http://rollerweblogger.org">Old Roller website</a></li>
+ <li><a href="http://rollerweblogger.org/project">Roller project announcements blog</a></li>
+ <li><a href="http://roller.dev.java.net" />Java.Net Roller Support projet</li>
</menu>
<div class="menuheader"><a
href="http://projects.apache.org/">Related Projects</a></div>
@@ -140,7 +131,6 @@
<li><a href="http://jakarta.apache.org" />Apache Jakarta</li>
<li><a href="http://db.apache.org" />Apache Derby</li>
<li><a href="http://incubator.apache.org/abdera" />Apache Abdera (incubating)</li>
- <li><a href="http://roller.dev.java.net" />Java.Net Roller</li>
<li><a href="http://rome.dev.java.net" />Java.Net ROME</li>
<li><a href="http://blogapps.dev.java.net" />Java.Net Blogapps</li>
</menu>
Modified: incubator/roller/branches/roller_4.0_newbackend/site/xdocs/index.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/site/xdocs/index.xml?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/site/xdocs/index.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/site/xdocs/index.xml Tue Apr 3 13:07:41 2007
@@ -16,7 +16,7 @@
<document>
<properties>
<author email="apache.AT.apache.DOT.org">The Apache Software Foundation</author>
- <title>Apache Roller (incubating) - open source Java blog server</title>
+ <title>Apache Roller - open source Java blog server</title>
</properties>
<body>
@@ -26,7 +26,7 @@
<section><title>Welcome!</title>
<p>
- Apache Roller (incubating) is a full-featured, multi-user and group-blog
+ Apache Roller is a full-featured, multi-user and group-blog
server suitable for blog sites large and small. This is the project's
homepage, which provides a brief overview of the software and project as
well as links to
@@ -63,20 +63,13 @@
<section><title>Project Status</title>
<p>
- As a web application, Roller is a stable and production-ready blog
+ Roller is a stable and production-ready blog
server in it's third major revision. It powers internal and external
employee blogs and Sun, IBM and other companies as well as the JRoller.com
- Java blogging community. But as a project, Roller is in incubation.
+ Java blogging community. Roller graduated from the Apache Incubator in March
+ 2007 and is now an official Apache project.
</p>
-<p>
- The Roller project is in the process of moving to the
- <a href="http://www.apache.org">Apache Software Foundation</a> (ASF) and is
- currently part of the <a href="http://incubator.apache.org/">Apache Incubator
- program</a>. The ASF incubation process is designed to ensure that projects
- entering Apache have a strong and diverse community, have Apache compatible
- licensing and work according to the ASF's philosophy and guidelines for
- collaborative development.
-</p>
+
</section>
Modified: incubator/roller/branches/roller_4.0_newbackend/site/xdocs/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/site/xdocs/stylesheets/project.xml?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/site/xdocs/stylesheets/project.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/site/xdocs/stylesheets/project.xml Tue Apr 3 13:07:41 2007
@@ -15,7 +15,7 @@
-->
<project href="http://www.apache.org/">
-<title>Apache Roller (incubating)</title>
+<title>Apache Roller</title>
<body>
<projects><title>Project information</title>
@@ -37,8 +37,8 @@
</projects>
<menu><title>Related Sites</title>
- <li><a href="http://incubator.apache.org/projects/roller.html">Roller Incubation Status</a></li>
- <li><a href="http://rollerweblogger.org">Old Roller website</a></li>
+ <li><a href="http://rollerweblogger.org/project">Roller project announcements blog</a></li>
+ <li><a href="http://roller.dev.java.net"></a>Java.Net Roller Support projet</li>
</menu>
<menu><title href="http://projects.apache.org/">Related Projects</title>
@@ -47,7 +47,6 @@
<li><a href="http://jakarta.apache.org"></a>Apache Jakarta</li>
<li><a href="http://db.apache.org"></a>Apache Derby</li>
<li><a href="http://incubator.apache.org/abdera"></a>Apache Abdera (incubating)</li>
- <li><a href="http://roller.dev.java.net"></a>Java.Net Roller</li>
<li><a href="http://rome.dev.java.net"></a>Java.Net ROME</li>
<li><a href="http://blogapps.dev.java.net"></a>Java.Net Blogapps</li>
</menu>
Modified: incubator/roller/branches/roller_4.0_newbackend/site/xdocs/stylesheets/site.vsl
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/site/xdocs/stylesheets/site.vsl?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/site/xdocs/stylesheets/site.vsl (original)
+++ incubator/roller/branches/roller_4.0_newbackend/site/xdocs/stylesheets/site.vsl Tue Apr 3 13:07:41 2007
@@ -280,7 +280,6 @@
<table border="0" width="100%" cellspacing="0">
<tr><!-- SITE BANNER AND PROJECT IMAGE -->
#getProjectImage()
- <img src="images/apache-incubator-logo.png" align="right"></img>
</tr>
</table>
<table border="0" width="100%" cellspacing="4">
Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/Roller.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/Roller.java?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/Roller.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/Roller.java Tue Apr 3 13:07:41 2007
@@ -28,6 +28,7 @@
import org.apache.roller.business.referrers.ReferrerQueueManager;
import org.apache.roller.business.runnable.ThreadManager;
import org.apache.roller.business.search.IndexManager;
+import org.apache.roller.business.themes.ThemeManager;
/**
Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/RollerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/RollerImpl.java?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/RollerImpl.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/RollerImpl.java Tue Apr 3 13:07:41 2007
@@ -28,6 +28,8 @@
import org.apache.roller.business.search.IndexManagerImpl;
import org.apache.roller.business.search.IndexManager;
import org.apache.roller.business.runnable.ThreadManager;
+import org.apache.roller.business.themes.ThemeManager;
+import org.apache.roller.business.themes.ThemeManagerImpl;
/**
Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/UserManager.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/UserManager.java?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/UserManager.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/UserManager.java Tue Apr 3 13:07:41 2007
@@ -27,6 +27,7 @@
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WebsiteData;
+
/**
* Manages users, weblogs, permissions, and weblog pages.
*/
@@ -349,6 +350,12 @@
* Get page by id.
*/
public WeblogTemplate getPage(String id) throws RollerException;
+
+
+ /**
+ * Get user's page by action.
+ */
+ public WeblogTemplate getPageByAction(WebsiteData w, String a) throws RollerException;
/**
Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/datamapper/DatamapperUserManagerImpl.java Tue Apr 3 13:07:41 2007
@@ -270,6 +270,9 @@
public void removePage(WeblogTemplate page) throws RollerException {
this.strategy.remove(page);
+
+ // update weblog last modified date. date updated by saveWebsite()
+ RollerFactory.getRoller().getUserManager().saveWebsite(page.getWebsite());
}
public void addUser(UserData newUser) throws RollerException {
@@ -883,6 +886,25 @@
return (WeblogTemplate)this.strategy.load(WeblogTemplate.class,id);
}
+ /**
+ * @see org.apache.roller.model.UserManager#getPageByAction(WebsiteData, java.lang.String)
+ */
+ public WeblogTemplate getPageByAction(WebsiteData website, String action)
+ throws RollerException {
+
+ if (website == null)
+ throw new RollerException("website is null");
+
+ if (action == null)
+ throw new RollerException("Action name is null");
+
+ DatamapperQuery query = strategy.newQuery(
+ WeblogTemplate.class, "WeblogTemplate.getByAction");
+ query.setRange(0, 1); // => query.setFirstResult(1).setMaxResult(1)
+ List list = (List)query.execute(new Object[] {website, action});
+ return list.size()!=0 ? (WeblogTemplate)list.get(0) : null;
+ }
+
/**
* Use Datamapper directly because Roller's Query API does too much allocation.
*/
Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateUserManagerImpl.java Tue Apr 3 13:07:41 2007
@@ -238,6 +238,9 @@
public void removePage(WeblogTemplate page) throws RollerException {
this.strategy.remove(page);
+
+ // update weblog last modified date. date updated by saveWebsite()
+ RollerFactory.getRoller().getUserManager().saveWebsite(page.getWebsite());
}
public void addUser(UserData newUser) throws RollerException {
@@ -673,6 +676,32 @@
throw new RollerException(e);
}
}
+
+
+ /**
+ * @see org.apache.roller.model.UserManager#getPageByAction(WebsiteData, java.lang.String)
+ */
+ public WeblogTemplate getPageByAction(WebsiteData website, String action)
+ throws RollerException {
+
+ if (website == null)
+ throw new RollerException("website is null");
+
+ if (action == null)
+ throw new RollerException("Action name is null");
+
+ try {
+ Session session = ((HibernatePersistenceStrategy)this.strategy).getSession();
+ Criteria criteria = session.createCriteria(WeblogTemplate.class);
+ criteria.add(Expression.eq("website", website));
+ criteria.add(Expression.eq("action", action));
+
+ return (WeblogTemplate) criteria.uniqueResult();
+ } catch (HibernateException e) {
+ throw new RollerException(e);
+ }
+ }
+
/**
* @see org.apache.roller.model.UserManager#getPageByName(WebsiteData, java.lang.String)
Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAUserManagerImpl.java Tue Apr 3 13:07:41 2007
@@ -293,6 +293,9 @@
public void removePage(WeblogTemplate page) throws RollerException {
this.strategy.remove(page);
+
+ // update weblog last modified date. date updated by saveWebsite()
+ RollerFactory.getRoller().getUserManager().saveWebsite(page.getWebsite());
}
public void addUser(UserData newUser) throws RollerException {
@@ -876,6 +879,29 @@
} catch (NoResultException e) {
return null;
}
+ }
+
+ /**
+ * @see org.apache.roller.model.UserManager#getPageByAction(WebsiteData, java.lang.String)
+ */
+ public WeblogTemplate getPageByAction(WebsiteData website, String action)
+ throws RollerException {
+
+ if (website == null)
+ throw new RollerException("website is null");
+
+ if (action == null)
+ throw new RollerException("Action name is null");
+
+
+ Query query = strategy.getNamedQuery("WeblogTemplate.getByAction");
+ query.setParameter(1, website);
+ query.setParameter(2, action);
+ try {
+ return (WeblogTemplate)query.getSingleResult();
+ } catch (NoResultException e) {
+ return null;
+ }
}
/**
Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/runnable/ScheduledEntriesTask.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/runnable/ScheduledEntriesTask.java?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/runnable/ScheduledEntriesTask.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/runnable/ScheduledEntriesTask.java Tue Apr 3 13:07:41 2007
@@ -130,9 +130,20 @@
log.debug("looking up scheduled entries older than "+now);
// get all published entries older than current time
- List scheduledEntries = wMgr.getWeblogEntries(null, null, null, now, null, null,
- null, WeblogEntryData.SCHEDULED, null, null, null, 0, -1);
-
+ List scheduledEntries = wMgr.getWeblogEntries(
+ null, // website
+ null, // user
+ null, // startDate
+ now, // endDate
+ null, // catName
+ null, // tags
+ WeblogEntryData.SCHEDULED, // status
+ null, // text
+ null, // sortBy
+ null, // sortOrder
+ null, // locale
+ 0, -1); // offset, length
+
log.debug("promoting "+scheduledEntries.size()+" entries to PUBLISHED state");
WeblogEntryData entry = null;
Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/config/RollerRuntimeConfig.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/config/RollerRuntimeConfig.java?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/config/RollerRuntimeConfig.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/config/RollerRuntimeConfig.java Tue Apr 3 13:07:41 2007
@@ -21,13 +21,13 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
-import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.config.runtime.RuntimeConfigDefs;
import org.apache.roller.config.runtime.RuntimeConfigDefsParser;
import org.apache.roller.business.PropertiesManager;
import org.apache.roller.business.RollerFactory;
+import org.apache.roller.pojos.RollerPropertyData;
/**
@@ -64,7 +64,10 @@
try {
PropertiesManager pmgr = RollerFactory.getRoller().getPropertiesManager();
- value = pmgr.getProperty(name).getValue();
+ RollerPropertyData prop = pmgr.getProperty(name);
+ if(prop != null) {
+ value = prop.getValue();
+ }
} catch(Exception e) {
log.warn("Trouble accessing property: "+name, e);
}
Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/StaticTemplate.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/StaticTemplate.java?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/StaticTemplate.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/StaticTemplate.java Tue Apr 3 13:07:41 2007
@@ -32,6 +32,7 @@
public class StaticTemplate implements Template, Serializable {
private String id = null;
+ private String action = null;
private String name = null;
private String description = null;
private String contents = null;
@@ -140,4 +141,12 @@
public void setOutputContentType(String outputContentType) {
this.outputContentType = outputContentType;
}
+
+ public String getAction() {
+ return action;
+ }
+
+ public void setAction(String action) {
+ this.action = action;
+ }
}
Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/Template.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/Template.java?view=diff&rev=525260&r1=525259&r2=525260
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/Template.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/Template.java Tue Apr 3 13:07:41 2007
@@ -29,12 +29,33 @@
*/
public interface Template {
+ public static final String ACTION_WEBLOG = "weblog";
+ public static final String ACTION_PERMALINK = "permalink";
+ public static final String ACTION_SEARCH = "search";
+ public static final String ACTION_TAGSINDEX = "tagsIndex";
+ public static final String ACTION_CUSTOM = "custom";
+
+ // the full list of supported special actions, which purposely does not
+ // contain an entry for the 'custom' action
+ public static final String[] ACTIONS = {
+ ACTION_WEBLOG,
+ ACTION_PERMALINK,
+ ACTION_SEARCH,
+ ACTION_TAGSINDEX
+ };
+
+
/**
* The unique identifier for this Template.
*
* @roller.wrapPojoMethod type="simple"
*/
public String getId();
+
+ /**
+ * The action this template is defined for.
+ */
+ public String getAction();
/**
* A simple name for this Template.