Author: snoopdave
Date: Sun Apr 22 08:03:31 2007
New Revision: 531193
URL: http://svn.apache.org/viewvc?view=rev&rev=531193
Log:
Merging latest from trunk
Added:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/ThemeInitializationException.java
- copied unchanged from r531174,
roller/trunk/src/org/apache/roller/business/themes/ThemeInitializationException.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/
- copied from r531174, roller/trunk/src/org/apache/roller/ui/core/struts2/
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/CreateWeblogForm.java
- copied unchanged from r531174,
roller/trunk/src/org/apache/roller/ui/core/struts2/CreateWeblogForm.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/CreateWeblogFormBean.java
- copied unchanged from r531174,
roller/trunk/src/org/apache/roller/ui/core/struts2/CreateWeblogFormBean.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/Login.java
- copied unchanged from r531174,
roller/trunk/src/org/apache/roller/ui/core/struts2/Login.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/MainMenu.java
- copied unchanged from r531174,
roller/trunk/src/org/apache/roller/ui/core/struts2/MainMenu.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/ProfileForm.java
- copied unchanged from r531174,
roller/trunk/src/org/apache/roller/ui/core/struts2/ProfileForm.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/RegisterForm.java
- copied unchanged from r531174,
roller/trunk/src/org/apache/roller/ui/core/struts2/RegisterForm.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/struts2/RegisterFormBean.java
- copied unchanged from r531174,
roller/trunk/src/org/apache/roller/ui/core/struts2/RegisterFormBean.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/UIUtils.java
- copied unchanged from r531174,
roller/trunk/src/org/apache/roller/ui/core/util/UIUtils.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/
- copied from r531174,
roller/trunk/src/org/apache/roller/ui/core/util/struts2/
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIAction.java
- copied unchanged from r531174,
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIAction.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIActionInterceptor.java
- copied unchanged from r531174,
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIActionInterceptor.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UISecurityEnforced.java
- copied unchanged from r531174,
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UISecurityEnforced.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UISecurityInterceptor.java
- copied unchanged from r531174,
roller/trunk/src/org/apache/roller/ui/core/util/struts2/UISecurityInterceptor.java
roller/branches/roller_4.0_newbackend/tools/struts-2.0.5/lib/struts2-tiles-plugin-2.0.5.jar
- copied unchanged from r531174,
roller/trunk/tools/struts-2.0.5/lib/struts2-tiles-plugin-2.0.5.jar
roller/branches/roller_4.0_newbackend/tools/struts-2.0.5/lib/tiles-api-2.0-20070130.184344-3.jar
- copied unchanged from r531174,
roller/trunk/tools/struts-2.0.5/lib/tiles-api-2.0-20070130.184344-3.jar
roller/branches/roller_4.0_newbackend/tools/struts-2.0.5/lib/tiles-core-2.0-20070130.184344-3.jar
- copied unchanged from r531174,
roller/trunk/tools/struts-2.0.5/lib/tiles-core-2.0-20070130.184344-3.jar
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/classes/struts.xml
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/
- copied from r531174, roller/trunk/web/WEB-INF/jsps/core/struts2/
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/CreateWeblogForm.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/core/struts2/CreateWeblogForm.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/Login.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/core/struts2/Login.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenu.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenu.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/core/struts2/MainMenuSidebar.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/core/struts2/Welcome.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/core/struts2/Welcome.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/taglibs-struts2.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/
- copied from r531174, roller/trunk/web/WEB-INF/jsps/tiles/struts2/
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/banner.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/banner.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/empty.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/empty.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/footer.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/footer.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/head.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/menu-admin.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-admin.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/menu-editor.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-editor.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/messages.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/messages.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/search.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/search.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-errorpage.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-errorpage.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp
- copied unchanged from r531174,
roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml
- copied unchanged from r531174, roller/trunk/web/WEB-INF/tiles.xml
Removed:
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/title.jsp
Modified:
roller/branches/roller_4.0_newbackend/ant.properties
roller/branches/roller_4.0_newbackend/apps/planet/build.xml
roller/branches/roller_4.0_newbackend/build.xml
roller/branches/roller_4.0_newbackend/merges.txt
roller/branches/roller_4.0_newbackend/metadata/xdoclet/filter-mappings.xml
roller/branches/roller_4.0_newbackend/metadata/xdoclet/filters.xml
roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlet-mappings.xml
roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlets.xml
roller/branches/roller_4.0_newbackend/properties.xmlf
roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/README.txt
roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/README.txt
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/SharedThemeFromDir.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/FeedModel.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomServlet.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/Collection.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/Workspace.java
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/roller.properties
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.properties
roller/branches/roller_4.0_newbackend/web/WEB-INF/editor-menu.xml
roller/branches/roller_4.0_newbackend/web/WEB-INF/security.xml
roller/branches/roller_4.0_newbackend/web/WEB-INF/velocity/weblog.vm
roller/branches/roller_4.0_newbackend/web/roller-ui/styles/roller.css
roller/branches/roller_4.0_newbackend/web/themes/basic/Weblog.vm
roller/branches/roller_4.0_newbackend/web/themes/brushedmetal/Weblog.vm
roller/branches/roller_4.0_newbackend/web/themes/sotto/Weblog.vm
Modified: roller/branches/roller_4.0_newbackend/ant.properties
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/ant.properties?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/ant.properties (original)
+++ roller/branches/roller_4.0_newbackend/ant.properties Sun Apr 22 08:03:31
2007
@@ -7,7 +7,7 @@
# compile time settings
build.debug=true
-build.sourcelevel=1.4
+build.sourcelevel=1.5
build.deprecation=false
junit.haltonerror=false
Modified: roller/branches/roller_4.0_newbackend/apps/planet/build.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/apps/planet/build.xml?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/apps/planet/build.xml (original)
+++ roller/branches/roller_4.0_newbackend/apps/planet/build.xml Sun Apr 22
08:03:31 2007
@@ -134,6 +134,7 @@
<include name="*.jar"/>
</fileset>
<pathelement location="${tools}/buildtime/junit-3.8.1.jar"/>
+ <pathelement location="${tools}/buildtime/ant-1.6.2/ant-junit.jar"/>
<pathelement location="${tools}/buildtime/derby.jar"/>
<pathelement location="${tools}/buildtime/derbyclient.jar"/>
<pathelement location="${tools}/buildtime/derbynet.jar"/>
Modified: roller/branches/roller_4.0_newbackend/build.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/build.xml?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/build.xml (original)
+++ roller/branches/roller_4.0_newbackend/build.xml Sun Apr 22 08:03:31 2007
@@ -37,9 +37,10 @@
<!-- ********************************************************************* -->
<project name="roller" default="usage">
-<!-- Because we don't want to allow release builds to be done with Java 1.5
(yet) -->
+<!--No longer need java15 check
<available classname="java.lang.ProcessBuilder" property="java15.present" />
-
+ -->
+
<!-- Bring in properties.xml -->
&properties;
@@ -609,7 +610,7 @@
<!-- Create Binary Release -->
<!-- ********************************************************************* -->
-<target name="stage-binary" depends="version-check" >
+<target name="stage-binary" >
<!-- copy in release documents -->
<copy todir="${build.dist.binary}">
Modified: roller/branches/roller_4.0_newbackend/merges.txt
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/merges.txt?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/merges.txt (original)
+++ roller/branches/roller_4.0_newbackend/merges.txt Sun Apr 22 08:03:31 2007
@@ -3,6 +3,9 @@
Temporary file to track merges from trunk into the roller_4.0_newbackend
branch.
+April 22 2007: merging latest from trunk
+svn merge -r 528650:531174 https://svn.apache.org/repos/asf/roller/trunk
+
April 12, 2007: merging latest from trunk
svn merge -r 526991:528650 https://svn.apache.org/repos/asf/roller/trunk
Modified:
roller/branches/roller_4.0_newbackend/metadata/xdoclet/filter-mappings.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/metadata/xdoclet/filter-mappings.xml?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/metadata/xdoclet/filter-mappings.xml
(original)
+++ roller/branches/roller_4.0_newbackend/metadata/xdoclet/filter-mappings.xml
Sun Apr 22 08:03:31 2007
@@ -105,6 +105,14 @@
</filter-mapping>
+<!-- Struts2 -->
+<filter-mapping>
+ <filter-name>struts2</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+</filter-mapping>
+
<!-- Do we still need the RequestFilter? -->
<filter-mapping>
<filter-name>RequestFilter</filter-name>
Modified: roller/branches/roller_4.0_newbackend/metadata/xdoclet/filters.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/metadata/xdoclet/filters.xml?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/metadata/xdoclet/filters.xml
(original)
+++ roller/branches/roller_4.0_newbackend/metadata/xdoclet/filters.xml Sun Apr
22 08:03:31 2007
@@ -1,8 +1,7 @@
-
-<filter>
- <filter-name>struts2</filter-name>
- <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
-</filter>
+ <filter>
+ <filter-name>struts2</filter-name>
+
<filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
+ </filter>
<filter>
<filter-name>securityFilter</filter-name>
Modified:
roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlet-mappings.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlet-mappings.xml?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlet-mappings.xml
(original)
+++ roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlet-mappings.xml
Sun Apr 22 08:03:31 2007
@@ -8,3 +8,7 @@
<servlet-name>XmlRpcServlet</servlet-name>
<url-pattern>/roller-services/xmlrpc</url-pattern>
</servlet-mapping>
+
+ <listener>
+ <listener-class>org.apache.tiles.listener.TilesListener</listener-class>
+</listener>
\ No newline at end of file
Modified: roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlets.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlets.xml?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlets.xml
(original)
+++ roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlets.xml Sun Apr
22 08:03:31 2007
@@ -18,10 +18,10 @@
<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>
+ <description>
+ Sets, whether the servlet supports vendor extensions for XML-RPC.
+ </description>
+ <param-name>enabledForExtensions</param-name>
+ <param-value>true</param-value>
</init-param>
</servlet>
Modified: roller/branches/roller_4.0_newbackend/properties.xmlf
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/properties.xmlf?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/properties.xmlf (original)
+++ roller/branches/roller_4.0_newbackend/properties.xmlf Sun Apr 22 08:03:31
2007
@@ -126,7 +126,7 @@
<include name="commons-logging.jar"/>
</fileset>
-<fileset id="struts2.jars" dir="${tools.struts2}/lib">
+<fileset id="struts2.jars" dir="${ro.tools}/struts-2.0.5/lib">
<include name="*.jar"/>
</fileset>
@@ -141,9 +141,7 @@
</fileset>
<fileset id="jstl.jars" dir="${tools.jstl}/lib">
- <include name="jstl.jar"/>
- <include name="standard.jar"/>
- <include name="xalan.jar"/>
+ <include name="*.jar"/>
</fileset>
<fileset id="hibernate.jar" dir="${tools.hibernate}">
@@ -237,6 +235,7 @@
</fileset>
<fileset refid="commons-httpclient.jar"/>
<pathelement location="${ro.tools}/buildtime/junit-3.8.1.jar"/>
+ <pathelement location="${ro.tools}/buildtime/ant-1.6.2/ant-junit.jar"/>
<pathelement location="${ro.tools}/buildtime/derby.jar"/>
<pathelement location="${ro.tools}/buildtime/derbyclient.jar"/>
<pathelement location="${ro.tools}/buildtime/derbynet.jar"/>
Modified: roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/README.txt
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/README.txt?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/README.txt
(original)
+++ roller/branches/roller_4.0_newbackend/sandbox/scripting/bsf/README.txt Sun
Apr 22 08:03:31 2007
@@ -16,8 +16,8 @@
4) Restart Roller
-5) Create a page template and set Template Language to either "groovy", "jruby"
- or "javascript" -- right now you'll have to do that via SQL.
+5) Create a new Weblog Template and set the Template Language to either
+ "groovy", "jruby" or "javascript"
6) In your page template you'll have access to all normal Roller models
plus the name "out" will be bound to a Writer that you can use for output.
Modified:
roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/README.txt
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/README.txt?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/README.txt
(original)
+++ roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/README.txt
Sun Apr 22 08:03:31 2007
@@ -98,13 +98,12 @@
4) Restart Roller
-5) Create a page template and set Template Language to either "groovlet" or
- "gsp". Currently you'll have to do that via SQL.
+5) Create a new Weblog Page Template and set Template Language to either
+ "groovlet" or "gsp".
6) In your page template you'll have access to all normal Roller models
plus the name "out" will be bound to a Writer that you can use for output.
- Also, the name "html" will be bound to a markup builder. Here's an
- example Groovy Roller page:
+ Also, the name "html" will be bound to a markup builder.
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateRefererManagerImpl.java
Sun Apr 22 08:03:31 2007
@@ -286,7 +286,7 @@
Iterator rawResults = query.list().iterator();
for (Iterator it = query.list().iterator(); it.hasNext();) {
Object[] row = (Object[])it.next();
- Integer hits = (Integer)row[0];
+ Number hits = (Number)row[0];
String websiteId = (String)row[1];
String websiteName = (String)row[2];
String websiteHandle = (String)row[3];
@@ -340,11 +340,11 @@
if (resultsArray.length > 0 && type.equals(DAYHITS)) {
if ( resultsArray[0] != null ) {
- hits = ((Integer) resultsArray[0]).intValue();
+ hits = ((Number) resultsArray[0]).intValue();
}
} else if ( resultsArray.length > 0 ) {
if ( resultsArray[0] != null ) {
- hits = ((Integer) resultsArray[1]).intValue();
+ hits = ((Number) resultsArray[1]).intValue();
}
} else {
hits = 0;
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
Sun Apr 22 08:03:31 2007
@@ -1239,7 +1239,7 @@
Object[] row = (Object[]) iter.next();
TagStat t = new TagStat();
t.setName((String) row[0]);
- t.setCount(((Integer) row[1]).intValue());
+ t.setCount(((Number) row[1]).intValue());
min = Math.min(min, t.getCount());
max = Math.max(max, t.getCount());
@@ -1306,7 +1306,7 @@
Object[] row = (Object[]) iter.next();
TagStat ce = new TagStat();
ce.setName((String) row[0]);
- ce.setCount(((Integer) row[1]).intValue());
+ ce.setCount(((Number) row[1]).intValue());
results.add(ce);
}
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/SharedThemeFromDir.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/SharedThemeFromDir.java?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/SharedThemeFromDir.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/business/themes/SharedThemeFromDir.java
Sun Apr 22 08:03:31 2007
@@ -65,7 +65,9 @@
private Map resources = new HashMap();
- public SharedThemeFromDir(String themeDirPath) {
+ public SharedThemeFromDir(String themeDirPath)
+ throws ThemeInitializationException {
+
this.themeDir = themeDirPath;
// load the theme elements and cache 'em
@@ -174,7 +176,7 @@
/**
* Load all the elements of this theme from disk and cache them.
*/
- private void loadThemeFromDisk() {
+ private void loadThemeFromDisk() throws ThemeInitializationException {
log.debug("Parsing theme descriptor for "+this.themeDir);
@@ -185,8 +187,7 @@
InputStream is = new FileInputStream(this.themeDir +
File.separator + "theme.xml");
themeMetadata = parser.unmarshall(is);
} catch (Exception ex) {
- log.warn("Unable to parse theme descriptor for theme
"+this.themeDir, ex);
- return;
+ throw new ThemeInitializationException("Unable to parse theme
descriptor for theme "+this.themeDir, ex);
}
log.debug("Loading Theme "+themeMetadata.getName());
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/FeedModel.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/FeedModel.java?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/FeedModel.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/rendering/model/FeedModel.java
Sun Apr 22 08:03:31 2007
@@ -150,7 +150,7 @@
super(URLUtilities.getWeblogFeedURL(feedRequest.getWeblog(),
feedRequest.getLocale(), feedRequest.getType(),
feedRequest.getFormat(), null, null, null, false, true),
- feedRequest.getWeblog(), null, null, feedRequest.getTags(),
+ feedRequest.getWeblog(), null,
feedRequest.getWeblogCategoryName(), feedRequest.getTags(),
feedRequest.getLocale(), -1, feedRequest.getPage(),
DEFAULT_ENTRIES);
this.feedRequest = feedRequest;
}
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomServlet.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomServlet.java?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomServlet.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/AtomServlet.java
Sun Apr 22 08:03:31 2007
@@ -92,7 +92,7 @@
// return an Atom Service document
AtomService service = handler.getIntrospection();
Document doc = AtomService.serviceToDocument(service);
- res.setContentType("application/atomserv+xml;
charset=utf-8");
+ res.setContentType("application/atomsvc+xml;
charset=utf-8");
Writer writer = res.getWriter();
XMLOutputter outputter = new XMLOutputter();
outputter.setFormat(Format.getPrettyFormat());
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/Collection.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/Collection.java?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/Collection.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/Collection.java
Sun Apr 22 08:03:31 2007
@@ -141,27 +141,27 @@
title.setText(collection.getTitle());
element.addContent(title);
if (collection.getTitleType() != null &&
!collection.getTitleType().equals("TEXT")) {
- element.setAttribute("type", collection.getTitleType(),
AtomService.ATOM_FORMAT);
+ element.setAttribute("type", collection.getTitleType()); //,
AtomService.ATOM_FORMAT);
}
// Loop to create <app:categories> elements
for (Iterator it = collection.getCategories().iterator();
it.hasNext();) {
Categories cats = (Categories)it.next();
Element catsElem = new Element("categories",
AtomService.ATOM_PROTOCOL);
- catsElem.setAttribute("fixed", cats.isFixed() ? "yes" : "no",
AtomService.ATOM_PROTOCOL);
+ catsElem.setAttribute("fixed", cats.isFixed() ? "yes" : "no"); //,
AtomService.ATOM_PROTOCOL);
if (cats.getScheme() != null) {
- catsElem.setAttribute("scheme", cats.getScheme(),
AtomService.ATOM_PROTOCOL);
+ catsElem.setAttribute("scheme", cats.getScheme()); //,
AtomService.ATOM_PROTOCOL);
}
// Loop to create <atom:category> elements
for (Iterator catIter = cats.getCategories().iterator();
catIter.hasNext();) {
Category cat = (Category) catIter.next();
Element catElem = new Element("category",
AtomService.ATOM_FORMAT);
- catElem.setAttribute("term", cat.getTerm(),
AtomService.ATOM_FORMAT);
+ catElem.setAttribute("term", cat.getTerm()); //,
AtomService.ATOM_FORMAT);
if (cat.getScheme() != null) { // optional
- catElem.setAttribute("scheme", cat.getScheme(),
AtomService.ATOM_FORMAT);
+ catElem.setAttribute("scheme", cat.getScheme()); //,
AtomService.ATOM_FORMAT);
}
if (cat.getLabel() != null) { // optional
- catElem.setAttribute("label", cat.getLabel(),
AtomService.ATOM_FORMAT);
+ catElem.setAttribute("label", cat.getLabel()); //,
AtomService.ATOM_FORMAT);
}
catsElem.addContent(catElem);
}
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/RollerAtomHandler.java
Sun Apr 22 08:03:31 2007
@@ -406,8 +406,6 @@
if (!canView(website)) {
throw new AtomNotAuthorizedException("Not authorized to access
website");
}
- FileManager fmgr = roller.getFileManager();
- ThemeResource[] files = fmgr.getFiles(website, path);
Feed feed = new Feed();
feed.setId(URLUtilities.getAtomProtocolURL(true)
@@ -420,6 +418,9 @@
link.setType("text/html");
feed.setAlternateLinks(Collections.singletonList(link));
+ FileManager fmgr = roller.getFileManager();
+ ThemeResource[] files = fmgr.getFiles(website, path);
+
SortedSet sortedSet = new TreeSet(new Comparator() {
public int compare(Object o1, Object o2) {
ThemeResource f1 = (ThemeResource)o1;
@@ -433,12 +434,14 @@
}
});
- List atomEntries = new ArrayList();
- if (files != null && start < files.length) {
+ if (files != null && start < files.length) {
+ for (int j=0; j<files.length; j++) {
+ sortedSet.add(files[j]);
+ }
int count = 0;
- ThemeResource[] sortedArray =
(ThemeResource[])sortedSet.toArray(new ThemeResource[sortedSet.size()]);
- for (int i=start; i<(start + max) && i<(sortedArray.length);
i++) {
- Entry entry = createAtomResourceEntry(website,
sortedArray[i]);
+ List atomEntries = new ArrayList();
+ for (int i=start; i<(start + max) && i<(sortedSet.size());
i++) {
+ Entry entry = createAtomResourceEntry(website, files[i]);
atomEntries.add(entry);
if (count == 0) {
// first entry is most recent
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/Workspace.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/Workspace.java?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/Workspace.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/webservices/atomprotocol/Workspace.java
Sun Apr 22 08:03:31 2007
@@ -119,7 +119,7 @@
title.setText(space.getTitle());
element.addContent(title);
if (space.getTitleType() != null &&
!space.getTitleType().equals("TEXT")) {
- element.setAttribute("type", space.getTitleType(),
AtomService.ATOM_FORMAT);
+ title.setAttribute("type", space.getTitleType()); //,
AtomService.ATOM_FORMAT);
}
Iterator iter = space.getCollections().iterator();
Modified:
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/roller.properties
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/roller.properties?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/roller.properties
(original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/roller.properties
Sun Apr 22 08:03:31 2007
@@ -237,7 +237,11 @@
/roller-ui/user.do,\
/roller-ui/yourProfile.do,\
/roller-ui/admin/user.do,\
-/roller-ui/authoring/userdata
+/roller-ui/authoring/userdata,\
+/roller-ui/login,\
+/roller-ui/register,\
+/roller-ui/profile,\
+/roller-ui/login-redirect
# Password security settings
passwds.encryption.enabled=false
Modified:
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.properties
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.properties?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.properties
(original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.properties
Sun Apr 22 08:03:31 2007
@@ -1,4 +1,26 @@
-struts.objectFactory = spring
-struts.devMode = false
-#struts.action.extension = do
-struts.enable.DynamicMethodInvocation = false
+
+# use spring as the object factory
+struts.objectFactory=spring
+
+# use the simple theme
+struts.ui.theme=simple
+
+# set the struts action extension to 'rol'
+struts.action.extension=rol
+
+# dev mode options
+struts.devMode=true
+struts.configuration.xml.reload=true
+struts.i18n.reload=false
+
+# this enables the translation of action="foo!method" to work nicely
+struts.enable.DynamicMethodInvocation=true
+
+# prevent the damn s:url calls from including undesired query params by default
+struts.url.includeParams=none
+
+# this tells struts2 what the special name is for our global resource bundle
+# eventually we should remove this when the struts2 migration is mostly
complete
+# and use the highly preferred way of splitting the resource bundles into
+# smaller pieces per package or class
+struts.custom.i18n.resources=ApplicationResources
Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/editor-menu.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/editor-menu.xml?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/editor-menu.xml (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/editor-menu.xml Sun Apr
22 08:03:31 2007
@@ -35,7 +35,7 @@
<menu-item forward="bookmarks"
name="tabbedmenu.bookmarks.allFolders"
subforwards="importBookmarks,bookmarkEdit,folderEdit" />
<menu-item forward="uploadFiles" name="tabbedmenu.website.files" />
- <menu-item forward="referers" name="tabbedmenu.weblog.referers" />
+ <menu-item forward="referers" name="tabbedmenu.weblog.referers"
enabledProperty="referrers.processing.enabled" />
</menu>
<menu name="tabbedmenu.website" perms="admin">
Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/security.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/security.xml?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/security.xml (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/security.xml Sun Apr 22
08:03:31 2007
@@ -50,6 +50,10 @@
/roller-ui/authoring/**=admin,editor
/roller-ui/admin/**=admin
/rewrite-status*=admin
+ /roller-ui/login-redirect=admin,editor
+ /roller-ui/profile**=admin,editor
+ /roller-ui/createWeblog**=admin,editor
+ /roller-ui/menu**=admin,editor
</value>
<!-- Add this to above list for LDAP/SSO configuration -->
<!-- /roller-ui/user.do*=register -->
Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/velocity/weblog.vm
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/velocity/weblog.vm?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/velocity/weblog.vm
(original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/velocity/weblog.vm Sun
Apr 22 08:03:31 2007
@@ -665,7 +665,7 @@
#if( $showCatChooser )
#set( $cats = $model.weblog.getWeblogCategories("nil") )
<select name="cat">
- <option value="">- In Category -</option>
+ <option value="">- $text.get("mainPage.category") -</option>
#foreach( $cat in $cats )
<option #if($cat.name ==
$model.term)selected="selected"#end>$cat.name</option>
#end
Modified: roller/branches/roller_4.0_newbackend/web/roller-ui/styles/roller.css
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/roller-ui/styles/roller.css?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/roller-ui/styles/roller.css
(original)
+++ roller/branches/roller_4.0_newbackend/web/roller-ui/styles/roller.css Sun
Apr 22 08:03:31 2007
@@ -289,6 +289,11 @@
table.rollertable td.center {
text-align: center;
}
+td.field span.fixedAttr {
+ font-style: italic;
+ font-weight: bold;
+ color: red;
+}
.rollertable_even td {
border: 1px solid #ccc;
background: #EEEEEE;
@@ -675,28 +680,28 @@
margin-bottom: 5px;
}
-/* tag autocomplete */
-
-div.autocomplete {
- position:absolute;
- width:250px;
- background-color:white;
- border:1px solid #888;
- margin:0px;
- padding:0px;
-}
-div.autocomplete ul {
- list-style-type:none;
- margin:0px;
- padding:0px;
-}
-div.autocomplete ul li.selected { background-color: #ffb;}
-
-div.autocomplete ul li {
- list-style-type:none;
- display:block;
- margin:0;
- padding:2px;
- cursor:pointer;
-}
+/* tag autocomplete */
+
+div.autocomplete {
+ position:absolute;
+ width:250px;
+ background-color:white;
+ border:1px solid #888;
+ margin:0px;
+ padding:0px;
+}
+div.autocomplete ul {
+ list-style-type:none;
+ margin:0px;
+ padding:0px;
+}
+div.autocomplete ul li.selected { background-color: #ffb;}
+
+div.autocomplete ul li {
+ list-style-type:none;
+ display:block;
+ margin:0;
+ padding:2px;
+ cursor:pointer;
+}
Modified: roller/branches/roller_4.0_newbackend/web/themes/basic/Weblog.vm
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/themes/basic/Weblog.vm?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/themes/basic/Weblog.vm (original)
+++ roller/branches/roller_4.0_newbackend/web/themes/basic/Weblog.vm Sun Apr 22
08:03:31 2007
@@ -30,8 +30,8 @@
#showWeblogEntriesPager($pager)
#if ($model.permalink)
- #showWeblogEntryComments($entry)
- #showWeblogEntryCommentForm($entry)
+ #showWeblogEntryComments($model.weblogEntry)
+ #showWeblogEntryCommentForm($model.weblogEntry)
#end
</div>
Modified:
roller/branches/roller_4.0_newbackend/web/themes/brushedmetal/Weblog.vm
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/themes/brushedmetal/Weblog.vm?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/themes/brushedmetal/Weblog.vm
(original)
+++ roller/branches/roller_4.0_newbackend/web/themes/brushedmetal/Weblog.vm Sun
Apr 22 08:03:31 2007
@@ -52,8 +52,8 @@
#showWeblogEntriesPager($pager)
#if ($model.permalink)
- #showWeblogEntryComments($entry)
- #showWeblogEntryCommentForm($entry)
+ #showWeblogEntryComments($model.weblogEntry)
+ #showWeblogEntryCommentForm($model.weblogEntry)
#end
<div id="footer">
Modified: roller/branches/roller_4.0_newbackend/web/themes/sotto/Weblog.vm
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/themes/sotto/Weblog.vm?view=diff&rev=531193&r1=531192&r2=531193
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/themes/sotto/Weblog.vm (original)
+++ roller/branches/roller_4.0_newbackend/web/themes/sotto/Weblog.vm Sun Apr 22
08:03:31 2007
@@ -39,8 +39,8 @@
#showWeblogEntriesPager($pager)
#if ($model.permalink)
- #showWeblogEntryComments($entry)
- #showWeblogEntryCommentForm($entry)
+ #showWeblogEntryComments($model.weblogEntry)
+ #showWeblogEntryCommentForm($model.weblogEntry)
#end
</div>
