roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r467743 - in /incubator/roller/trunk/sandbox/planetroller: ./ custom/ web/ web/WEB-INF/classes/ web/planet-ui/
Date Wed, 25 Oct 2006 19:37:57 GMT
Author: snoopdave
Date: Wed Oct 25 12:37:55 2006
New Revision: 467743

URL: http://svn.apache.org/viewvc?view=rev&rev=467743
Log:
Planet fixes, refinements and a custom build option

Added:
    incubator/roller/trunk/sandbox/planetroller/custom/
    incubator/roller/trunk/sandbox/planetroller/custom/custom-web.xmlf
Modified:
    incubator/roller/trunk/sandbox/planetroller/build.xml
    incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/trunk/sandbox/planetroller/web/index.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/login.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/main.jsp
    incubator/roller/trunk/sandbox/planetroller/web/planet-ui/registrationForm.jsp

Modified: incubator/roller/trunk/sandbox/planetroller/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/build.xml?view=diff&rev=467743&r1=467742&r2=467743
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/build.xml (original)
+++ incubator/roller/trunk/sandbox/planetroller/build.xml Wed Oct 25 12:37:55 2006
@@ -16,6 +16,9 @@
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
 -->
+<!DOCTYPE project [
+    <!ENTITY custom-web SYSTEM "custom/custom-web.xmlf">
+]>
 <project name="planetroller" default="stage-webapp" basedir=".">
     <description>Builds, tests, and runs the project planetroller.</description>
  
 
@@ -98,6 +101,8 @@
         <copy todir="./build/webapp/WEB-INF/templates">
             <fileset dir="./templates" includes="**/**" />
         </copy> 
+        
+        &custom-web;
 
     </target>
     

Added: incubator/roller/trunk/sandbox/planetroller/custom/custom-web.xmlf
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/custom/custom-web.xmlf?view=auto&rev=467743
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/custom/custom-web.xmlf (added)
+++ incubator/roller/trunk/sandbox/planetroller/custom/custom-web.xmlf Wed Oct 25 12:37:55
2006
@@ -0,0 +1,6 @@
+
+<!-- for example
+<copy todir="./build/webapp">
+    <fileset dir="./web" includes="**/**" />
+</copy> 
+-->

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=467743&r1=467742&r2=467743
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties
(original)
+++ incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ApplicationResources.properties
Wed Oct 25 12:37:55 2006
@@ -89,7 +89,9 @@
 # main.jsp
 
 mainTitle=Welcome to Planet Roller
-mainConsoleLink=Click here to use the Planet Roller admin console...
+mainPlanetLink=Main page of Planet Roller site
+mainRegistrationLink=Blog registration page
+mainConsoleLink=Planet Roller Admin Console
 
 # registrationForm.jsp
 

Modified: incubator/roller/trunk/sandbox/planetroller/web/index.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/index.jsp?view=diff&rev=467743&r1=467742&r2=467743
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/index.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/index.jsp Wed Oct 25 12:37:55 2006
@@ -20,12 +20,23 @@
 <%@ page import="org.apache.roller.planet.pojos.PlanetConfigData" %>
 <%@ page import="org.apache.roller.planet.pojos.PlanetGroupData" %>
 <%
-    String fwd = "/main.faces";
+    // if no default aggregation exists, then we'll go to main page
+    String fwd = "/planet-ui/main.faces";
     PlanetManager pmgr= PlanetFactory.getPlanet().getPlanetManager();
     PlanetConfigData pconfig = pmgr.getConfiguration();
+    
+    // if we have a config and a default group, then check for aggregation
     if (pconfig != null && pconfig.getDefaultGroup() != null) {
         PlanetGroupData group = pconfig.getDefaultGroup();
-        fwd = "/" + group.getHandle() + "/";
+        
+        // and check to see if group aggregation exists yet
+        String groupPath = application.getRealPath(fwd);
+        java.io.File groupDir = new java.io.File(groupPath);
+        if (groupDir.exists() && groupDir.isDirectory()) {
+            
+            // aggregation exists, so forward to it
+            fwd = "/" + group.getHandle() + "/";           
+        } 
     }
 %>
 <jsp:forward page="<%= fwd %>" />

Modified: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/login.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/login.jsp?view=diff&rev=467743&r1=467742&r2=467743
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/login.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/login.jsp Wed Oct 25 12:37:55
2006
@@ -29,6 +29,9 @@
     <body>
         <div id="wrapper">
         <h1><fmt:message key="loginPageTitle" /></h1>
+       
+        <a href='<c:url value="/index.jsp" />'><fmt:message key="appReturnToSite"
/></a>
+
         <c:if test="${requestScope['error'] == 'true'}">
             <fmt:message key="loginTryAgain" />
         </c:if>

Modified: 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=diff&rev=467743&r1=467742&r2=467743
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/main.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/main.jsp Wed Oct 25 12:37:55
2006
@@ -30,9 +30,18 @@
 </head>
 <body>
 <div id="wrapper">
+    
 <h1><h:outputText value="#{msgs.mainTitle}" /></h1>
+
+<p><a href='<c:url value="/index.jsp" />'>
+    <h:outputText value="#{msgs.mainPlanetLink}" /></a></p>
+        
+<p><a href='<c:url value="/planet-ui/registrationForm.faces" />'>
+    <h:outputText value="#{msgs.mainRegistrationLink}" /></a></p>
+    
 <p><a href='<c:url value="/planet-ui/admin/configForm.faces" />'>
     <h:outputText value="#{msgs.mainConsoleLink}" /></a></p>
+
 </div>
 </body>
 </f:view>

Modified: incubator/roller/trunk/sandbox/planetroller/web/planet-ui/registrationForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/planet-ui/registrationForm.jsp?view=diff&rev=467743&r1=467742&r2=467743
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/registrationForm.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/planet-ui/registrationForm.jsp Wed Oct
25 12:37:55 2006
@@ -34,6 +34,10 @@
 
 <h2><h:outputText value="#{msgs.regFormTitle}" /></h2>
 
+<p><h:outputLink value="../index.jsp">
+    <h:outputText value="#{msgs.appReturnToSite}" />
+</h:outputLink></p>
+
 <p><h:outputText value="#{msgs.regHelp}" /></p>
 
 <h:form>



Mime
View raw message