roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r467435 - in /incubator/roller/trunk/sandbox/planetroller: src/org/apache/roller/planet/tasks/ src/org/apache/roller/planet/ui/forms/ web/ web/WEB-INF/ web/WEB-INF/classes/ web/WEB-INF/scripts/ web/images/ web/planet-ui/ web/planet-ui/admin...
Date Tue, 24 Oct 2006 18:48:54 GMT
Author: snoopdave
Date: Tue Oct 24 11:48:53 2006
New Revision: 467435

URL: http://svn.apache.org/viewvc?view=rev&rev=467435
Log:
Refactoring, webapp directory structure adjusting and bug fixing in Planet Roller webapp

Added:
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/scripts/
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/scripts/genplanet.sh
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/scripts/planet-custom.properties
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/configForm.jsp
      - copied, changed from r467333, incubator/roller/trunk/sandbox/planetroller/web/planet-ui/configForm.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/groupForm.jsp
      - copied, changed from r467333, incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupForm.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/groupsList.jsp
      - copied, changed from r467333, incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupsList.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/menu.jsp
      - copied, changed from r467333, incubator/roller/trunk/sandbox/planetroller/web/planet-ui/menu.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/subscriptionForm.jsp
      - copied, changed from r467333, incubator/roller/trunk/sandbox/planetroller/web/planet-ui/subscriptionForm.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/error.jsp
      - copied, changed from r467333, incubator/roller/trunk/sandbox/planetroller/web/error.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/images/
      - copied from r467354, incubator/roller/trunk/sandbox/planetroller/web/images/
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/login.jsp
      - copied, changed from r467333, incubator/roller/trunk/sandbox/planetroller/web/login.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/logout.jsp
      - copied unchanged from r467333, incubator/roller/trunk/sandbox/planetroller/web/logout.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/main.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/planet.css
      - copied, changed from r467333, incubator/roller/trunk/sandbox/planetroller/web/planet.css
Removed:
    incubator/roller/trunk/sandbox/planetroller/web/error.jsp
    incubator/roller/trunk/sandbox/planetroller/web/images/body-bg-grey.png
    incubator/roller/trunk/sandbox/planetroller/web/images/delete.png
    incubator/roller/trunk/sandbox/planetroller/web/images/feed_add.png
    incubator/roller/trunk/sandbox/planetroller/web/images/feed_link.png
    incubator/roller/trunk/sandbox/planetroller/web/images/folder_add.png
    incubator/roller/trunk/sandbox/planetroller/web/images/folder_feed.png
    incubator/roller/trunk/sandbox/planetroller/web/images/page_white_world.png
    incubator/roller/trunk/sandbox/planetroller/web/images/th-bg-grey.png
    incubator/roller/trunk/sandbox/planetroller/web/images/world_link.png
    incubator/roller/trunk/sandbox/planetroller/web/login.jsp
    incubator/roller/trunk/sandbox/planetroller/web/logout.jsp
    incubator/roller/trunk/sandbox/planetroller/web/main.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/configForm.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupForm.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupsList.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/menu.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/subscriptionForm.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet.css
Modified:
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/GeneratePlanetTask.java
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/faces-config.xml
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/web.xml

Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/GeneratePlanetTask.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/GeneratePlanetTask.java?view=diff&rev=467435&r1=467434&r2=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/GeneratePlanetTask.java
(original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/tasks/GeneratePlanetTask.java
Tue Oct 24 11:48:53 2006
@@ -39,12 +39,13 @@
 /**
  * Updates Planet aggregator's database of feed entries and generates Planet
  * files based on those entries and the Planet configuration. 
- *
+ * <pre>
  * - Designed to be run outside of Roller via the TaskRunner class
  * - Calls Planet business layer to refresh entries
  * - Uses PlanetConfig properties for templateDir, outputDir and template name
  * - Creates outputdir and a subdirectory for each group
  * - Uses Velocity Texen to generate the static files
+ * </pre>
  */
 public class GeneratePlanetTask implements Runnable {
     private static Log log = LogFactory.getLog(GeneratePlanetTask.class);

Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java?view=diff&rev=467435&r1=467434&r2=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java
(original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java
Tue Oct 24 11:48:53 2006
@@ -56,6 +56,11 @@
         return load((HttpServletRequest)fctx.getExternalContext().getRequest());
     }
     
+    public String add() throws Exception {
+        group = new PlanetGroupData();
+        return "editGroup";
+    }
+    
     public String save() throws Exception {
         log.info("Saving Group...");
         Planet planet = PlanetFactory.getPlanet();

Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java?view=diff&rev=467435&r1=467434&r2=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java
(original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/SubscriptionForm.java
Tue Oct 24 11:48:53 2006
@@ -28,7 +28,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
 import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.business.PlanetManager;
 import org.apache.roller.planet.pojos.PlanetGroupData;
@@ -50,10 +49,13 @@
     
     public String load(HttpServletRequest request) throws Exception {
         log.info("Loading Subscription...");
-        String subid = request.getParameter("subid");
-        if (subid != null) {
+        subid = request.getParameter("subid");
+        groupid = request.getParameter("groupid");
+        if (StringUtils.isNotEmpty(subid)) {
             PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
-            setSubscription(pmgr.getSubscriptionById(subid));
+            subscription = pmgr.getSubscriptionById(subid);
+        } else {
+            subscription = new PlanetSubscriptionData();            
         }
         groupid = request.getParameter("groupid");        
         return "editSubscription";
@@ -64,6 +66,11 @@
         return load((HttpServletRequest)fctx.getExternalContext().getRequest());
     }
     
+    public String add() throws Exception {
+        FacesContext fctx = FacesContext.getCurrentInstance();
+        return load((HttpServletRequest)fctx.getExternalContext().getRequest());
+    } 
+    
     public String save() throws Exception {
         log.info("Saving Subscription...");                
         PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
@@ -75,13 +82,16 @@
             dbsub.setSiteURL(subscription.getSiteURL());
             pmgr.saveSubscription(dbsub); 
         } else {
-            pmgr.saveSubscription(subscription);
-            // if we've got a group, add subscription to it
-            if (groupid != null) {
-                PlanetGroupData group = pmgr.getGroupById(groupid);
-                group.getSubscriptions().add(subscription);
-                pmgr.saveGroup(group);
+            PlanetSubscriptionData existingSub = pmgr.getSubscription(subscription.getFeedURL());
+            if (existingSub != null) {
+                subscription = existingSub;
             }
+            else { 
+                pmgr.saveSubscription(subscription);
+            }
+            PlanetGroupData group = pmgr.getGroupById(groupid);
+            group.getSubscriptions().add(subscription);
+            pmgr.saveGroup(group);
         }
         PlanetFactory.getPlanet().flush();
         return "editSubscription";
@@ -95,10 +105,6 @@
         return subscription;
     }
 
-    public void setSubscription(PlanetSubscriptionData subscription) {
-        this.subscription = subscription;
-    }
-    
     public String getGroupid() {
         return groupid;
     }

Modified: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties?view=diff&rev=467435&r1=467434&r2=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties
(original)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties
Tue Oct 24 11:48:53 2006
@@ -1,7 +1,7 @@
 
 # application wide
 
-appTitle=Planet admin console
+appTitle=Planet Roller admin console
 appHome=Home
 appConfig=Config
 appGroups=Groups
@@ -79,7 +79,7 @@
 
 # login.jsp
 
-loginPageTitle=Login to Planet admin console
+loginPageTitle=Login to Planet Roller admin console
 loginUsername=Username
 loginPassword=Password
 loginButton=Login

Modified: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/faces-config.xml?view=diff&rev=467435&r1=467434&r2=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/faces-config.xml (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/faces-config.xml Tue Oct 24 11:48:53
2006
@@ -30,28 +30,28 @@
     <from-view-id>/*</from-view-id>
     <navigation-case>
       <from-outcome>editConfig</from-outcome>
-      <to-view-id>/planet-ui/configForm.faces</to-view-id>
+      <to-view-id>/planet-ui/admin/configForm.faces</to-view-id>
     </navigation-case>
   </navigation-rule>
   <navigation-rule>
     <from-view-id>/*</from-view-id>
     <navigation-case>
       <from-outcome>editGroups</from-outcome>
-      <to-view-id>/planet-ui/groupsList.faces</to-view-id>
+      <to-view-id>/planet-ui/admin/groupsList.faces</to-view-id>
     </navigation-case>
   </navigation-rule>
   <navigation-rule>
     <from-view-id>/*</from-view-id>
     <navigation-case>
       <from-outcome>editGroup</from-outcome>
-      <to-view-id>/planet-ui/groupForm.faces</to-view-id>
+      <to-view-id>/planet-ui/admin/groupForm.faces</to-view-id>
     </navigation-case>
   </navigation-rule>
   <navigation-rule>
     <from-view-id>/*</from-view-id>
     <navigation-case>
       <from-outcome>editSubscription</from-outcome>
-      <to-view-id>/planet-ui/subscriptionForm.faces</to-view-id>
+      <to-view-id>/planet-ui/admin/subscriptionForm.faces</to-view-id>
     </navigation-case>
   </navigation-rule>
   <navigation-rule>

Added: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/scripts/genplanet.sh
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/scripts/genplanet.sh?view=auto&rev=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/scripts/genplanet.sh (added)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/scripts/genplanet.sh Tue Oct 24
11:48:53 2006
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# -- ENSURE THESE ARE CORRECT ---
+
+# Directory of Roller context
+export WEBAPP_DIR=/export/home/dave/roller_trunk/sandbox/planetroller/build/webapp
+
+# Directory of additional jars
+export JARS_DIR=/export/home/dave/tomcat/common/lib
+
+# Planet configuration override file specifying JDBC connection parameters
+export CONFIG_OVERRIDE=planet-custom.properties
+
+
+# --- SHOULD NOT NEED TO EDIT BELOW THIS LINE ---
+
+# Hack: setting catalina.base=. allows us to save log in ./logs
+
+java \
+    -Dcatalina.base=. \
+    -Dplanet.custom.config=${CONFIG_OVERRIDE} \
+    -cp ${WEBAPP_DIR}/WEB-INF/lib/roller-business.jar \
+    org.apache.roller.business.runnable.TaskRunner \
+    ${WEBAPP_DIR} ${JARS_DIR} \
+    org.apache.roller.planet.tasks.GeneratePlanetTask

Added: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/scripts/planet-custom.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/scripts/planet-custom.properties?view=auto&rev=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/scripts/planet-custom.properties
(added)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/scripts/planet-custom.properties
Tue Oct 24 11:48:53 2006
@@ -0,0 +1,19 @@
+
+# --- ENSURE VALUES ARE CORRECT --- 
+
+jdbc.driverClass=com.mysql.jdbc.Driver
+jdbc.connectionURL=jdbc:mysql://localhost:3306/roller31?autoReconnect=true&amp;useUnicode=true&amp;characterEncoding=utf-8&amp;mysqlEncoding=utf8
+jdbc.username=scott
+jdbc.password=tiger
+
+#jdbc.driverClass=org.apache.derby.jdbc.ClientDriver
+#jdbc.connectionURL=jdbc:derby://localhost:1527/roller31
+#jdbc.username=APP 
+#jdbc.password=APP 
+
+planet.aggregator.cache.dir=/var/planet/cache
+planet.aggregator.output.dir=/export/home/dave/roller_trunk/sandbox/planetroller/build/webapp
+planet.aggregator.template.dir=/export/home/dave/roller_trunk/sandbox/planetroller/build/webapp/WEB-INF/templates
+
+hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+

Modified: incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/web.xml?view=diff&rev=467435&r1=467434&r2=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/web.xml (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/web.xml Tue Oct 24 11:48:53 2006
@@ -53,14 +53,14 @@
     
     <error-page>
         <error-code>500</error-code>
-        <location>/error.faces</location>
+        <location>/planet-ui/error.faces</location>
     </error-page>
     
     <security-constraint>
         <display-name>planet-ui</display-name>
         <web-resource-collection>
             <web-resource-name>planet-ui</web-resource-name>
-            <url-pattern>/planet-ui/*</url-pattern>
+            <url-pattern>/planet-ui/admin/*</url-pattern>
             <http-method>GET</http-method>
             <http-method>POST</http-method>
         </web-resource-collection>
@@ -72,8 +72,8 @@
     <login-config>
         <auth-method>FORM</auth-method>
         <form-login-config>
-            <form-login-page>/login.jsp</form-login-page>
-            <form-error-page>/login.jsp?error=true</form-error-page>
+            <form-login-page>/planet-ui/login.jsp</form-login-page>
+            <form-error-page>/planet-ui/login.jsp?error=true</form-error-page>
         </form-login-config>
     </login-config>
     <security-role>

Copied: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/configForm.jsp (from
r467333, incubator/roller/trunk/sandbox/planetroller/web/planet-ui/configForm.jsp)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/configForm.jsp?view=diff&rev=467435&p1=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/configForm.jsp&r1=467333&p2=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/configForm.jsp&r2=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/configForm.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/configForm.jsp Tue Oct
24 11:48:53 2006
@@ -27,11 +27,11 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title><h:outputText value="#{msgs.configPageTitle}" /></title>
-    <link rel="stylesheet" type="text/css" href='<c:url value="/planet.css" />'
/>
+    <link rel="stylesheet" type="text/css" href='<c:url value="/planet-ui/planet.css"
/>' />
 </head>
 <body>
 <div id="wrapper">
-<%@include file="/planet-ui/menu.jsp" %> 
+<%@include file="/planet-ui/admin/menu.jsp" %> 
 
 <h2><h:outputText value="#{msgs.configFormTitle}" /></h2>
 <p><h:outputText value="#{msgs.configHelp}" /></p>

Copied: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/groupForm.jsp (from
r467333, incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupForm.jsp)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/groupForm.jsp?view=diff&rev=467435&p1=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupForm.jsp&r1=467333&p2=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/groupForm.jsp&r2=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupForm.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/groupForm.jsp Tue Oct
24 11:48:53 2006
@@ -27,11 +27,11 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title><h:outputText value="#{msgs.groupPageTitle}" /></title>
-    <link rel="stylesheet" type="text/css" href='<c:url value="/planet.css" />'
/>
+    <link rel="stylesheet" type="text/css" href='<c:url value="/planet-ui/planet.css"
/>' />
 </head>
 <body>
 <div id="wrapper">    
-<%@include file="/planet-ui/menu.jsp" %> 
+<%@include file="/planet-ui/admin/menu.jsp" %> 
 
 <h2><h:outputText value="#{msgs.groupPageTitle}" /></h2>
 <p><h:outputText value="#{msgs.groupHelp}" /></p>
@@ -123,7 +123,7 @@
 </h:dataTable>
 
 <p />
-<t:commandLink id="addSubscriptionLink" forceId="true" action="#{subscriptionForm.edit}"
>
+<t:commandLink id="addSubscriptionLink" forceId="true" action="#{subscriptionForm.add}"
>
     <h:graphicImage style="" value="../images/feed_add.png"  />
     <h:outputText value="#{msgs.groupAddSubscription}" />
     <f:param name="groupid" value="#{groupForm.group.id}" />

Copied: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/groupsList.jsp (from
r467333, incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupsList.jsp)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/groupsList.jsp?view=diff&rev=467435&p1=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupsList.jsp&r1=467333&p2=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/groupsList.jsp&r2=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/groupsList.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/groupsList.jsp Tue Oct
24 11:48:53 2006
@@ -28,11 +28,11 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title><h:outputText value="#{msgs.groupsPageTitle}" /></title>
-    <link rel="stylesheet" type="text/css" href='<c:url value="/planet.css" />'
/>
+    <link rel="stylesheet" type="text/css" href='<c:url value="/planet-ui/planet.css"
/>' />
 </head>
 <body>
 <div id="wrapper">    
-<%@include file="/planet-ui/menu.jsp" %> 
+<%@include file="/planet-ui/admin/menu.jsp" %> 
 
 <h2><h:outputText value="#{msgs.groupsListTitle}" /></h2>
 <p><h:outputText value="#{msgs.groupsHelp}" /></p>
@@ -80,7 +80,7 @@
 </h:dataTable>
 
 <p />
-<h:commandLink action="#{groupForm.edit}">
+<h:commandLink action="#{groupForm.add}">
     <h:graphicImage value="../images/folder_add.png"  />
     <h:outputText value="#{msgs.groupsAddGroup}" />
 </h:commandLink> 

Copied: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/menu.jsp (from r467333,
incubator/roller/trunk/sandbox/planetroller/web/planet-ui/menu.jsp)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/menu.jsp?view=diff&rev=467435&p1=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/menu.jsp&r1=467333&p2=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/menu.jsp&r2=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/menu.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/menu.jsp Tue Oct 24 11:48:53
2006
@@ -1,5 +1,5 @@
 <h1><h:outputText value="#{msgs.appTitle}" /></h1>
-<a href='<c:url value="/main.faces" />'><h:outputText value="#{msgs.appHome}"
/></a> |
-<a href='<c:url value="/planet-ui/configForm.faces" />'><h:outputText value="#{msgs.appConfig}"
/></a> |
-<a href='<c:url value="/planet-ui/groupsList.faces" />'><h:outputText value="#{msgs.appGroups}"
/></a> |
-<a href='<c:url value="/logout.jsp" />'><h:outputText value="#{msgs.appLogout}"
/></a>
\ No newline at end of file
+<a href='<c:url value="/planet-ui/main.faces" />'><h:outputText value="#{msgs.appHome}"
/></a> |
+<a href='<c:url value="/planet-ui/admin/configForm.faces" />'><h:outputText
value="#{msgs.appConfig}" /></a> |
+<a href='<c:url value="/planet-ui/admin/groupsList.faces" />'><h:outputText
value="#{msgs.appGroups}" /></a> |
+<a href='<c:url value="/planet-ui/logout.jsp" />'><h:outputText value="#{msgs.appLogout}"
/></a>
\ No newline at end of file

Copied: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/subscriptionForm.jsp
(from r467333, incubator/roller/trunk/sandbox/planetroller/web/planet-ui/subscriptionForm.jsp)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/subscriptionForm.jsp?view=diff&rev=467435&p1=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/subscriptionForm.jsp&r1=467333&p2=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/subscriptionForm.jsp&r2=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/subscriptionForm.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/admin/subscriptionForm.jsp Tue
Oct 24 11:48:53 2006
@@ -27,11 +27,11 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title><h:outputText value="#{msgs.subscriptionPageTitle}" /></title>
-    <link rel="stylesheet" type="text/css" href='<c:url value="/planet.css" />'
/>
+    <link rel="stylesheet" type="text/css" href='<c:url value="/planet-ui/planet.css"
/>' />
 </head>
 <body>
 <div id="wrapper">    
-<%@include file="/planet-ui/menu.jsp" %> 
+<%@include file="/planet-ui/admin/menu.jsp" %> 
 
 <h:form id="subscriptionForm">
 

Copied: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/error.jsp (from r467333,
incubator/roller/trunk/sandbox/planetroller/web/error.jsp)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/error.jsp?view=diff&rev=467435&p1=incubator/roller/trunk/sandbox/planetroller/web/error.jsp&r1=467333&p2=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/error.jsp&r2=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/error.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/error.jsp Tue Oct 24 11:48:53
2006
@@ -26,15 +26,15 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title><h:outputText value="#{msgs.errorPageTitle}" /></title>
-    <link rel="stylesheet" type="text/css" href='<c:url value="/planet.css" />'
/>
+    <link rel="stylesheet" type="text/css" href='<c:url value="/planet-ui/planet.css"
/>' />
 </head>
 <body>
 <div id="wrapper">
     <h:form>
     <h1><h:outputText value="#{msgs.errorPageTitle}" /></h1>
     <p>
-        <a href='<c:url value="/main.faces" />'><h:outputText value="#{msgs.appHome}"
/></a> | 
-        <a href='<c:url value="/logout.jsp" />'><h:outputText value="#{msgs.appLogout}"
/></a>
+        <a href='<c:url value="/planet-ui/main.faces" />'><h:outputText value="#{msgs.appHome}"
/></a> | 
+        <a href='<c:url value="/planet-ui/logout.jsp" />'><h:outputText value="#{msgs.appLogout}"
/></a>
     </p>  
     <p><h:outputText value="#{msgs.errorPageMessage}" /></p>
     <h2><h:outputText value="#{msgs.errorStackTraceTitle}" /></h2>

Copied: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/login.jsp (from r467333,
incubator/roller/trunk/sandbox/planetroller/web/login.jsp)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/login.jsp?view=diff&rev=467435&p1=incubator/roller/trunk/sandbox/planetroller/web/login.jsp&r1=467333&p2=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/login.jsp&r2=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/login.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/login.jsp Tue Oct 24 11:48:53
2006
@@ -24,7 +24,7 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <title><fmt:message key="loginPageTitle" /></title>
-        <link rel="stylesheet" type="text/css" href='<c:url value="/planet.css" />'
/>
+        <link rel="stylesheet" type="text/css" href='<c:url value="/planet-ui/planet.css"
/>' />
     </head>
     <body>
         <div id="wrapper">

Added: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/main.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/main.jsp?view=auto&rev=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/main.jsp (added)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/main.jsp Tue Oct 24 11:48:53
2006
@@ -0,0 +1,39 @@
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+--%><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> 
+<%@taglib uri="http://java.sun.com/jsf/core" prefix="f" %>  
+<%@taglib uri="http://java.sun.com/jsf/html" prefix="h" %> 
+<html>
+<f:view>
+<f:loadBundle basename="ApplicationResources" var="msgs" />
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title><h:outputText value="#{msgs.mainTitle}" /></title>
+    <link rel="stylesheet" type="text/css" href='<c:url value="/planet-ui/planet.css"
/>' />
+</head>
+<body>
+<div id="wrapper">
+<h1><h:outputText value="#{msgs.mainTitle}" /></h1>
+<p><a href='<c:url value="/planet-ui/admin/configForm.faces" />'>
+    <h:outputText value="#{msgs.mainConsoleLink}" /></a></p>
+</div>
+</body>
+</f:view>
+</html>

Copied: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/planet.css (from r467333,
incubator/roller/trunk/sandbox/planetroller/web/planet.css)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/planet.css?view=diff&rev=467435&p1=incubator/roller/trunk/sandbox/planetroller/web/planet.css&r1=467333&p2=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/planet.css&r2=467435
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet.css (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/planet.css Tue Oct 24 11:48:53
2006
@@ -6,9 +6,10 @@
     padding: 15px 20px 15px 20px;
 }
 
+/* TODO: fix hardcoded context reference */
 body {
     color: #666;
-    background-image: url(/planet/images/body-bg-grey.png);
+    background-image: url(/planet/planet-ui/images/body-bg-grey.png);
     background-repeat: no-repeat;
     background-position: center;
     text-align: center;
@@ -65,7 +66,8 @@
 tr.evenRow {
     background: #f5f5f5;
 }
+/* TODO: fix hardcoded context reference */
 table.data th {
-    background-image: url(/planet/images/th-bg-grey.png);
+    background-image: url(/planet/planet-ui/images/th-bg-grey.png);
 }
 



Mime
View raw message