roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r231301 - in /incubator/roller/branches/roller_2.0: ./ metadata/database/hibernate/ metadata/xdoclet/ sandbox/standalone/ sandbox/standalone/tomcat/ src/org/roller/presentation/ src/org/roller/presentation/bookmarks/actions/ src/org/roller/...
Date Wed, 10 Aug 2005 19:44:37 GMT
Author: snoopdave
Date: Wed Aug 10 12:43:40 2005
New Revision: 231301

URL: http://svn.apache.org/viewcvs?rev=231301&view=rev
Log:
Adding tiles config so we can assign differnet headers, footers, banners and sidebars for different classes of pages as we experiment with different simplified UIs

Added:
    incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
    incubator/roller/branches/roller_2.0/web/theme/tiles-mainpage.jsp
Modified:
    incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml
    incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml
    incubator/roller/branches/roller_2.0/metadata/xdoclet/struts-plugins.xml
    incubator/roller/branches/roller_2.0/properties.xmlf
    incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/MainPageAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MaintenanceAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.java
    incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp
    incubator/roller/branches/roller_2.0/web/error.jsp
    incubator/roller/branches/roller_2.0/web/login.jsp
    incubator/roller/branches/roller_2.0/web/main-sidebar.jsp
    incubator/roller/branches/roller_2.0/web/taglibs.jsp
    incubator/roller/branches/roller_2.0/web/theme/footer.jsp
    incubator/roller/branches/roller_2.0/web/theme/header.jsp
    incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp
    incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp

Modified: incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml (original)
+++ incubator/roller/branches/roller_2.0/metadata/database/hibernate/hibernate.cfg.xml Wed Aug 10 12:43:40 2005
@@ -58,13 +58,12 @@
         <mapping resource="org/roller/pojos/WeblogEntryData.hbm.xml" />
         <mapping resource="org/roller/pojos/WebsiteData.hbm.xml" />
         <mapping resource="org/roller/pojos/RollerPropertyData.hbm.xml" />
+        <mapping resource="org/roller/pojos/PermissionsData.hbm.xml" />
         <mapping resource="org/roller/pojos/PlanetConfigData.hbm.xml" />
         <mapping resource="org/roller/pojos/PlanetGroupData.hbm.xml" />
         <mapping resource="org/roller/pojos/PlanetEntryData.hbm.xml" />
         <mapping resource="org/roller/pojos/PlanetSubscriptionData.hbm.xml" />
         <mapping resource="org/roller/pojos/PlanetGroupSubscriptionAssoc.hbm.xml" />
-        
-        <mapping resource="org/roller/pojos/PermissionsData.hbm.xml" />
-        
+                
     </session-factory>
 </hibernate-configuration>

Modified: incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml (original)
+++ incubator/roller/branches/roller_2.0/metadata/xdoclet/global-forwards.xml Wed Aug 10 12:43:40 2005
@@ -1,8 +1,8 @@
 <global-forwards>
-<forward name="access-denied"          path="/denied.jsp"/>
-<forward name="error"                  path="/error.jsp"/>
-<forward name="login-redirect"         path="/login-redirect.jsp"/>
-<forward name="logout-redirect"        path="/logout-redirect.jsp"/>
+<forward name="access-denied"          path=".denied"/>
+<forward name="error"                  path=".error"/>
+<forward name="login-redirect"         path="login-redirect.jsp"/>
+<forward name="logout-redirect"        path="logout-redirect.jsp"/>
 
 <!-- unprotected actions -->
 <forward name="page"                   path="/page"/>

Modified: incubator/roller/branches/roller_2.0/metadata/xdoclet/struts-plugins.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/metadata/xdoclet/struts-plugins.xml?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/metadata/xdoclet/struts-plugins.xml (original)
+++ incubator/roller/branches/roller_2.0/metadata/xdoclet/struts-plugins.xml Wed Aug 10 12:43:40 2005
@@ -5,6 +5,11 @@
         value="/WEB-INF/validator-rules.xml,/WEB-INF/validation.xml"/>
 </plug-in>
 
+<plug-in className="org.apache.struts.tiles.TilesPlugin">
+    <set-property 
+        property="definitions-config" value="/WEB-INF/tiles-defs.xml"/>
+</plug-in>
+
 <!-- 
 <plug-in className="com.octo.captcha.module.struts.CaptchaServicePlugin"/>
 -->

Modified: incubator/roller/branches/roller_2.0/properties.xmlf
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/properties.xmlf?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/properties.xmlf (original)
+++ incubator/roller/branches/roller_2.0/properties.xmlf Wed Aug 10 12:43:40 2005
@@ -13,11 +13,11 @@
 <property name="build.velocidoc"     value="${ro.build}/velocidoc"/>
 <property name="build.jspc"          value="${ro.build}/jspc"/>
 <property name="build.reports"       value="${ro.build}/reports"/>
-<property name="tools.struts"    value="${ro.tools}/struts-1.2.4" />
-<property name="tools.hibernate" value="${ro.tools}/hibernate-2.1" />
-<property name="tools.jstl"      value="${ro.tools}/standard-1.0.3" />
-<property name="tools.xdoclet"   value="${ro.tools}/buildtime/xdoclet-1.2" />
-<property name="tools.tomcat"    value="${ro.tools}/buildtime/tomcat-4.1.24" />
+<property name="tools.struts"        value="${ro.tools}/struts-1.2.4" />
+<property name="tools.hibernate"     value="${ro.tools}/hibernate-2.1" />
+<property name="tools.jstl"          value="${ro.tools}/standard-1.0.3" />
+<property name="tools.xdoclet"    value="${ro.tools}/buildtime/xdoclet-1.2" />
+<property name="tools.tomcat"     value="${ro.tools}/buildtime/tomcat-4.1.24" />
 
 <!--
 If you would like Ant to copy all the jar files that Resin needs
@@ -40,16 +40,15 @@
 <!-- **************************************************************** -->
 
 <fileset id="base.jars" dir="${ro.tools}/lib">
+    <include name="commons-betwixt-1.0-beta-1.jar" />
     <include name="commons-cache.jar" />
+    <include name="commons-codec-1.1.jar" />
     <include name="concurrent-1.3.2.jar"/>
-    <include name="log4j-1.2.4.jar"/>
     <include name="jazzy-core.jar" />
-    <include name="commons-betwixt-1.0-beta-1.jar" />
+    <include name="lucene-1.4.3.jar"/>
+    <include name="log4j-1.2.4.jar"/>
     <include name="rome-0.6.jar"/>
     <include name="rome-fetcher-0.6.jar"/>
-    <include name="commons-httpclient-2.0.2.jar"/>
-    <include name="lucene-1.4.3.jar"/>
-    <include name="commons-codec-1.1.jar" />
     <include name="velocity-1.4.jar"/>
     <include name="velocity-dep-1.4.jar"/>
     <include name="velocity-tools-1.1.jar"/>

Modified: incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml (original)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml Wed Aug 10 12:43:40 2005
@@ -96,9 +96,13 @@
         todir="./build/roller-demo/server/lib" />
    <copy file="${roller.srcdir}/tools/buildtime/hsqldb.jar" 
         todir="./build/roller-demo/common/lib" />
+   <copy file="${roller.srcdir}/tools/lib/mail.jar" 
+        todir="./build/roller-demo/common/lib" />
+   <copy file="${roller.srcdir}/tools/lib/activation.jar" 
+        todir="./build/roller-demo/common/lib" />
 	
    <!-- Custom local-banner -->
-   <copy file="./tomcat/localbanner.jspf" 
+   <copy file="./tomcat/local-banner.jspf" 
         todir="./build/roller-demo/webapps/roller" />
 
    <!-- Our own server.xml: adds HSQLDB startup -->         

Modified: incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml (original)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml Wed Aug 10 12:43:40 2005
@@ -18,7 +18,7 @@
         <mapping resource="org/roller/pojos/EntryAttributeData.hbm.xml" />
         <mapping resource="org/roller/pojos/FolderAssoc.hbm.xml" />
         <mapping resource="org/roller/pojos/FolderData.hbm.xml" />
-        <mapping resource="org/roller/pojos/PageData.hbm.xml" />
+        <mapping resource="org/roller/pojos/WeblogTemplate.hbm.xml" />
         <mapping resource="org/roller/pojos/PingCategoryRestrictionData.hbm.xml" />
         <mapping resource="org/roller/pojos/AutoPingData.hbm.xml" />
         <mapping resource="org/roller/pojos/PingQueueEntryData.hbm.xml" />
@@ -33,11 +33,12 @@
         <mapping resource="org/roller/pojos/WeblogEntryData.hbm.xml" />
         <mapping resource="org/roller/pojos/WebsiteData.hbm.xml" />
         <mapping resource="org/roller/pojos/RollerPropertyData.hbm.xml" />
+        <mapping resource="org/roller/pojos/PermissionsData.hbm.xml" />
         <mapping resource="org/roller/pojos/PlanetConfigData.hbm.xml" />
         <mapping resource="org/roller/pojos/PlanetGroupData.hbm.xml" />
         <mapping resource="org/roller/pojos/PlanetEntryData.hbm.xml" />
         <mapping resource="org/roller/pojos/PlanetSubscriptionData.hbm.xml" />
         <mapping resource="org/roller/pojos/PlanetGroupSubscriptionAssoc.hbm.xml" />
-
+        
     </session-factory>
 </hibernate-configuration>

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/MainPageAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/MainPageAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/MainPageAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/MainPageAction.java Wed Aug 10 12:43:40 2005
@@ -23,7 +23,7 @@
 /**
  * Main page action for Roller.
  * @struts.action name="main" path="/main" scope="request"
- * @struts.action-forward name="main.page" path="/main.jsp"
+ * @struts.action-forward name="main.page" path=".main"
  */
 public class MainPageAction extends Action
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java Wed Aug 10 12:43:40 2005
@@ -23,7 +23,7 @@
 
 /**
  * @struts.action path="/editor/bookmarkEdit" name="bookmarkFormEx" validate="false"
- * @struts.action-forward name="BookmarkForm" path="/bookmarks/BookmarkForm.jsp"
+ * @struts.action-forward name="BookmarkForm" path=".BookmarkForm"
  * 
  * @author Dave Johnson
  */

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java Wed Aug 10 12:43:40 2005
@@ -36,7 +36,7 @@
  * Actions that are initiated from the BookmarksForm.
  *
  * @struts.action name="bookmarksForm" path="/editor/bookmarks" parameter="method"
- * @struts.action-forward name="BookmarksForm" path="/bookmarks/BookmarksForm.jsp"
+ * @struts.action-forward name="BookmarksForm" path=".BookmarksForm"
  *
  * @author Dave Johnson
  */

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java Wed Aug 10 12:43:40 2005
@@ -18,7 +18,7 @@
 
 /**
  * @struts.action path="/editor/folderEdit" name="folderFormEx" validate="false"
- * @struts.action-forward name="FolderForm" path="/bookmarks/FolderForm.jsp"
+ * @struts.action-forward name="FolderForm" path=".FolderForm"
  * 
  * @author Dave Johnson
  */

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java Wed Aug 10 12:43:40 2005
@@ -30,9 +30,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /**
  * @struts.action name="folderFormEx" path="/editor/importBookmarks" 
- *  scope="request" input="/bookmarks/import.jsp" validate="false"
+ *  scope="request" input=".import" validate="false"
  * 
- * @struts.action-forward name="importBookmarks.page" path="/bookmarks/import.jsp"
+ * @struts.action-forward name="importBookmarks.page" path=".import"
  * 
  * TODO Should import into folder with same name as imported file
  */

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetAction.java Wed Aug 10 12:43:40 2005
@@ -25,7 +25,7 @@
 /**
  * Main page action for Roller Planet.
  * @struts.action name="main" path="/planet" scope="request"
- * @struts.action-forward name="planet.page" path="/planet.jsp"
+ * @struts.action-forward name="planet.page" path=".planet"
  */
 public class PlanetAction extends Action
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetConfigAction.java Wed Aug 10 12:43:40 2005
@@ -50,7 +50,7 @@
  *                scope="request" parameter="method"
  * 
  * @struts.action-forward name="planetConfig.page" 
- *                        path="/planet/PlanetConfig.jsp"
+ *                        path=".PlanetConfig"
  */
 public final class PlanetConfigAction extends DispatchAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetGroupsAction.java Wed Aug 10 12:43:40 2005
@@ -53,7 +53,7 @@
  *                scope="request" parameter="method"
  * 
  * @struts.action-forward name="planetGroups.page" 
- *                        path="/planet/PlanetGroups.jsp"
+ *                        path=".PlanetGroups"
  */
 public final class PlanetGroupsAction extends DispatchAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/planet/PlanetSubscriptionsAction.java Wed Aug 10 12:43:40 2005
@@ -55,7 +55,7 @@
  *                scope="request" parameter="method"
  * 
  * @struts.action-forward name="planetSubscriptions.page" 
- *                        path="/planet/PlanetSubscriptions.jsp"
+ *                        path=".PlanetSubscriptions"
  */
 public final class PlanetSubscriptionsAction extends DispatchAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoriesAction.java Wed Aug 10 12:43:40 2005
@@ -34,7 +34,7 @@
  * Actions that are initiated from the CategoriesForm.
  * 
  * @struts.action name="categoriesForm" path="/editor/categories" parameter="method"
- * @struts.action-forward name="CategoriesForm" path="/weblog/CategoriesForm.jsp"
+ * @struts.action-forward name="CategoriesForm" path=".CategoriesForm"
  * 
  * @author Dave Johnson
  */

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryDeleteAction.java Wed Aug 10 12:43:40 2005
@@ -25,7 +25,7 @@
 /**
  * @struts.action path="/editor/categoryDelete" name="categoryDeleteForm"
  * @struts.action-forward name="Categories" path="/editor/categories.do?method=selectCategory"
- * @struts.action-forward name="CategoryDeleteOK" path="/weblog/CategoryDeleteOK.jsp"
+ * @struts.action-forward name="CategoryDeleteOK" path=.CategoryDeleteOK"
  * 
  * @author Dave Johnson
  */

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CategoryEditAction.java Wed Aug 10 12:43:40 2005
@@ -22,7 +22,7 @@
 
 /**
  * @struts.action path="/editor/categoryEdit" name="weblogCategoryFormEx" validate="false"
- * @struts.action-forward name="CategoryForm" path="/weblog/CategoryForm.jsp"
+ * @struts.action-forward name="CategoryForm" path=".CategoryForm"
  * 
  * @author Dave Johnson
  */

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/CustomPingTargetsAction.java Wed Aug 10 12:43:40 2005
@@ -28,9 +28,9 @@
  * Administer custom ping targets.
  *
  * @struts.action name="pingTargetForm" path="/editor/customPingTargets" scope="request" parameter="method"
- * @struts.action-forward name="pingTargets.page" path="/weblog/CustomPingTargets.jsp"
- * @struts.action-forward name="pingTargetEdit.page" path="/weblog/CustomPingTargetEdit.jsp"
- * @struts.action-forward name="pingTargetDeleteOK.page" path="/weblog/CustomPingTargetDeleteOK.jsp"
+ * @struts.action-forward name="pingTargets.page" path=".CustomPingTargets"
+ * @struts.action-forward name="pingTargetEdit.page" path=".CustomPingTargetEdit"
+ * @struts.action-forward name="pingTargetDeleteOK.page" path=".CustomPingTargetDeleteOK"
  */
 public class CustomPingTargetsAction
     extends BasePingTargetsAction

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ExportEntriesAction.java Wed Aug 10 12:43:40 2005
@@ -45,7 +45,7 @@
  * @struts.action path="/editor/exportEntries" name="weblogQueryForm" 
  *    scope="request" parameter="method"
  * 
- * @struts.action-forward name="exportEntries.page" path="/weblog/export-entries.jsp"
+ * @struts.action-forward name="exportEntries.page" path=".export-entries"
  * 
  * @author lance.lavandowska
  */

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ImportEntriesAction.java Wed Aug 10 12:43:40 2005
@@ -34,7 +34,7 @@
  * @struts.action name="importEntries" path="/editor/importEntries"
  *                scope="request" parameter="method"
  * 
- * @struts.action-forward name="importEntries.page" path="/weblog/import-entries.jsp"
+ * @struts.action-forward name="importEntries.page" path=".import-entries"
  *
  * @author lance.lavandowska
  */

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/PingSetupAction.java Wed Aug 10 12:43:40 2005
@@ -48,8 +48,8 @@
  * Actions for setting up automatic ping configuration for a weblog.
  *
  * @struts.action name="pingSetupForm" path="/editor/pingSetup" scope="request" parameter="method"
- * @struts.action-forward name="pingSetup.page" path="/weblog/Pings.jsp"
- * @struts.action-forward name="pingResult.page" path="/weblog/PingResult.jsp"
+ * @struts.action-forward name="pingSetup.page" path=".Pings"
+ * @struts.action-forward name="pingResult.page" path=".PingResult"
  */
 public class PingSetupAction extends DispatchAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/ReferersAction.java Wed Aug 10 12:43:40 2005
@@ -28,7 +28,7 @@
  * @struts.action name="refererForm" path="/editor/referers"
  *      scope="session" parameter="method"
  * 
- * @struts.action-forward name="referers.page" path="/weblog/referers.jsp"
+ * @struts.action-forward name="referers.page" path=".referers"
  */
 public class ReferersAction extends DispatchAction
 {    

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java Wed Aug 10 12:43:40 2005
@@ -76,8 +76,8 @@
  * @struts.action name="weblogEntryFormEx" path="/editor/weblog"
  *     scope="request" parameter="method"
  *  
- * @struts.action-forward name="weblogEdit.page" path="/weblog/WeblogEdit.jsp"
- * @struts.action-forward name="weblogEntryRemove.page" path="/weblog/WeblogEntryRemove.jsp"
+ * @struts.action-forward name="weblogEdit.page" path=".WeblogEdit"
+ * @struts.action-forward name="weblogEntryRemove.page" path=".WeblogEntryRemove"
  */
 public final class WeblogEntryFormAction extends DispatchAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogQueryAction.java Wed Aug 10 12:43:40 2005
@@ -26,7 +26,7 @@
  * @struts.action path="/editor/weblogQuery" name="weblogQueryForm" 
  *     scope="session" parameter="method"
  * 
- * @struts.action-forward name="weblogQuery.page" path="/weblog/WeblogQuery.jsp"
+ * @struts.action-forward name="weblogQuery.page" path=".WeblogQuery"
  */
 public final class WeblogQueryAction extends DispatchAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CommonPingTargetsAction.java Wed Aug 10 12:43:40 2005
@@ -25,9 +25,9 @@
  * Administer common ping targets.
  *
  * @struts.action name="pingTargetForm" path="/admin/commonPingTargets" scope="request" parameter="method"
- * @struts.action-forward name="pingTargets.page" path="/website/CommonPingTargets.jsp"
- * @struts.action-forward name="pingTargetEdit.page" path="/website/CommonPingTargetEdit.jsp"
- * @struts.action-forward name="pingTargetDeleteOK.page" path="/website/CommonPingTargetDeleteOK.jsp"
+ * @struts.action-forward name="pingTargets.page" path=".CommonPingTargets"
+ * @struts.action-forward name="pingTargetEdit.page" path=".CommonPingTargetEdit"
+ * @struts.action-forward name="pingTargetDeleteOK.page" path=".CommonPingTargetDeleteOK"
  */
 public class CommonPingTargetsAction extends BasePingTargetsAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/CreateWebsiteAction.java Wed Aug 10 12:43:40 2005
@@ -34,8 +34,8 @@
  * Allows user to create a new website.
  * 
  * @struts.action path="/editor/createWebsite" parameter="method" name="createWebsiteForm"
- * @struts.action-forward name="createWebsite.page" path="/website/CreateWebsite.jsp"
- * @struts.action-forward name="createWebsiteDone.page" path="/website/CreateWebsiteDone.jsp"
+ * @struts.action-forward name="createWebsite.page" path=".CreateWebsite"
+ * @struts.action-forward name="createWebsiteDone.page" path=".CreateWebsiteDone"
  */
 public class CreateWebsiteAction extends DispatchAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java Wed Aug 10 12:43:40 2005
@@ -43,8 +43,8 @@
  * Allows website admin to invite new members to website.
  * 
  * @struts.action path="/editor/inviteMember" parameter="method" name="inviteMemberForm"
- * @struts.action-forward name="inviteMember.page"     path="/website/InviteMember.jsp"
- * @struts.action-forward name="inviteMemberDone.page" path="/website/InviteMemberDone.jsp"
+ * @struts.action-forward name="inviteMember.page"     path=".InviteMember"
+ * @struts.action-forward name="inviteMemberDone.page" path=".InviteMemberDone"
  */
 public class InviteMemberAction extends DispatchAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MaintenanceAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MaintenanceAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MaintenanceAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MaintenanceAction.java Wed Aug 10 12:43:40 2005
@@ -33,7 +33,7 @@
  * 
  * @struts.action path="/editor/maintenance" name="maintenanceForm" scope="request" parameter="method"
  * 
- * @struts.action-forward name="maintenance.page" path="/website/Maintenance.jsp"
+ * @struts.action-forward name="maintenance.page" path=".Maintenance"
  */
 public class MaintenanceAction extends DispatchAction 
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/MemberPermissionsAction.java Wed Aug 10 12:43:40 2005
@@ -30,7 +30,7 @@
  * Allows website admin to change website member permissions.
  * 
  * @struts.action path="/editor/memberPermissions" parameter="method" name="memberPermissionsForm"
- * @struts.action-forward name="memberPermissions.page" path="/website/MemberPermissions.jsp"
+ * @struts.action-forward name="memberPermissions.page" path=".MemberPermissions"
  */
 public class MemberPermissionsAction extends DispatchAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/RollerPropertiesAction.java Wed Aug 10 12:43:40 2005
@@ -44,7 +44,7 @@
  *  scope="request" parameter="method"
  *
  * @struts.action-forward name="rollerProperties.page"
- *  path="/website/rollerProperties.jsp"
+ *  path=".rollerProperties"
  */
 public class RollerPropertiesAction extends DispatchAction {
     

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/ThemeEditorAction.java Wed Aug 10 12:43:40 2005
@@ -40,7 +40,7 @@
  * @struts.action name="themeEditorForm" path="/editor/themeEditor"
  *    scope="session" parameter="method"
  *
- * @struts.action-forward name="editTheme.page" path="/website/theme-editor.jsp"
+ * @struts.action-forward name="editTheme.page" path=".theme-editor"
  */
 public class ThemeEditorAction extends DispatchAction {
     

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UploadFileFormAction.java Wed Aug 10 12:43:40 2005
@@ -35,7 +35,7 @@
  * @struts.action name="uploadFiles" path="/editor/uploadFiles"
  *  	parameter="method" scope="request" validate="false"
  * 
- * @struts.action-forward name="uploadFiles.page" path="/website/upload-file.jsp"
+ * @struts.action-forward name="uploadFiles.page" path=".upload-file"
  */
 public final class UploadFileFormAction extends DispatchAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserAdminAction.java Wed Aug 10 12:43:40 2005
@@ -34,7 +34,7 @@
  * @struts.action name="userAdminForm" path="/admin/user"
  *  	scope="request" parameter="method"
  * 
- * @struts.action-forward name="adminUser.page" path="/website/UserAdmin.jsp"
+ * @struts.action-forward name="adminUser.page" path=".UserAdmin"
  */
 public final class UserAdminAction extends UserBaseAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/UserNewAction.java Wed Aug 10 12:43:40 2005
@@ -38,8 +38,8 @@
  * @struts.action name="userFormEx" path="/user" 
  * 		scope="session" parameter="method"
  * 
- * @struts.action-forward name="registerUser.page" path="/website/UserNew.jsp"
- * @struts.action-forward name="welcome.page" path="/website/welcome.jsp"
+ * @struts.action-forward name="registerUser.page" path=".UserNew"
+ * @struts.action-forward name="welcome.page" path=".welcome"
  */
 public class UserNewAction extends UserBaseAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WeblogTemplateFormAction.java Wed Aug 10 12:43:40 2005
@@ -39,9 +39,9 @@
  * @struts.action name="weblogTemplateForm" path="/editor/page"
  *  	scope="session" parameter="method"
  * 
- * @struts.action-forward name="removePage.page" path="/website/remove-page.jsp"
- * @struts.action-forward name="editPage.page" path="/website/edit-page.jsp"
- * @struts.action-forward name="editPages.page" path="/website/edit-pages.jsp"
+ * @struts.action-forward name="removePage.page" path=".remove-page"
+ * @struts.action-forward name="editPage.page" path=".edit-page"
+ * @struts.action-forward name="editPages.page" path=".edit-pages"
  */
 public final class WeblogTemplateFormAction extends DispatchAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java Wed Aug 10 12:43:40 2005
@@ -43,7 +43,7 @@
  * @struts.action name="websiteFormEx" path="/editor/website" 
  * 		scope="session" parameter="method"
  * 
- * @struts.action-forward name="editWebsite.page" path="/website/edit-website.jsp"
+ * @struts.action-forward name="editWebsite.page" path=".edit-website"
  */
 public final class WebsiteFormAction extends DispatchAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourProfileAction.java Wed Aug 10 12:43:40 2005
@@ -30,7 +30,7 @@
  * Allows user to edit his/her profile.
  * 
  * @struts.action name="userFormEx" path="/editor/yourProfile" parameter="method"
- * @struts.action-forward name="yourProfile.page" path="/website/YourProfile.jsp"
+ * @struts.action-forward name="yourProfile.page" path=".YourProfile"
  */
 public class YourProfileAction extends UserBaseAction
 {

Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/YourWebsitesAction.java Wed Aug 10 12:43:40 2005
@@ -29,7 +29,7 @@
  * Allows user to view and pick from list of his/her websites.
  * 
  * @struts.action path="/editor/yourWebsites" name="yourWebsitesForm" parameter="method"
- * @struts.action-forward name="yourWebsites.page" path="/website/YourWebsites.jsp"
+ * @struts.action-forward name="yourWebsites.page" path=".YourWebsites"
  */
 public class YourWebsitesAction extends DispatchAction
 {

Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties Wed Aug 10 12:43:40 2005
@@ -1154,7 +1154,7 @@
 welcome.addressIs=Your new Weblog's address is
 welcome.rssAddressIs=Your main newsfeed address is
 welcome.clickHere=Click here
-welcome.toLoginAndPost=to login and post your first Weblog entry.
+welcome.toLoginAndPost=to login.
 
 # ----------------------------------------------------------------- Your profile
 

Added: incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml?rev=231301&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml (added)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml Wed Aug 10 12:43:40 2005
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8" ?>
+ <!DOCTYPE tiles-definitions PUBLIC
+       "-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
+       "http://jakarta.apache.org/struts/dtds/tiles-config_1_1.dtd">
+<tiles-definitions>
+
+<definition name=".tiles-mainpage" path="/theme/tiles-mainpage.jsp">
+   <put name="content" value="${content}" />
+   <put name="sidebar" value="/theme/status.jsp" />
+</definition>
+
+<!-- for example
+<definition name=".tiles-editorpage" path="/tiles/tiles-mainpage.jsp">
+</definition>
+<definition name=".tiles-adminpage" path="/tiles/tiles-mainpage.jsp">
+</definition>
+<definition name=".tiles-basicpage" path="/tiles/tiles-basicpage.jsp">
+</definition>
+-->
+
+    
+<definition name=".main" extends=".tiles-mainpage" >
+    <put name="content" value="/main.jsp" />
+    <put name="sidebar" value="/main-sidebar.jsp" />
+</definition>
+<definition name=".planet" extends=".tiles-mainpage" >
+    <put name="content" value="/planet.jsp" />
+</definition>
+
+
+<definition name=".WeblogEdit" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/WeblogEdit.jsp" />
+    <put name="sidebar" value="/weblog/WeblogEditSidebar.jsp" />
+</definition>
+<definition name=".WeblogQuery" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/WeblogQuery.jsp" />
+</definition>
+<definition name=".CategoriesForm" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/CategoriesForm.jsp" />
+    <put name="sidebar" value="/weblog/CategoriesSidebar.jsp" />
+</definition>
+<definition name=".CategoryDeleteOK" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/CategoryDeleteOK.jsp" />
+</definition>
+<definition name=".CategoryForm" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/CategoryForm.jsp" />
+</definition>
+<definition name=".export-entries" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/export-entries.jsp" />
+</definition>
+<definition name=".CustomPingTargetEdit" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/CustomPingTargetEdit.jsp" />
+</definition>
+<definition name=".PingResult" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/PingResult.jsp" />
+</definition>
+<definition name=".spellcheck-entry" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/spellcheck-entry.jsp" />
+</definition>
+<definition name=".Pings" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/Pings.jsp" />
+</definition>
+<definition name=".CustomPingTargetDeleteOK" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/CustomPingTargetDeleteOK.jsp" />
+</definition>
+<definition name=".referers" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/referers.jsp" />
+</definition>
+<definition name=".bake-weblog" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/bake-weblog.jsp" />
+</definition>
+<definition name=".WeblogEntryRemove" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/WeblogEntryRemove.jsp" />
+</definition>
+<definition name=".CustomPingTargets" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/CustomPingTargets.jsp" />
+</definition>
+<definition name=".import-entries" extends=".tiles-mainpage" >
+    <put name="content" value="/weblog/import-entries.jsp" />
+</definition>
+
+
+<definition name=".PlanetSubscriptions" extends=".tiles-mainpage" >
+    <put name="content" value="/planet/PlanetSubscriptions.jsp" />
+</definition>
+<definition name=".PlanetConfig" extends=".tiles-mainpage" >
+    <put name="content" value="/planet/PlanetConfig.jsp" />
+</definition>
+<definition name=".PlanetGroups" extends=".tiles-mainpage" >
+    <put name="content" value="/planet/PlanetGroups.jsp" />
+</definition>
+
+
+<definition name=".BookmarksForm" extends=".tiles-mainpage" >
+    <put name="content" value="/bookmarks/BookmarksForm.jsp" />
+    <put name="sidebar" value="/weblog/BookmarksSidebar.jsp" />
+</definition>
+<definition name=".BookmarkForm" extends=".tiles-mainpage" >
+    <put name="content" value="/bookmarks/BookmarkForm.jsp" />
+</definition>
+<definition name=".import" extends=".tiles-mainpage" >
+    <put name="content" value="/bookmarks/import.jsp" />
+</definition>
+<definition name=".FolderForm" extends=".tiles-mainpage" >
+    <put name="content" value="/bookmarks/FolderForm.jsp" />
+</definition>
+
+
+<definition name=".InviteMemberDone" extends=".tiles-mainpage" >
+    <put name="content" value="/website/InviteMemberDone.jsp" />
+</definition>
+<definition name=".edit-website" extends=".tiles-mainpage" >
+    <put name="content" value="/website/edit-website.jsp" />
+</definition>
+<definition name=".InviteMember" extends=".tiles-mainpage" >
+    <put name="content" value="/website/InviteMember.jsp" />
+</definition>
+<definition name=".CreateWebsite" extends=".tiles-mainpage" >
+    <put name="content" value="/website/CreateWebsite.jsp" />
+</definition>
+<definition name=".theme-editor" extends=".tiles-mainpage" >
+    <put name="content" value="/website/theme-editor.jsp" />
+</definition>
+<definition name=".UserAdmin" extends=".tiles-mainpage" >
+    <put name="content" value="/website/UserAdmin.jsp" />
+</definition>
+<definition name=".UserNew" extends=".tiles-mainpage" >
+    <put name="content" value="/website/UserNew.jsp" />
+</definition>
+<definition name=".welcome" extends=".tiles-mainpage" >
+    <put name="content" value="/website/welcome.jsp" />
+</definition>
+<definition name=".edit-page" extends=".tiles-mainpage"  >
+    <put name="content" value="/website/edit-page.jsp" />
+</definition>
+<definition name=".CommonPingTargetDeleteOK" extends=".tiles-mainpage" >
+    <put name="content" value="/website/CommonPingTargetDeleteOK.jsp" />
+</definition>
+<definition name=".CommonPingTargetEdit" extends=".tiles-mainpage" >
+    <put name="content" value="/website/CommonPingTargetEdit.jsp" />
+</definition>
+<definition name=".CreateWebsiteDone" extends=".tiles-mainpage" >
+    <put name="content" value="/website/CreateWebsiteDone.jsp" />
+</definition>
+<definition name=".YourWebsitesSidebar" extends=".tiles-mainpage" >
+    <put name="content" value="/website/YourWebsitesSidebar.jsp" />
+</definition>
+<definition name=".CommonPingTargets" extends=".tiles-mainpage" >
+    <put name="content" value="/website/CommonPingTargets.jsp" />
+</definition>
+<definition name=".upload-file" extends=".tiles-mainpage" >
+    <put name="content" value="/website/upload-file.jsp" />
+</definition>
+<definition name=".MemberPermissions" extends=".tiles-mainpage" >
+    <put name="content" value="/website/MemberPermissions.jsp" />
+</definition>
+<definition name=".YourWebsites" extends=".tiles-mainpage" >
+    <put name="content" value="/website/YourWebsites.jsp" />
+</definition>
+<definition name=".remove-page" extends=".tiles-mainpage"  >
+    <put name="content" value="/website/remove-page.jsp" />
+</definition>
+<definition name=".rollerProperties" extends=".tiles-mainpage" >
+    <put name="content" value="/website/rollerProperties.jsp" />
+</definition>
+<definition name=".YourProfile" extends=".tiles-mainpage" >
+    <put name="content" value="/website/YourProfile.jsp" />
+</definition>
+<definition name=".edit-pages" extends=".tiles-mainpage"  >
+    <put name="content" value="/website/edit-pages.jsp" />
+</definition>
+<definition name=".Maintenance" extends=".tiles-mainpage" >
+    <put name="content" value="/website/Maintenance.jsp" />
+</definition>
+
+
+<definition name=".taglibs" extends=".tiles-mainpage" >
+    <put name="content" value="/taglibs.jsp" />
+</definition>
+<definition name=".denied" extends=".tiles-mainpage" >
+    <put name="content" value="/denied.jsp" />
+</definition>
+<definition name=".error" extends=".tiles-mainpage" >
+    <put name="content" value="/error.jsp" />
+</definition>
+<definition name=".login" extends=".tiles-mainpage" >
+    <put name="content" value="/login.jsp" />
+</definition>
+<definition name=".error403" extends=".tiles-mainpage" >
+    <put name="content" value="/error403.jsp" />
+</definition>
+<definition name=".error404" extends=".tiles-mainpage" >
+    <put name="content" value="/error404.jsp" />
+</definition>
+<definition name=".loginerror" extends=".tiles-mainpage" >
+    <put name="content" value="/loginerror.jsp" />
+</definition>
+    
+</tiles-definitions>
+
+

Modified: incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp Wed Aug 10 12:43:40 2005
@@ -1,5 +1,5 @@
 <%@ include file="/taglibs.jsp" %>
-
+<%@ include file="/theme/status.jsp" %>
 <table class="sidebarBox" >
     <tr>
        <td class="sidebarBox">

Modified: incubator/roller/branches/roller_2.0/web/error.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/error.jsp?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/error.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/error.jsp Wed Aug 10 12:43:40 2005
@@ -21,7 +21,7 @@
 <% try { %>
    <roller:NavigationBar/>    	
 <% } 
-catch (Exception e) 
+catch (Throwable e) 
 {
    System.err.println("ERROR: while displaying error page error page");
    e.printStackTrace();
@@ -40,12 +40,12 @@
 typeObj = request.getAttribute("javax.servlet.error.type");
 
 String code=null, message=null, type=null;
-if ( null != codeObj ) code = codeObj.toString();
+if ( null != codeObj )       code = codeObj.toString();
 if ( null != messageObj ) message = messageObj.toString();
-if ( null != typeObj ) type = typeObj.toString();
+if ( null != typeObj )       type = typeObj.toString();
 String reason = null != code ? code : type;
 
-exception = (Exception)request.getAttribute("javax.servlet.error.exception");
+exception = (Throwable)request.getAttribute("javax.servlet.error.exception");
 %>
 <br />
 <h2 class="error"><fmt:message key="errorPage.title" /></h2>
@@ -92,6 +92,6 @@
 </body>
 </html>
 
-<% } catch (Exception e) { e.printStackTrace(); } %>
+<% } catch (Throwable e) { e.printStackTrace(); } %>
 
     

Modified: incubator/roller/branches/roller_2.0/web/login.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/login.jsp?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/login.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/login.jsp Wed Aug 10 12:43:40 2005
@@ -1,11 +1,37 @@
+<% response.setContentType("text/html; charset=UTF-8"); %><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <%@ include file="/taglibs.jsp" %>
 <% request.setAttribute("secure_login", 
     org.roller.config.RollerConfig.getProperty("securelogin.enabled")); %>
 <c:if test='${secure_login == "true"}' >
   <roller:secure mode="secured" />
 </c:if>
-
-<%@ include file="/theme/header.jsp" %>
+<% try { %><html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <title><%= RollerRuntimeConfig.getProperty("site.name") %></title>
+    <%-- this is included so cached pages can still set contentType --%>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script type="text/javascript"
+        src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>    
+    <link rel="stylesheet" type="text/css" media="all"
+         href="<%= request.getContextPath() %>/theme/layout.css" />
+    <link rel="stylesheet" type="text/css" media="all"
+         href="<%= request.getContextPath() %>/theme/roller.css" />
+    <link rel="stylesheet" type="text/css" media="all"
+         href="<%= request.getContextPath() %>/theme/menu.css" />
+    <link rel="stylesheet" type="text/css" media="all"
+         href="<%= request.getContextPath() %>/theme/calendar.css" />        
+    <script type="text/javascript"
+        src="<%= request.getContextPath() %>/tags/calendar.js"></script>
+    <script type="text/javascript"
+        src="<%= request.getContextPath() %>/theme/scripts/overlib.js"
+        ><!-- overLIB (c) Erik Bosrup --></script>       
+</head>
+<body>
+
+<div id="wrapper">
+    
+<div id="banner">
+</div>
 
 <div id="loginTable">
 
@@ -80,8 +106,19 @@
 }
 //-->
 </script>
+    
+</div> <!-- end centercontent --> 
+
+</div>
 
+<div id="rightcontent"> 
+   <tiles:insert attribute="sidebar" />
 </div>
 
-<%@ include file="/theme/footer.jsp" %>
+</div> <!-- end wrapper -->
+
+</body>
+</html>
+
+<% } catch (Exception e) { e.printStackTrace(); } %>
 

Modified: incubator/roller/branches/roller_2.0/web/main-sidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/main-sidebar.jsp?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/main-sidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/main-sidebar.jsp Wed Aug 10 12:43:40 2005
@@ -1,5 +1,7 @@
 <%@ include file="/taglibs.jsp" %>
 
+<%@ include file="/theme/status.jsp" %>
+
 <table class="sidebarBox">
 
     <tr>

Modified: incubator/roller/branches/roller_2.0/web/taglibs.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/taglibs.jsp?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/taglibs.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/taglibs.jsp Wed Aug 10 12:43:40 2005
@@ -4,6 +4,7 @@
 taglib uri="http://struts.apache.org/tags-bean"  prefix="bean" %><%@ 
 taglib uri="http://struts.apache.org/tags-html"  prefix="html" %><%@ 
 taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %><%@ 
+taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %><%@ 
 taglib uri="http://jakarta.apache.org/taglibs/string-1.0.1" prefix="str" %><%@ 
 taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %><%@ 
 page import="org.roller.model.Roller" %><%@ 

Modified: incubator/roller/branches/roller_2.0/web/theme/footer.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/footer.jsp?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/footer.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/footer.jsp Wed Aug 10 12:43:40 2005
@@ -1,39 +1,5 @@
 
-<br />
-<br />
+<%-- replaced by tiles --%>
 
-        <div id="footer" class="clearfix">
-            <a href="http://www.rollerweblogger.org">
-                Powered by Roller Weblogger</a> | 
-                
-            <a href="http://opensource.atlassian.com/projects/roller/Dashboard.jspa">
-                <fmt:message key="footer.reportIssue" /></a> | 
-                
-            <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=UserGuide">
-                <fmt:message key="footer.userGuide" /></a> | 
-                
-            <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=RollerMacros">
-                <fmt:message key="footer.macros" /></a> | 
-                
-            <a href="http://sourceforge.net/mail/?group_id=47722">
-                <fmt:message key="footer.mailingLists" /></a>
-        </div><!-- end footer -->
-    
-</div> <!-- end centercontent --> 
 
-<div id="rightcontent"> 
-    <c:import url="/theme/status.jsp" />
-    <c:if test="${!empty leftPage}">
-        <c:import url="${leftPage}" />
-    </c:if>
-</div>
 
-</div> <!-- end wrapper -->
-
-</body>
-</html>
-
-<% } catch (Exception e) { e.printStackTrace(); } %>
-
-
-

Modified: incubator/roller/branches/roller_2.0/web/theme/header.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/header.jsp?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/header.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/header.jsp Wed Aug 10 12:43:40 2005
@@ -1,35 +1,3 @@
-<% response.setContentType("text/html; charset=UTF-8"); %><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<% try { %><html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title><%= RollerRuntimeConfig.getProperty("site.name") %></title>
-    <%-- this is included so cached pages can still set contentType --%>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <script type="text/javascript"
-        src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>    
-    <link rel="stylesheet" type="text/css" media="all"
-         href="<%= request.getContextPath() %>/theme/layout.css" />
-    <link rel="stylesheet" type="text/css" media="all"
-         href="<%= request.getContextPath() %>/theme/roller.css" />
-    <link rel="stylesheet" type="text/css" media="all"
-         href="<%= request.getContextPath() %>/theme/menu.css" />
-    <link rel="stylesheet" type="text/css" media="all"
-         href="<%= request.getContextPath() %>/theme/calendar.css" />        
-    <script type="text/javascript"
-        src="<%= request.getContextPath() %>/tags/calendar.js"></script>
-    <script type="text/javascript"
-        src="<%= request.getContextPath() %>/theme/scripts/overlib.js"
-        ><!-- overLIB (c) Erik Bosrup --></script>       
-</head>
-<body>
-
-<div id="wrapper">
-    
-<div id="banner">
-</div>
-  
-<div id="centercontent">
-
-    <roller:Menu model="editor-menu.xml" view="/menu-tabbed.vm" />
 
-    <%@ include file="messages.jsp" %>
+<%-- replaced by tiles --%>
 

Added: incubator/roller/branches/roller_2.0/web/theme/tiles-mainpage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-mainpage.jsp?rev=231301&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-mainpage.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-mainpage.jsp Wed Aug 10 12:43:40 2005
@@ -0,0 +1,65 @@
+<% response.setContentType("text/html; charset=UTF-8"); %><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@ include file="/taglibs.jsp" %>
+<% try { %><html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <title><%= RollerRuntimeConfig.getProperty("site.name") %></title>
+    <%-- this is included so cached pages can still set contentType --%>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <script type="text/javascript"
+        src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>    
+    <link rel="stylesheet" type="text/css" media="all"
+         href="<%= request.getContextPath() %>/theme/layout.css" />
+    <link rel="stylesheet" type="text/css" media="all"
+         href="<%= request.getContextPath() %>/theme/roller.css" />
+    <link rel="stylesheet" type="text/css" media="all"
+         href="<%= request.getContextPath() %>/theme/menu.css" />
+    <link rel="stylesheet" type="text/css" media="all"
+         href="<%= request.getContextPath() %>/theme/calendar.css" />        
+    <script type="text/javascript"
+        src="<%= request.getContextPath() %>/tags/calendar.js"></script>
+    <script type="text/javascript"
+        src="<%= request.getContextPath() %>/theme/scripts/overlib.js"
+        ><!-- overLIB (c) Erik Bosrup --></script>       
+</head>
+<body>
+
+<div id="wrapper">
+    
+<div id="banner">
+</div>
+  
+<div id="centercontent">
+    <roller:Menu model="editor-menu.xml" view="/menu-tabbed.vm" />   
+    <br />
+    <br />
+    <tiles:insert attribute="content" />
+    
+    <div id="footer" class="clearfix">
+        <a href="http://www.rollerweblogger.org">
+            Powered by Roller Weblogger</a> | 
+
+        <a href="http://opensource.atlassian.com/projects/roller/Dashboard.jspa">
+            <fmt:message key="footer.reportIssue" /></a> | 
+
+        <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=UserGuide">
+            <fmt:message key="footer.userGuide" /></a> | 
+
+        <a href="http://www.rollerweblogger.org/wiki/Wiki.jsp?page=RollerMacros">
+            <fmt:message key="footer.macros" /></a> | 
+
+        <a href="http://sourceforge.net/mail/?group_id=47722">
+            <fmt:message key="footer.mailingLists" /></a>
+    </div><!-- end footer -->
+    
+</div> <!-- end centercontent --> 
+
+<div id="rightcontent"> 
+   <tiles:insert attribute="sidebar" />
+</div>
+
+</div> <!-- end wrapper -->
+
+</body>
+</html>
+
+<% } catch (Exception e) { e.printStackTrace(); } %>

Modified: incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp Wed Aug 10 12:43:40 2005
@@ -1,5 +1,7 @@
 <%@ include file="/taglibs.jsp" %>
 
+<%@ include file="/theme/status.jsp" %>
+
 <table class="sidebarBox" >
     <tr>
        <td class="sidebarBox">

Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp?rev=231301&r1=231300&r2=231301&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp Wed Aug 10 12:43:40 2005
@@ -5,6 +5,8 @@
 WeblogEntryPageModel model = (WeblogEntryPageModel)request.getAttribute("model");
 %>
 
+<%@ include file="/theme/status.jsp" %>
+
 <table class="sidebarBox" >
     <tr>
        <td class="sidebarBox">



Mime
View raw message