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/08 00:09:52 UTC
svn commit: r526492 [1/4] - in
/incubator/roller/branches/roller_4.0_newbackend: ./ apps/planet/
apps/planet/src/java/org/apache/roller/planet/business/
apps/planet/src/java/org/apache/roller/planet/business/datamapper/
apps/planet/src/java/org/apache/...
Author: snoopdave
Date: Sat Apr 7 15:09:45 2007
New Revision: 526492
URL: http://svn.apache.org/viewvc?view=rev&rev=526492
Log:
Merging latest from trunk
Added:
incubator/roller/branches/roller_4.0_newbackend/apps/planet/velocity.log
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/SharedTheme.java
- copied unchanged from r526464, incubator/roller/trunk/src/org/apache/roller/business/themes/SharedTheme.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/SharedThemeFromDir.java
- copied unchanged from r526464, incubator/roller/trunk/src/org/apache/roller/business/themes/SharedThemeFromDir.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/SharedThemeResourceFromDir.java
- copied unchanged from r526464, incubator/roller/trunk/src/org/apache/roller/business/themes/SharedThemeResourceFromDir.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/SharedThemeTemplate.java
- copied unchanged from r526464, incubator/roller/trunk/src/org/apache/roller/business/themes/SharedThemeTemplate.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/WeblogCustomTheme.java
- copied unchanged from r526464, incubator/roller/trunk/src/org/apache/roller/business/themes/WeblogCustomTheme.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/WeblogSharedTheme.java
- copied unchanged from r526464, incubator/roller/trunk/src/org/apache/roller/business/themes/WeblogSharedTheme.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java
- copied unchanged from r526464, incubator/roller/trunk/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/Resource.java
- copied unchanged from r526464, incubator/roller/trunk/src/org/apache/roller/pojos/Resource.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/StaticThemeTemplate.java
- copied unchanged from r526464, incubator/roller/trunk/src/org/apache/roller/pojos/StaticThemeTemplate.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/ThemeResource.java
- copied unchanged from r526464, incubator/roller/trunk/src/org/apache/roller/pojos/ThemeResource.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WeblogTheme.java
- copied unchanged from r526464, incubator/roller/trunk/src/org/apache/roller/pojos/WeblogTheme.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/Categories.java
- copied unchanged from r526464, incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/Categories.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/Collection.java
- copied unchanged from r526464, incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/Collection.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/Workspace.java
- copied unchanged from r526464, incubator/roller/trunk/src/org/apache/roller/webservices/atomprotocol/Workspace.java
incubator/roller/branches/roller_4.0_newbackend/testdata/WEB-INF/security.xml
- copied unchanged from r526464, incubator/roller/trunk/testdata/WEB-INF/security.xml
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/MockAcegiUserDetailsService.java
- copied unchanged from r526464, incubator/roller/trunk/tests/org/apache/roller/ui/MockAcegiUserDetailsService.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/UITestSuite.java
- copied unchanged from r526464, incubator/roller/trunk/tests/org/apache/roller/ui/UITestSuite.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/util/UtilitiesTestSuite.java
- copied unchanged from r526464, incubator/roller/trunk/tests/org/apache/roller/util/UtilitiesTestSuite.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/webservices/WebServicesTestSuite.java
- copied unchanged from r526464, incubator/roller/trunk/tests/org/apache/roller/webservices/WebServicesTestSuite.java
incubator/roller/branches/roller_4.0_newbackend/tools/lib/velocity-1.5.jar
- copied unchanged from r526464, incubator/roller/trunk/tools/lib/velocity-1.5.jar
incubator/roller/branches/roller_4.0_newbackend/tools/xmlrpc-3.0/
- copied from r526464, incubator/roller/trunk/tools/xmlrpc-3.0/
incubator/roller/branches/roller_4.0_newbackend/tools/xmlrpc-3.0/lib/
- copied from r526464, incubator/roller/trunk/tools/xmlrpc-3.0/lib/
incubator/roller/branches/roller_4.0_newbackend/tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar
- copied unchanged from r526464, incubator/roller/trunk/tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar
incubator/roller/branches/roller_4.0_newbackend/tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar
- copied unchanged from r526464, incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar
incubator/roller/branches/roller_4.0_newbackend/tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar
- copied unchanged from r526464, incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar
incubator/roller/branches/roller_4.0_newbackend/tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar
- copied unchanged from r526464, incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/org/
- copied from r526464, incubator/roller/trunk/web/WEB-INF/classes/org/
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/org/apache/
- copied from r526464, incubator/roller/trunk/web/WEB-INF/classes/org/apache/
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/org/apache/xmlrpc/
- copied from r526464, incubator/roller/trunk/web/WEB-INF/classes/org/apache/xmlrpc/
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/org/apache/xmlrpc/webserver/
- copied from r526464, incubator/roller/trunk/web/WEB-INF/classes/org/apache/xmlrpc/webserver/
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/org/apache/xmlrpc/webserver/XmlRpcServlet.properties
- copied unchanged from r526464, incubator/roller/trunk/web/WEB-INF/classes/org/apache/xmlrpc/webserver/XmlRpcServlet.properties
Removed:
incubator/roller/branches/roller_4.0_newbackend/sandbox/standalone/custom-ba
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/ConfigManager.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateConfigManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/utils/ConsistencyCheck.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/tasks/RefreshEntriesTask.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/WeblogResource.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/CacheHttpServletResponseWrapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/RequestUtil.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/util/OldRollerConfig.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/xmlrpc/RollerXMLRPCServlet.java
incubator/roller/branches/roller_4.0_newbackend/tools/buildtime/mockrunner-0.3/
incubator/roller/branches/roller_4.0_newbackend/tools/buildtime/strutstest-2.0.0.jar
incubator/roller/branches/roller_4.0_newbackend/tools/buildtime/xercesImpl-2.3.0.jar
incubator/roller/branches/roller_4.0_newbackend/tools/buildtime/xmlParserAPIs-2.3.0.jar
incubator/roller/branches/roller_4.0_newbackend/tools/lib/velocity-1.4.jar
incubator/roller/branches/roller_4.0_newbackend/tools/lib/velocity-dep-1.4.jar
incubator/roller/branches/roller_4.0_newbackend/tools/lib/xmlrpc-1.2-b1.jar
incubator/roller/branches/roller_4.0_newbackend/tools/struts-1.2.4/lib/commons-lang-2.0.jar
incubator/roller/branches/roller_4.0_newbackend/tools/struts-1.2.4/lib/commons-logging.jar
incubator/roller/branches/roller_4.0_newbackend/tools/struts-2.0.5/lib/spring-aop-1.2.8.jar
incubator/roller/branches/roller_4.0_newbackend/tools/struts-2.0.5/lib/spring-beans-1.2.8.jar
incubator/roller/branches/roller_4.0_newbackend/tools/struts-2.0.5/lib/spring-context-1.2.8.jar
incubator/roller/branches/roller_4.0_newbackend/tools/struts-2.0.5/lib/spring-core-1.2.8.jar
incubator/roller/branches/roller_4.0_newbackend/tools/struts-2.0.5/lib/spring-web-1.2.8.jar
Modified:
incubator/roller/branches/roller_4.0_newbackend/apps/planet/build.xml
incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java
incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java
incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/jpa/JPAPlanetManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java
incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/struts.properties
incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp
incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp
incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp
incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp
incubator/roller/branches/roller_4.0_newbackend/build.xml
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/xdoclet/servlet-mappings.xml
incubator/roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlets.xml
incubator/roller/branches/roller_4.0_newbackend/nbproject/project.xml
incubator/roller/branches/roller_4.0_newbackend/properties.xmlf
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/FileManager.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/FileManagerImpl.java
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/datamapper/DatamapperPropertiesManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/datamapper/DatamapperRollerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernatePropertiesManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRollerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPAPropertiesManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/jpa/JPARollerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/pings/WeblogUpdatePinger.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/ThemeManager.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/ThemeManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/utils/PasswordUtility.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/utils/UpgradeDatabase.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetManagerImpl.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetGroupsAction.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/planet/ui/admin/struts/forms/PlanetSubscriptionForm.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/WeblogTemplate.java
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/wrapper/TemplateWrapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/pojos/wrapper/WebsiteDataWrapper.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts/actions/ImportEntriesAction.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/UploadFileFormAction.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/core/RollerRequest.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/PlanetModel.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/SiteModel.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/CommentsPager.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/pagers/WeblogEntriesListPager.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.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/PlanetFeedServlet.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/RSDServlet.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/cache/PlanetCache.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/util/cache/WeblogCacheWarmupJob.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/VelocityRenderer.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/OldWeblogPageModel.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/util/URLUtilities.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomHandler.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomService.java
incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomServlet.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/BloggerAPIHandler.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/business/FileManagerTest.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/business/PlanetManagerLocalTest.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/ui/ServletTestBase.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/StrutsActionTestBase.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/UIPluginManagerTest.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/authoring/struts/actions/BookmarksActionTest.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/authoring/struts/actions/WeblogEntryActionTest.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/ui/rendering/plugins/SmileysTest.java
incubator/roller/branches/roller_4.0_newbackend/tests/org/apache/roller/webservices/xmlrpc/RollerXmlRpcServerTest.java
incubator/roller/branches/roller_4.0_newbackend/tools/roller-planet/roller-planet-business.jar
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/commons-logging.properties
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/admin/PlanetConfig.jsp
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/edit-pages.jsp
incubator/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/theme-editor.jsp
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/build.xml?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/build.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/build.xml Sat Apr 7 15:09:45 2007
@@ -87,8 +87,7 @@
<include name="lib/jdom.jar"/>
<!-- Velocity -->
- <include name="lib/velocity-1.4.jar"/>
- <include name="lib/velocity-dep-1.4.jar"/>
+ <include name="lib/velocity-1.5.jar"/>
</fileset>
<fileset id="web.tools" dir="${tools}">
@@ -100,6 +99,9 @@
<!-- Struts 2 -->
<include name="struts-2.0.5/lib/*.jar"/>
+
+ <!-- Struts 2 depends on Spring -->
+ <include name="spring-1.2/spring.jar"/>
</fileset>
<path id="planet.business.path">
@@ -132,7 +134,6 @@
<include name="*.jar"/>
</fileset>
<pathelement location="${tools}/buildtime/ant-1.6.2/ant.jar"/>
- <pathelement location="${tools}/buildtime/strutstest-2.0.0.jar"/>
<pathelement location="${tools}/buildtime/junit-3.8.1.jar"/>
<pathelement location="${tools}/buildtime/derby.jar"/>
<pathelement location="${tools}/buildtime/derbyclient.jar"/>
@@ -327,9 +328,14 @@
<mkdir dir="${build.dbscripts}/oracle" />
<mkdir dir="${build.dbscripts}/postgresql" />
+ <path id="texen.path">
+ <fileset refid="business.tools" />
+ <pathelement location="${root}/metadata/database/" />
+ <pathelement location="${sql}" />
+ </path>
<taskdef name="texen"
classname="org.apache.velocity.texen.ant.TexenTask"
- classpath="${tools}/lib/velocity-dep-1.4.jar:${root}/metadata/database/:${sql}" />
+ classpathref="texen.path" />
<texen
controlTemplate="control.vm"
@@ -470,6 +476,71 @@
<target name="nothing">
<!-- this task does nothing and is here so that
dynamic task definitions have a no-op choice -->
+ </target>
+
+ <!-- Netbeans-only: debug single class -->
+ <target name="debug-selected-files" if="netbeans.home" depends="build-tests"
+ description="Debug a Single File">
+ <fail unless="classname">Must set property 'classname'</fail>
+ <antcall target="start-db" />
+ <antcall target="init-db" />
+ <nbjpdastart name="${classname}" addressproperty="jpda.address" transport="dt_socket">
+ <classpath>
+ <path refid="test.path"/>
+ <pathelement location="${build.compile.test}"/>
+ <pathelement location="${basedir}/testdata" />
+ <pathelement path="${test.db.cpath}" />
+ </classpath>
+ </nbjpdastart>
+ <java classname="${classname}" fork="true" dir="${build.test}">
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/>
+ <jvmarg value="-Djava.compiler=none"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+ <jvmarg value="-Dcatalina.base=${build.test}"/>
+ <jvmarg value="-Dbuild=${build}"/>
+ <jvmarg value="-Droller.custom.config=${build.tests}/planet-custom.properties"/>
+ <classpath>
+ <path refid="test.path"/>
+ <pathelement location="${build.compile.test}"/>
+ <pathelement location="${basedir}/testdata" />
+ <pathelement path="${test.db.cpath}" />
+ </classpath>
+ </java>
+ <antcall target="stop-db" />
+ </target>
+
+ <!-- Netbeans-only: debug single test class -->
+ <target name="test-selected-files" if="netbeans.home" depends="build-tests"
+ description="Test/debug a Single File">
+ <fail unless="classname">Must set property 'classname'</fail>
+ <antcall target="start-db" />
+ <antcall target="init-db" />
+ <nbjpdastart name="junit.textui.TestRunner" addressproperty="jpda.address" transport="dt_socket">
+ <classpath>
+ <path refid="test.path"/>
+ <pathelement location="${build.compile.test}"/>
+ <pathelement location="${basedir}/testdata" />
+ <pathelement path="${test.db.cpath}" />
+ </classpath>
+ </nbjpdastart>
+ <java classname="junit.textui.TestRunner" fork="true" dir="${build.test}">
+ <arg value="${classname}" />
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/>
+ <jvmarg value="-Djava.compiler=none"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+ <jvmarg value="-Dcatalina.base=${build.test}"/>
+ <jvmarg value="-Dbuild=${build}"/>
+ <jvmarg value="-Droller.custom.config=${build.tests}/planet-custom.properties"/>
+ <classpath>
+ <path refid="test.path"/>
+ <pathelement location="${build.compile.test}"/>
+ <pathelement location="${basedir}/testdata" />
+ <pathelement path="${test.db.cpath}" />
+ </classpath>
+ </java>
+ <antcall target="stop-db" />
</target>
</project>
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java Sat Apr 7 15:09:45 2007
@@ -157,28 +157,26 @@
/**
* Get Entries for a Group in reverse chonological order.
*
- * @param group Restrict to entries from one group.
+ * @param groups Restrict to entries from these groups (list of PlanetGroupData objects)
* @param offset Offset into results (for paging)
- * @param len Maximum number of results to return (for paging)
+ * @param len Maximum number of results to return (for paging)
*/
public List getEntries(PlanetGroupData group, int offset, int len)
throws RollerException;
-
-
+
/**
* Get Entries for a Group in reverse chonological order, optionally
* constrained to a certain timeframe.
*
- * @param group Restrict to entries from one group.
+ * @param groups Restrict to entries from these groups (list of PlanetGroupData objects)
* @param startDate The oldest date for entries to include.
- * @param endDate The newest date for entries to include.
- * @param offset Offset into results (for paging)
- * @param len Maximum number of results to return (for paging)
+ * @param endDate The newest date for entries to include.
+ * @param offset Offset into results (for paging)
+ * @param len Maximum number of results to return (for paging)
*/
- public List getEntries(PlanetGroupData group,
+ public List getEntries(List groups,
Date startDate,
Date endDate,
int offset,
- int len) throws RollerException;
-
+ int len) throws RollerException;
}
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java Sat Apr 7 15:09:45 2007
@@ -43,11 +43,11 @@
/**
- * A FeedFetcher based on the 'Rome' subscription parsing library.
+ * A FeedFetcher based on the ROME RSS/Atom feed parser (http://rome.dev.java.net).
*/
public class RomeFeedFetcher implements FeedFetcher {
- private static Log log = LogFactory.getLog(HibernatePlanetManagerImpl.class);
+ private static Log log = LogFactory.getLog(RomeFeedFetcher.class);
public RomeFeedFetcher() {}
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/DatamapperPlanetManagerImpl.java Sat Apr 7 15:09:45 2007
@@ -18,6 +18,7 @@
package org.apache.roller.planet.business.datamapper;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -214,7 +215,7 @@
}
public List getEntries(PlanetGroupData group, int offset, int len) throws RollerException {
- return getEntries(group, null, null, offset, len);
+ return getEntries(Collections.singletonList(group), null, null, offset, len);
}
}
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/jpa/JPAPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/jpa/JPAPlanetManagerImpl.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/jpa/JPAPlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/datamapper/jpa/JPAPlanetManagerImpl.java Sat Apr 7 15:09:45 2007
@@ -42,11 +42,11 @@
super(strategy);
}
- public List getEntries(PlanetGroupData group, Date startDate, Date endDate, int offset, int len) throws RollerException {
+ public List getEntries(List groups, Date startDate, Date endDate, int offset, int len) throws RollerException {
StringBuffer queryString = new StringBuffer();
- if(group == null) {
- throw new RollerException("group cannot be null");
+ if(groups == null || groups.size() == 0) {
+ throw new RollerException("groups cannot be null or empty");
}
List ret = null;
@@ -58,8 +58,16 @@
int size = 0;
sb.append("SELECT e FROM PlanetEntryData e ");
sb.append("JOIN e.subscription.groups g ");
- params.add(size++, group);
- sb.append("WHERE g = ?").append(size);
+
+ sb.append("WHERE (");
+ for (int i=0; i<groups.size(); i++) {
+ if (i > 0) sb.append(" AND ");
+ PlanetGroupData group = (PlanetGroupData)groups.get(i);
+ params.add(size++, group);
+ sb.append(" g = ?").append(size);
+ }
+ sb.append(")");
+
if (startDate != null) {
params.add(size++, startDate);
sb.append("AND e.pubTime > ?").append(size);
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java Sat Apr 7 15:09:45 2007
@@ -309,20 +309,23 @@
}
- // lookup Entries from a specific Group
+ // Lookup Entries from a specific group
public List getEntries(PlanetGroupData group, int offset, int len)
throws RollerException {
- return getEntries(group, null, null, offset, len);
+ return getEntries(Collections.singletonList(group), null, null, offset, len);
}
-
- // lookup Entries from a specific Group
- public List getEntries(PlanetGroupData group, Date startDate,
+ // Lookup Entries from a specific list of groups
+ public List getEntries(List groups, Date startDate,
Date endDate, int offset, int length)
throws RollerException {
- if(group == null) {
- throw new RollerException("group cannot be null");
+ if (groups == null) {
+ throw new RollerException("groups cannot be null");
+ }
+
+ if (groups.size() == 0) {
+ throw new RollerException("groups cannot be empty");
}
List ret = null;
@@ -334,7 +337,14 @@
StringBuffer sb = new StringBuffer();
sb.append("select e from PlanetEntryData e ");
sb.append("join e.subscription.groups g ");
- sb.append("where g=:group ");
+
+ sb.append("where (");
+ for (int i=0; i<groups.size(); i++) {
+ if (i > 0) sb.append(" and ");
+ sb.append(" g=:group" + i);
+ }
+ sb.append(")");
+
if (startDate != null) {
sb.append("and e.pubTime > :startDate ");
}
@@ -344,7 +354,10 @@
sb.append("order by e.pubTime desc");
Query query = session.createQuery(sb.toString());
- query.setParameter("group", group);
+ for (int i=0; i<groups.size(); i++) {
+ PlanetGroupData group = (PlanetGroupData)groups.get(i);
+ query.setParameter("group" + i, group);
+ }
if(offset > 0) {
query.setFirstResult(offset);
}
@@ -359,27 +372,6 @@
}
ret = query.list();
-
- // old logic used when group was null, this is hacky and weird!
-// else {
-// StringBuffer sb = new StringBuffer();
-// sb.append("select e from org.apache.roller.planet.pojos.PlanetEntryData e ");
-// sb.append("join e.subscription.groups g ");
-// sb.append("where (g.handle='external' or g.handle='all') ");
-// sb.append("and e.pubTime < :endDate ");
-// if (startDate != null) {
-// sb.append("and e.pubTime > :startDate ");
-// }
-// sb.append("order by e.pubTime desc");
-// Query query = session.createQuery(sb.toString());
-// query.setFirstResult(offset);
-// if (length != -1) query.setMaxResults(length);
-// query.setParameter("endDate", endDate);
-// if (startDate != null) {
-// query.setParameter("startDate", startDate);
-// }
-// ret = query.list();
-// }
long endTime = System.currentTimeMillis();
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/jpa/JPAPlanetManagerImpl.java Sat Apr 7 15:09:45 2007
@@ -31,6 +31,7 @@
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -270,14 +271,14 @@
}
public List getEntries(PlanetGroupData group, int offset, int len) throws RollerException {
- return getEntries(group, null, null, offset, len);
+ return getEntries(Collections.singletonList(group), null, null, offset, len);
}
- public List getEntries(PlanetGroupData group, Date startDate, Date endDate, int offset, int len) throws RollerException {
+ public List getEntries(List groups, Date startDate, Date endDate, int offset, int len) throws RollerException {
StringBuffer queryString = new StringBuffer();
- if(group == null) {
- throw new RollerException("group cannot be null");
+ if(groups == null || groups.size() == 0) {
+ throw new RollerException("groups cannot be null or empty");
}
List ret = null;
@@ -289,8 +290,16 @@
int size = 0;
sb.append("SELECT e FROM PlanetEntryData e ");
sb.append("JOIN e.subscription.groups g ");
- params.add(size++, group.getHandle());
- sb.append("WHERE g.handle = ?").append(size);
+
+ sb.append("WHERE (");
+ for (int i=0; i<groups.size(); i++) {
+ if (i > 0) sb.append(" AND ");
+ PlanetGroupData group = (PlanetGroupData)groups.get(i);
+ params.add(size++, group.getHandle());
+ sb.append(" g.handle = ?").append(size);
+ }
+ sb.append(")");
+
if (startDate != null) {
params.add(size++, startDate);
sb.append(" AND e.pubTime > ?").append(size);
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java Sat Apr 7 15:09:45 2007
@@ -105,7 +105,7 @@
}
/**
- * @hibernate.set lazy="true" invert="true" cascade="all" sort="natural"
+ * @hibernate.set lazy="true" inverse="true" cascade="all" sort="natural"
* @hibernate.collection-key column="planet_id"
* @hibernate.collection-one-to-many class="org.apache.roller.planet.pojos.PlanetGroupData"
*/
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java Sat Apr 7 15:09:45 2007
@@ -99,7 +99,7 @@
rawEntries = planetManager.getEntries(sub, offset, length+1);
}
} else if (group != null) {
- rawEntries = planetManager.getEntries(group, startDate, null, offset, length+1);
+ rawEntries = planetManager.getEntries(Collections.singletonList(group), startDate, null, offset, length+1);
} else {
//rawEntries = planetManager.getEntries(startDate, null, offset, length+1);
rawEntries = Collections.EMPTY_LIST;
Added: incubator/roller/branches/roller_4.0_newbackend/apps/planet/velocity.log
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/velocity.log?view=auto&rev=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/velocity.log (added)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/velocity.log Sat Apr 7 15:09:45 2007
@@ -0,0 +1,119 @@
+Fri Mar 16 16:11:49 EDT 2007 [debug] AvalonLogSystem initialized using logfile 'velocity.log'
+Fri Mar 16 16:11:49 EDT 2007 [info] **************************************************************
+Fri Mar 16 16:11:49 EDT 2007 [info] Starting Jakarta Velocity v1.4
+Fri Mar 16 16:11:49 EDT 2007 [info] RuntimeInstance initializing.
+Fri Mar 16 16:11:49 EDT 2007 [info] Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
+Fri Mar 16 16:11:49 EDT 2007 [info] Trying to use logger class org.apache.velocity.runtime.log.AvalonLogSystem
+Fri Mar 16 16:11:49 EDT 2007 [info] Using logger class org.apache.velocity.runtime.log.AvalonLogSystem
+Fri Mar 16 16:11:49 EDT 2007 [info] Default ResourceManager initializing. (class org.apache.velocity.runtime.resource.ResourceManagerImpl)
+Fri Mar 16 16:11:49 EDT 2007 [info] Resource Loader Instantiated: org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Fri Mar 16 16:11:49 EDT 2007 [info] ClasspathResourceLoader : initialization starting.
+Fri Mar 16 16:11:49 EDT 2007 [info] ClasspathResourceLoader : initialization complete.
+Fri Mar 16 16:11:49 EDT 2007 [info] ResourceCache : initialized. (class org.apache.velocity.runtime.resource.ResourceCacheImpl)
+Fri Mar 16 16:11:49 EDT 2007 [info] Default ResourceManager initialization complete.
+Fri Mar 16 16:11:49 EDT 2007 [info] Loaded System Directive: org.apache.velocity.runtime.directive.Literal
+Fri Mar 16 16:11:49 EDT 2007 [info] Loaded System Directive: org.apache.velocity.runtime.directive.Macro
+Fri Mar 16 16:11:49 EDT 2007 [info] Loaded System Directive: org.apache.velocity.runtime.directive.Parse
+Fri Mar 16 16:11:49 EDT 2007 [info] Loaded System Directive: org.apache.velocity.runtime.directive.Include
+Fri Mar 16 16:11:49 EDT 2007 [info] Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
+Fri Mar 16 16:11:49 EDT 2007 [info] Created: 20 parsers.
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocimacro : initialization starting.
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocimacro : adding VMs from VM library template : VM_global_library.vm
+Fri Mar 16 16:11:49 EDT 2007 [error] ResourceManager : unable to find resource 'VM_global_library.vm' in any resource loader.
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocimacro : error using VM library template VM_global_library.vm : org.apache.velocity.exception.ResourceNotFoundException: Unable to find resource 'VM_global_library.vm'
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocimacro : VM library template macro registration complete.
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocimacro : allowInline = true : VMs can be defined inline in templates
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocimacro : messages on : VM system will output logging messages
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocimacro : autoload off : VM system will not automatically reload global library macros
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocimacro : initialization complete.
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocity successfully started.
+Fri Mar 16 16:11:49 EDT 2007 [info] ResourceManager : found control.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocimacro : added new VM : #addColumnNull( table column type ) : source = macros.vm
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocimacro : added new VM : #addColumnNotNull( table column type default ) : source = macros.vm
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocimacro : added new VM : #dropNotNullFromTableId( table ) : source = macros.vm
+Fri Mar 16 16:11:49 EDT 2007 [info] Velocimacro : added new VM : #longtext( size ) : source = macros.vm
+Fri Mar 16 16:11:49 EDT 2007 [info] ResourceManager : found macros.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Fri Mar 16 16:11:49 EDT 2007 [info] ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Fri Mar 16 16:11:49 EDT 2007 [info] ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Fri Mar 16 16:11:49 EDT 2007 [info] ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Fri Mar 16 16:11:49 EDT 2007 [info] ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Fri Mar 16 16:11:49 EDT 2007 [info] ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Fri Mar 16 16:11:49 EDT 2007 [info] ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Fri Mar 16 16:11:49 EDT 2007 [info] ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2007-04-07 15:33:53,384 - Log4JLogChute initialized using file 'velocity.log'
+2007-04-07 15:33:53,426 - The version of log4j being used does not support the "trace" level.
+2007-04-07 15:33:53,426 - *******************************************************************
+2007-04-07 15:33:53,426 - Starting Apache Velocity v1.5 (compiled: 2007-02-22 08:52:29)
+2007-04-07 15:33:53,426 - RuntimeInstance initializing.
+2007-04-07 15:33:53,426 - Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
+2007-04-07 15:33:53,426 - Trying to use logger class org.apache.velocity.runtime.log.AvalonLogChute
+2007-04-07 15:33:53,429 - Couldn't find class org.apache.velocity.runtime.log.AvalonLogChute or necessary supporting classes in classpath.
+java.lang.NoClassDefFoundError: org/apache/log/format/Formatter
+ at java.lang.Class.forName0(Native Method)
+ at java.lang.Class.forName(Class.java:164)
+ at org.apache.velocity.util.ClassUtils.getClass(ClassUtils.java:76)
+ at org.apache.velocity.util.ClassUtils.getNewInstance(ClassUtils.java:95)
+ at org.apache.velocity.runtime.log.LogManager.createLogChute(LogManager.java:147)
+ at org.apache.velocity.runtime.log.LogManager.updateLog(LogManager.java:208)
+ at org.apache.velocity.runtime.RuntimeInstance.initializeLog(RuntimeInstance.java:728)
+ at org.apache.velocity.runtime.RuntimeInstance.init(RuntimeInstance.java:240)
+ at org.apache.velocity.app.VelocityEngine.init(VelocityEngine.java:116)
+ at org.apache.velocity.texen.ant.TexenTask.execute(TexenTask.java:483)
+ at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:275)
+ at org.apache.tools.ant.Task.perform(Task.java:364)
+ at org.apache.tools.ant.Target.execute(Target.java:341)
+ at org.apache.tools.ant.Target.performTasks(Target.java:369)
+ at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1216)
+ at org.apache.tools.ant.helper.SingleCheckExecutor.executeTargets(SingleCheckExecutor.java:37)
+ at org.apache.tools.ant.Project.executeTargets(Project.java:1068)
+ at org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:382)
+ at org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:107)
+ at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:275)
+ at org.apache.tools.ant.Task.perform(Task.java:364)
+ at org.apache.tools.ant.Target.execute(Target.java:341)
+ at org.apache.tools.ant.Target.performTasks(Target.java:369)
+ at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1216)
+ at org.apache.tools.ant.Project.executeTarget(Project.java:1185)
+ at org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:40)
+ at org.apache.tools.ant.Project.executeTargets(Project.java:1068)
+ at org.apache.tools.ant.Main.runBuild(Main.java:668)
+ at org.apache.tools.ant.Main.startAnt(Main.java:187)
+ at org.apache.tools.ant.launch.Launcher.run(Launcher.java:246)
+ at org.apache.tools.ant.launch.Launcher.main(Launcher.java:67)
+2007-04-07 15:33:53,431 - Trying to use logger class org.apache.velocity.runtime.log.Log4JLogChute
+2007-04-07 15:33:53,660 - Using logger class org.apache.velocity.runtime.log.Log4JLogChute
+2007-04-07 15:33:53,664 - Default ResourceManager initializing. (class org.apache.velocity.runtime.resource.ResourceManagerImpl)
+2007-04-07 15:33:53,669 - ResourceLoader instantiated: org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2007-04-07 15:33:53,671 - ClasspathResourceLoader : initialization complete.
+2007-04-07 15:33:53,690 - ResourceCache: initialized (class org.apache.velocity.runtime.resource.ResourceCacheImpl)
+2007-04-07 15:33:53,690 - Default ResourceManager initialization complete.
+2007-04-07 15:33:53,692 - Loaded System Directive: org.apache.velocity.runtime.directive.Literal
+2007-04-07 15:33:53,694 - Loaded System Directive: org.apache.velocity.runtime.directive.Macro
+2007-04-07 15:33:53,696 - Loaded System Directive: org.apache.velocity.runtime.directive.Parse
+2007-04-07 15:33:53,700 - Loaded System Directive: org.apache.velocity.runtime.directive.Include
+2007-04-07 15:33:53,702 - Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
+2007-04-07 15:33:53,748 - Created '20' parsers.
+2007-04-07 15:33:53,761 - Velocimacro : initialization starting.
+2007-04-07 15:33:53,761 - Velocimacro : "velocimacro.library" is not set. Trying default library: VM_global_library.vm
+2007-04-07 15:33:53,762 - Velocimacro : Default library not found.
+2007-04-07 15:33:53,762 - Velocimacro : allowInline = true : VMs can be defined inline in templates
+2007-04-07 15:33:53,762 - Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
+2007-04-07 15:33:53,762 - Velocimacro : allowInlineLocal = false : VMs defined inline will be global in scope if allowed.
+2007-04-07 15:33:53,762 - Velocimacro : autoload off : VM system will not automatically reload global library macros
+2007-04-07 15:33:53,762 - Velocimacro : Velocimacro : initialization complete.
+2007-04-07 15:33:53,762 - RuntimeInstance successfully initialized.
+2007-04-07 15:33:54,069 - ResourceManager : found control.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2007-04-07 15:33:54,081 - Velocimacro : added #addColumnNull( table column type ) : source = macros.vm
+2007-04-07 15:33:54,089 - Velocimacro : added #addColumnNotNull( table column type default ) : source = macros.vm
+2007-04-07 15:33:54,091 - Velocimacro : added #dropNotNullFromTableId( table ) : source = macros.vm
+2007-04-07 15:33:54,092 - Velocimacro : added #longtext( size ) : source = macros.vm
+2007-04-07 15:33:54,093 - ResourceManager : found macros.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2007-04-07 15:33:54,162 - ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2007-04-07 15:33:54,173 - ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2007-04-07 15:33:54,181 - ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2007-04-07 15:33:54,196 - ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2007-04-07 15:33:54,201 - ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2007-04-07 15:33:54,205 - ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+2007-04-07 15:33:54,211 - ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/struts.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/struts.properties?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/struts.properties (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/struts.properties Sat Apr 7 15:09:45 2007
@@ -1,9 +1,9 @@
struts.objectFactory = spring
-struts.devMode = false
+struts.devMode = true
-struts.enable.DynamicMethodInvocation = false
+struts.enable.DynamicMethodInvocation = true
# prevent the damn s:url calls from including undesired query params by default
struts.url.includeParams=none
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp Sat Apr 7 15:09:45 2007
@@ -44,8 +44,7 @@
<%-- show a status message if needed --%>
<%@include file="/WEB-INF/jsps/admin/statusMessage.jsp" %>
- <s:url id="action" action="ConfigForm" method="save" />
- <s:form name="ConfigForm" action="%{action}">
+ <s:form name="ConfigForm" action="ConfigForm!save">
<table class="formtableNoDesc">
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp Sat Apr 7 15:09:45 2007
@@ -45,8 +45,7 @@
<p><a href='<s:url action="PlanetsList" includeParams="get" />'><s:text name="PlanetForm.returnToList"/></a></p>
- <s:url id="action" action="PlanetForm" method="save" />
- <s:form name="PlanetForm" action="%{action}">
+ <s:form name="PlanetForm" action="PlanetForm!save">
<s:hidden name="planetid" />
<s:textfield label="%{getText('PlanetForm.handle')}" name="planet.handle" size="40" />
<s:textfield label="%{getText('PlanetForm.title')}" name="planet.title" size="40" />
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp Sat Apr 7 15:09:45 2007
@@ -48,8 +48,7 @@
</s:url>
<p><s:a href="%{planetformurl}"><s:text name="PlanetGroupForm.returnToPlanet"/></s:a></p>
- <s:url id="action" action="PlanetGroupForm" method="save" />
- <s:form name="PlanetGroupForm" action="%{action}">
+ <s:form name="PlanetGroupForm" action="PlanetGroupForm!save">
<s:hidden name="planetid" value="%{group.planet.id}" />
<s:hidden name="groupid" value="%{group.id}" />
<s:textfield label="%{getText('PlanetGroupForm.handle')}" name="group.handle" size="40" />
Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp Sat Apr 7 15:09:45 2007
@@ -42,7 +42,7 @@
<p><s:a href="%{groupformurl}"><s:text name="PlanetSubscriptionForm.returnToGroup"/></s:a></p>
<s:url id="action" action="PlanetSubscriptionForm" method="save" />
- <s:form name="PlanetSubscriptionForm" action="%{action}">
+ <s:form name="PlanetSubscriptionForm" action="PlanetSubscriptionForm!save">
<s:hidden name="groupid" />
<s:hidden name="subid" value="%{subscription.id}" />
<s:textfield label="%{getText('PlanetSubscriptionForm.title')}" name="subscription.title" size="40" />
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=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/build.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/build.xml Sat Apr 7 15:09:45 2007
@@ -450,6 +450,7 @@
<fileset refid="struts2.jars" />
<fileset refid="spring.jars" />
<fileset refid="jstl.jars" />
+ <fileset refid="xmlrpc.jars" />
<fileset refid="roller-core.jars" />
<fileset refid="roller-planet.jars" />
@@ -513,9 +514,14 @@
<mkdir dir="${build.dbscripts}/oracle" />
<mkdir dir="${build.dbscripts}/postgresql" />
+ <path id="texen.path">
+ <fileset refid="base.jars" />
+ <pathelement location="${basedir}/metadata/database/" />
+ <pathelement location="${basedir}/metadata/database/tmpls/" />
+ </path>
<taskdef name="texen"
classname="org.apache.velocity.texen.ant.TexenTask"
- classpath="${ro.tools}/lib/velocity-dep-1.4.jar:${basedir}/metadata/database/:${basedir}/metadata/database/tmpls/" />
+ classpathref="texen.path" />
<texen
controlTemplate="control.vm"
@@ -868,7 +874,7 @@
</target>
-<target name="build-tests" depends="build-web, gen-dbscripts" description="Build unit tests">
+<target name="build-tests" depends="all" description="Build unit tests">
<mkdir dir="${build.tests}" />
<mkdir dir="${build.tests}/logs" />
@@ -906,6 +912,10 @@
<exclude name="jsps/**" />
</fileset>
</copy>
+ <mkdir dir="${build.tests}/themes" />
+ <copy todir="${build.tests}/themes">
+ <fileset dir="${basedir}/web/themes" />
+ </copy>
<!--
Copy custom testing files which will overwrite some config files
@@ -1001,20 +1011,19 @@
<formatter type="xml"/>
<batchtest toDir="${build.reports}/presentation/xml">
<fileset dir="${build.compile.tests}">
- <include name="org/apache/roller/ui/UIPluginManagerTest.class"/>
- <include name="org/apache/roller/ui/authoring/struts/actions/BookmarksActionTest.class"/>
- <include name="org/apache/roller/ui/authoring/struts/actions/WeblogEntryActionTest.class"/>
- <include name="org/apache/roller/webservices/xmlrpc/RollerXmlRpcServerTest.class"/>
- <include name="org/apache/roller/ui/rendering/velocity/plugins/smileys/SmileysTest.class"/>
+
+ <!-- UI tests, some require mock web container -->
+ <include name="org/apache/roller/ui/UITestSuite.class"/>
+
</fileset>
</batchtest>
</junit>
<junitreport todir="${build.reports}/presentation/xml">
- <fileset dir="${build.reports}/presentation/xml">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="noframes" toDir="${build.reports}/presentation/html"/>
+ <fileset dir="${build.reports}/presentation/xml">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="noframes" toDir="${build.reports}/presentation/html"/>
</junitreport>
<!-- allow for shutdown of test db -->
@@ -1031,9 +1040,12 @@
<junit fork="true" dir="${build.tests}" showOutput="true">
<batchtest toDir="${build.reports}/utils/xml">
- <fileset dir="${build.tests}/WEB-INF/classes">
- <include name="org/apache/roller/util/*Test.class"/>
- </fileset>
+ <fileset dir="${build.compile.tests}">
+
+ <!-- Utilitities that require no database or web container -->
+ <include name="org/apache/roller/util/UtilitiesTestSuite.class"/>
+
+ </fileset>
</batchtest>
<!-- needed to satisfy ref in log4j.properties -->
<jvmarg value="-Dcatalina.base=."/>
@@ -1052,59 +1064,59 @@
</target>
- <target name="test-rap" depends="test-rap-sdk, test-rap-handler"/>
+<target name="test-rap" depends="test-rap-sdk, test-rap-handler"/>
- <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>
- <propertyref builtin="commandline"/>
- </syspropertyset>
- <classpath>
- <path refid="tests.run.path"/>
- </classpath>
- <formatter type="xml"/>
- <batchtest toDir="${build.reports}/webservices/protocol/sdk/xml">
- <fileset dir="${build.tests}/WEB-INF/classes">
- <include name="org/apache/roller/webservices/protocol/sdk/*EntryTest.class"/>
- </fileset>
- </batchtest>
- </junit>
- <junitreport todir="${build.reports}/webservices/protocol/sdk/xml">
- <fileset dir="${build.reports}/webservices/protocol/sdk/xml">
- <include name="TEST-*.xml"/>
+<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>
+ <propertyref builtin="commandline"/>
+ </syspropertyset>
+ <classpath>
+ <path refid="tests.run.path"/>
+ </classpath>
+ <formatter type="xml"/>
+ <batchtest toDir="${build.reports}/webservices/protocol/sdk/xml">
+ <fileset dir="${build.tests}/WEB-INF/classes">
+ <include name="org/apache/roller/webservices/protocol/sdk/*EntryTest.class"/>
</fileset>
- <report format="noframes" toDir="${build.reports}/webservices/protocol/sdk/html"/>
- </junitreport>
- </target>
-
- <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>
- <propertyref builtin="commandline"/>
- </syspropertyset>
- <classpath>
- <path refid="tests.run.path"/>
- </classpath>
- <formatter type="xml"/>
- <batchtest toDir="${build.reports}/webservices/protocol/xml">
- <fileset dir="${build.tests}/WEB-INF/classes">
- <include name="org/apache/roller/webservices/protocol/*HandlerTest.class"/>
- </fileset>
- </batchtest>
- </junit>
- <junitreport todir="${build.reports}/webservices/protocol/xml">
- <fileset dir="${build.reports}/webservices/protocol/xml">
- <include name="TEST-*.xml"/>
+ </batchtest>
+ </junit>
+ <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/protocol/sdk/html"/>
+ </junitreport>
+</target>
+
+<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>
+ <propertyref builtin="commandline"/>
+ </syspropertyset>
+ <classpath>
+ <path refid="tests.run.path"/>
+ </classpath>
+ <formatter type="xml"/>
+ <batchtest toDir="${build.reports}/webservices/protocol/xml">
+ <fileset dir="${build.tests}/WEB-INF/classes">
+ <include name="org/apache/roller/webservices/protocol/*HandlerTest.class"/>
</fileset>
- <report format="noframes" toDir="${build.reports}/webservices/protocol/html"/>
- </junitreport>
- </target>
+ </batchtest>
+ </junit>
+ <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/protocol/html"/>
+ </junitreport>
+</target>
<!-- You can specify testClass using -DtestClass=foo -->
<property name="testClass" value="org.apache.roller.business.TaskLockTest"/>
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=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/merges.txt (original)
+++ incubator/roller/branches/roller_4.0_newbackend/merges.txt Sat Apr 7 15:09:45 2007
@@ -3,6 +3,9 @@
Temporary file to track merges from trunk into the roller_4.0_newbackend branch.
+April 7, 2007: merging latest from trunk
+svn merge -r 525301:526464 https://svn.apache.org/repos/asf/incubator/roller/trunk
+
April 3, 2007: merging latest from trunk
svn merge -r 525008:525301 https://svn.apache.org/repos/asf/incubator/roller/trunk
svn merge -r 520487:525007 https://svn.apache.org/repos/asf/incubator/roller/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=526492&r1=526491&r2=526492
==============================================================================
--- 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 Sat Apr 7 15:09:45 2007
@@ -4,8 +4,21 @@
DON'T RUN THIS, IT'S NOT A DATABASE CREATION SCRIPT!!!
**#
+create table rag_planet (
+ id varchar(48) not null primary key,
+ handle varchar(32) not null,
+ title varchar(255) not null,
+ description varchar(255)
+);
+alter table rag_planet add constraint ragp_handle_uq unique ( handle );
+
+insert into rag_planet (id,title,handle) values ('default_planet','default_planet','default_planet');
+update rag_group set planet_id='default_planet';
+
+-- new column to support account activation by email
#addColumnNull("rolleruser" "activationcode" "varchar(48)")
+-- new column to allow setting of page template content-type
#addColumnNull("webpage" "outputtype" "varchar(48)")
-- add new action column to webpage table, default value is custom
Modified: incubator/roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlet-mappings.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlet-mappings.xml?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlet-mappings.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlet-mappings.xml Sat Apr 7 15:09:45 2007
@@ -3,3 +3,8 @@
<servlet-name>action</servlet-name>
<url-pattern>*.do</url-pattern>
</servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>XmlRpcServlet</servlet-name>
+ <url-pattern>/roller-services/xmlrpc</url-pattern>
+ </servlet-mapping>
Modified: incubator/roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlets.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlets.xml?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlets.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlets.xml Sat Apr 7 15:09:45 2007
@@ -1,20 +1,27 @@
<!-- The Struts Servlet -->
<servlet>
-
<servlet-name>action</servlet-name>
<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-
<init-param>
<param-name>config</param-name>
<param-value>/WEB-INF/struts-config.xml</param-value>
</init-param>
-
<init-param>
<param-name>validate</param-name>
<param-value>true</param-value>
</init-param>
-
<load-on-startup>2</load-on-startup>
-
</servlet>
+
+<servlet>
+ <servlet-name>XmlRpcServlet</servlet-name>
+ <servlet-class>org.apache.xmlrpc.webserver.XmlRpcServlet</servlet-class>
+ <init-param>
+ <param-name>enabledForExtensions</param-name>
+ <param-value>true</param-value>
+ <description>
+ Sets, whether the servlet supports vendor extensions for XML-RPC.
+ </description>
+ </init-param>
+</servlet>
\ No newline at end of file
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=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/nbproject/project.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/nbproject/project.xml Sat Apr 7 15:09:45 2007
@@ -7,24 +7,14 @@
<name>roller_4.0_newbackend</name>
<folders>
<source-folder>
- <label>src</label>
- <type>java</type>
- <location>src</location>
- </source-folder>
- <source-folder>
- <label>components/core/src/java</label>
- <type>java</type>
- <location>components/core/src/java</location>
- </source-folder>
- <source-folder>
- <label>build/generated/business</label>
- <type>java</type>
- <location>build/generated/business</location>
+ <label>web</label>
+ <type>doc_root</type>
+ <location>web</location>
</source-folder>
<source-folder>
- <label>build/generated/web</label>
+ <label>src</label>
<type>java</type>
- <location>build/generated/web</location>
+ <location>src</location>
</source-folder>
<source-folder>
<label>tests</label>
@@ -37,6 +27,11 @@
<location>apps/planet/src/java</location>
</source-folder>
<source-folder>
+ <label>components/core/src/java</label>
+ <type>java</type>
+ <location>components/core/src/java</location>
+ </source-folder>
+ <source-folder>
<label>sandbox/scripting/bsf/src</label>
<type>java</type>
<location>sandbox/scripting/bsf/src</location>
@@ -47,9 +42,14 @@
<location>sandbox/scripting/groovy/src</location>
</source-folder>
<source-folder>
- <label>web</label>
- <type>doc_root</type>
- <location>web</location>
+ <label>build/generated/business</label>
+ <type>java</type>
+ <location>build/generated/business</location>
+ </source-folder>
+ <source-folder>
+ <label>build/generated/web</label>
+ <type>java</type>
+ <location>build/generated/web</location>
</source-folder>
</folders>
<ide-actions>
@@ -111,18 +111,6 @@
<location>src</location>
</source-folder>
<source-folder style="packages">
- <label>components/core/src/java</label>
- <location>components/core/src/java</location>
- </source-folder>
- <source-folder style="packages">
- <label>build/generated/business</label>
- <location>build/generated/business</location>
- </source-folder>
- <source-folder style="packages">
- <label>build/generated/web</label>
- <location>build/generated/web</location>
- </source-folder>
- <source-folder style="packages">
<label>tests</label>
<location>tests</location>
</source-folder>
@@ -131,6 +119,10 @@
<location>apps/planet/src/java</location>
</source-folder>
<source-folder style="packages">
+ <label>components/core/src/java</label>
+ <location>components/core/src/java</location>
+ </source-folder>
+ <source-folder style="packages">
<label>sandbox/scripting/bsf/src</label>
<location>sandbox/scripting/bsf/src</location>
</source-folder>
@@ -138,6 +130,14 @@
<label>sandbox/scripting/groovy/src</label>
<location>sandbox/scripting/groovy/src</location>
</source-folder>
+ <source-folder style="packages">
+ <label>build/generated/business</label>
+ <location>build/generated/business</location>
+ </source-folder>
+ <source-folder style="packages">
+ <label>build/generated/web</label>
+ <location>build/generated/web</location>
+ </source-folder>
<source-file>
<location>build.xml</location>
</source-file>
@@ -165,8 +165,8 @@
<package-root>sandbox/jdobackend/src</package-root>
<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>
+ <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-digester.jar:tools/struts-1.2.4/lib/commons-fileupload.jar:tools/struts-1.2.4/lib/commons-validator.jar:tools/struts-1.2.4/lib/jakarta-oro.jar:tools/struts-1.2.4/lib/struts-el.jar:tools/struts-1.2.4/lib/struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:tools/standar
d-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/openjpa-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:tools/lib/com
mons-collections-3.2.jar:tools/lib/commons-lang-2.1.jar:tools/lib/commons-logging-1.0.4.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:tools/buildtime/mockrunner-0.35/lib/mockrunner.jar</classpath>
+ <source-level>1.5</source-level>
</compilation-unit>
</java-data>
<web-data xmlns="http://www.netbeans.org/ns/freeform-project-web/1">
Modified: incubator/roller/branches/roller_4.0_newbackend/properties.xmlf
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/properties.xmlf?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/properties.xmlf (original)
+++ incubator/roller/branches/roller_4.0_newbackend/properties.xmlf Sat Apr 7 15:09:45 2007
@@ -91,6 +91,9 @@
<include name="commons-cache.jar" />
<include name="commons-collections-3.2.jar" />
<include name="commons-codec-1.3.jar" />
+ <include name="commons-logging-1.0.4.jar" />
+ <include name="commons-lang-2.1.jar" />
+ <include name="commons-collections-3.1.jar" />
<include name="concurrent-1.3.2.jar"/>
<include name="jaxen-full.jar" />
<include name="saxpath.jar" />
@@ -99,9 +102,7 @@
<include name="log4j-1.2.11.jar"/>
<include name="rome-0.9.jar"/>
<include name="rome-fetcher-0.9.jar"/>
- <include name="velocity-1.4.jar"/>
- <include name="velocity-dep-1.4.jar"/>
- <include name="xmlrpc-1.2-b1.jar"/>
+ <include name="velocity-1.5.jar"/>
</fileset>
<fileset id="presentation.jars" dir="${ro.tools}/lib">
@@ -161,6 +162,13 @@
<include name="*.jar"/>
</fileset>
+<fileset id="xmlrpc.jars" dir="${ro.tools}/xmlrpc-3.0/lib">
+ <include name="ws-commons-util-1.0.1.jar"/>
+ <include name="xmlrpc-common-3.0.jar"/>
+ <include name="xmlrpc-client-3.0.jar"/>
+ <include name="xmlrpc-server-3.0.jar"/>
+</fileset>
+
<fileset id="roller-core.jars" dir="${ro.tools}/roller-core">
<include name="*.jar"/>
</fileset>
@@ -180,6 +188,7 @@
<fileset refid="commons.jars"/>
<fileset refid="roller-core.jars" />
<fileset refid="roller-planet.jars" />
+ <fileset refid="xmlrpc.jars"/>
<!-- JPA bytecode enhancement apparently wants JPA classes everywhere -->
<fileset refid="jpa.jars" />
</path>
@@ -228,11 +237,11 @@
</fileset>
<fileset refid="commons-httpclient.jar"/>
<pathelement location="${ro.tools}/buildtime/ant-1.6.2/ant.jar"/>
- <pathelement location="${ro.tools}/buildtime/strutstest-2.0.0.jar"/>
<pathelement location="${ro.tools}/buildtime/junit-3.8.1.jar"/>
<pathelement location="${ro.tools}/buildtime/derby.jar"/>
<pathelement location="${ro.tools}/buildtime/derbyclient.jar"/>
<pathelement location="${ro.tools}/buildtime/derbynet.jar"/>
+ <pathelement location="${ro.tools}/roller-planet/roller-planet-business.jar"/>
<!-- plus normal jars -->
<path refid="business.path"/>
Modified: incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/FileManager.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/FileManager.java?view=diff&rev=526492&r1=526491&r2=526492
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/FileManager.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/FileManager.java Sat Apr 7 15:09:45 2007
@@ -19,7 +19,7 @@
package org.apache.roller.business;
import java.io.InputStream;
-import org.apache.roller.pojos.WeblogResource;
+import org.apache.roller.pojos.ThemeResource;
import org.apache.roller.pojos.WebsiteData;
@@ -41,16 +41,16 @@
* @throws FileNotFoundException If path does not exist.
* @throws FilePathException If path is invalid, is a directory, or can't be read.
*
- * @return WeblogResource representing the real file resource.
+ * @return ThemeResource representing the real file resource.
*/
- public WeblogResource getFile(WebsiteData weblog, String path)
+ public ThemeResource getFile(WebsiteData weblog, String path)
throws FileNotFoundException, FilePathException;
/**
* Get list of files from a specific path of the weblog's uploads area.
*
- * This method will return a WeblogResource[] array of all files at the
+ * This method will return a ThemeResource[] array of all files at the
* given path if it exists, otherwise it will throw an exception.
*
* This method should return the files at the root of the weblog's uploads
@@ -65,9 +65,9 @@
* @throws FileNotFoundException If path does not exist.
* @throws FilePathException If path is invalid, is not a directory, or can't be read.
*
- * @return WeblogResource[] of files in website's uploads area at given path.
+ * @return ThemeResource[] of files in website's uploads area at given path.
*/
- public WeblogResource[] getFiles(WebsiteData weblog, String path)
+ public ThemeResource[] getFiles(WebsiteData weblog, String path)
throws FileNotFoundException, FilePathException;
@@ -82,9 +82,9 @@
* @throws FileNotFoundException If path does not exist.
* @throws FilePathException If path is invalid, or can't be read.
*
- * @return WeblogResource[] of directories in website's uploads area.
+ * @return ThemeResource[] of directories in website's uploads area.
*/
- public WeblogResource[] getDirectories(WebsiteData weblog)
+ public ThemeResource[] getDirectories(WebsiteData weblog)
throws FileNotFoundException, FilePathException;