roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r925653 [5/5] - in /roller/trunk: planet-business/src/test/resources/ planet-web/ planet-web/src/ planet-web/src/main/ planet-web/src/main/java/ planet-web/src/main/java/org/ planet-web/src/main/java/org/apache/ planet-web/src/main/java/org...
Date Sat, 20 Mar 2010 18:37:54 GMT
Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/PlanetGroupForm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/PlanetGroupForm.jsp?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/PlanetGroupForm.jsp (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/PlanetGroupForm.jsp Sat Mar 20 18:37:51 2010
@@ -0,0 +1,93 @@
+<%--
+  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.
+--%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title><s:text name="PlanetGroupForm.pageTitle" /></title>
+        <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/css/planet.css" />" />
+        <script type="text/javascript">
+        function confirmSubDelete(subid, title) {
+          if (window.confirm('Are you sure you want to remove subscription: ' + title)) {
+            document.location.href='<s:url action="PlanetGroupForm" method="deleteSub" />?groupid=<s:property value="groupid"/>&subid='+subid;
+          }
+        }
+        </script>
+    </head>
+    <body>
+        <div id="wrapper">
+            
+            <%-- show the menu bar --%>
+            <%@include file="/WEB-INF/jsps/admin/menu.jsp" %>
+            
+            <h2><s:text name="PlanetGroupForm.heading" /></h2>
+            
+            <p><s:text name="PlanetGroupForm.help" /></p>
+            
+            <%-- show a status message if needed --%>
+            <%@include file="/WEB-INF/jsps/admin/statusMessage.jsp" %>
+            
+            <s:url id="planetformurl" action="PlanetForm">
+                <s:param name="planetid"><s:property value="group.planet.id"/></s:param>
+            </s:url>
+            <p><s:a href="%{planetformurl}"><s:text name="PlanetGroupForm.returnToPlanet"/></s:a></p>
+            
+            <s:form name="PlanetGroupForm" action="PlanetGroupForm!save">
+                <s:hidden name="planetid" value="%{group.planet.id}" />
+                <s:hidden name="groupid" value="%{group.id}" />
+                <s:textfield label="%{getText('PlanetGroupForm.handle')}" name="group.handle" size="40" />
+                <s:textfield label="%{getText('PlanetGroupForm.title')}" name="group.title" size="40" />
+                <s:textarea label="%{getText('PlanetGroupForm.description')}" name="group.description" cols="47" rows="3" />
+                <s:textfield label="%{getText('PlanetGroupForm.maxPageEntries')}" name="group.maxPageEntries" size="4" />
+                <s:textfield label="%{getText('PlanetGroupForm.maxFeedEntries')}" name="group.maxFeedEntries" size="4" />
+                <s:submit />
+            </s:form>
+            
+            <s:if test="group.id != null">
+                
+                <h2><s:text name="PlanetGroupForm.subsHeading"/></h2>
+                
+                <table class="data">
+                    <tr>
+                        <th><s:text name="PlanetGroupForm.subsTitle" /></th>
+                        <th><s:text name="PlanetGroupForm.subsFeedURL" /></th>
+                        <th><s:text name="PlanetGroupForm.action" /></th>
+                    </tr>
+                    
+                    <s:iterator value="group.subscriptions" status="status">
+                        <tr class='<s:if test="#status.even">evenRow</s:if><s:else>oddRow</s:else>'>
+                            <td><a href='<s:property value="siteURL"/>'><s:property value="title"/></a></td>
+                            <td><img src='<s:url value="/planet-ui/images/feed_link.png"/>' /><a href='<s:property value="feedURL"/>'><s:text name="PlanetGroupForm.subsFeedURL" /></a></td>
+                            <td><img src='<s:url value="/planet-ui/images/delete.png"/>' /><a href="javascript: void(0);" onclick="confirmSubDelete('<s:property value="id"/>', '<s:property value="title"/>');"><s:text name="PlanetGroupForm.deleteSub"/></a></td>
+                        </tr>
+                    </s:iterator>
+                </table>
+                
+                <p><img src='<s:url value="/planet-ui/images/feed_add.png"/>' /><s:text name="PlanetGroupForm.addSub"/></p>
+                <s:form action="PlanetGroupForm!addSub">
+                    <s:hidden name="groupid" />
+                    <s:textfield label="%{getText('PlanetSubscriptionForm.feedURL')}" name="addSubUrl" size="60" />
+                    <s:submit />
+                </s:form>
+                
+            </s:if>
+            
+        </div>
+    </body>
+</html>

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp Sat Mar 20 18:37:51 2010
@@ -0,0 +1,63 @@
+<%--
+  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.
+--%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title><s:text name="PlanetSubscriptionForm.pageTitle" /></title>
+        <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/css/planet.css" />" />
+    </head>
+    <body>
+        <div id="wrapper">
+            
+            <%-- show the menu bar --%>
+            <%@include file="/WEB-INF/jsps/admin/menu.jsp" %>
+            
+            <h2><s:text name="PlanetSubscriptionForm.heading" /></h2>
+            
+            <p><s:text name="PlanetSubscriptionForm.help" /></p>
+            
+            <%-- show a status message if needed --%>
+            <%@include file="/WEB-INF/jsps/admin/statusMessage.jsp" %>
+            
+            <s:url id="groupformurl" action="PlanetGroupForm">
+                <s:param name="groupid"><s:property value="groupid"/></s:param>
+            </s:url>
+            <p><s:a href="%{groupformurl}"><s:text name="PlanetSubscriptionForm.returnToGroup"/></s:a></p>
+            
+            <s:url id="action" action="PlanetSubscriptionForm" method="save" />
+            <s:form name="PlanetSubscriptionForm" action="PlanetSubscriptionForm!save">
+                <s:hidden name="groupid" />
+                <s:hidden name="subid" value="%{subscription.id}" />
+                <s:textfield label="%{getText('PlanetSubscriptionForm.title')}" name="subscription.title" size="40" />
+                <s:textfield label="%{getText('PlanetSubscriptionForm.feedURL')}" name="subscription.feedURL" size="60" />
+                <s:textfield label="%{getText('PlanetSubscriptionForm.siteURL')}" name="subscription.siteURL" size="60" />
+                <s:submit />
+            </s:form>
+            
+            <s:if test="subscription.id != null">
+                <s:url id="addsuburl" action="PlanetSubscriptionForm" >
+                    <s:param name="groupid"><s:property value="groupid"/></s:param>
+                </s:url>
+                <p><img src='<s:url value="/planet-ui/images/feed_add.png"/>' /><s:a href="%{addsuburl}"><s:text name="PlanetSubscriptionForm.addSubscription"/></s:a></p>
+            </s:if>
+            
+        </div>
+    </body>
+</html>

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/PlanetsList.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/PlanetsList.jsp?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/PlanetsList.jsp (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/PlanetsList.jsp Sat Mar 20 18:37:51 2010
@@ -0,0 +1,73 @@
+<%--
+  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.
+--%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title><s:text name="PlanetsList.pageTitle" /></title>
+        <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/css/planet.css" />" />
+        <script type="text/javascript">
+        function confirmPlanetDelete(planetid, handle) {
+          if (window.confirm('Are you sure you want to remove planet: ' + handle)) {
+            document.location.href='<s:url action="PlanetsList" method="deletePlanet" />?planetid='+planetid;
+          }
+        }
+        </script>
+    </head>
+    <body>
+        <div id="wrapper">
+            
+            <%-- show the menu bar --%>
+            <%@include file="/WEB-INF/jsps/admin/menu.jsp" %>
+            
+            <h2><s:text name="PlanetsList.heading" /></h2>
+            
+            <p><s:text name="PlanetsList.help" /></p>
+            
+            <%-- show a status message if needed --%>
+            <%@include file="/WEB-INF/jsps/admin/statusMessage.jsp" %>
+            
+            <p/>
+            
+            <table class="data">
+                <tr>
+                    <th><s:text name="PlanetsList.planetTitle" /></th>
+                    <th><s:text name="PlanetsList.planetURL" /></th>
+                    <th><s:text name="PlanetsList.action" /></th>
+                </tr>
+                <s:iterator value="planets" status="status">
+                    <s:url id="editPlanetUrl" action="PlanetForm">
+                        <s:param name="planetid"><s:property value="id"/></s:param>
+                    </s:url>
+                    <s:url id="deletePlanetUrl" action="PlanetsList" method="delete">
+                        <s:param name="planetid"><s:property value="id"/></s:param>
+                    </s:url>
+                    <tr class='<s:if test="#status.even">evenRow</s:if><s:else>oddRow</s:else>'>
+                        <td><s:a href="%{editPlanetUrl}"><s:property value="title"/></s:a></td>
+                        <td><img src='<s:url value="/planet-ui/images/world_link.png"/>' /><a href='<s:url value="/%{handle}/" />'><s:text name="PlanetsList.link" /></a></td>
+                        <td><img src='<s:url value="/planet-ui/images/delete.png"/>' /><a href="javascript: void(0);" onclick="confirmPlanetDelete('<s:property value="id"/>', '<s:property value="handle"/>');"><s:text name="PlanetsList.deletePlanet"/></a></td>
+                    </tr>
+                </s:iterator>
+            </table>
+            
+            <p><img src='<s:url value="/planet-ui/images/folder_add.png"/>' /><a href='<s:url action="PlanetForm"/>'><s:text name="PlanetsList.addPlanet"/></a></p>
+            
+        </div>
+    </body>
+</html>

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/menu.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/menu.jsp?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/menu.jsp (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/menu.jsp Sat Mar 20 18:37:51 2010
@@ -0,0 +1,25 @@
+<%--
+  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.
+--%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<div class="menubar">
+    <a class="menubar" href="<s:url value="/" />"><s:text name="MenuBar.home" /></a> |
+    <a class="menubar" href="<s:url action="ConfigForm" />"><s:text name="MenuBar.config" /></a> |
+    <a class="menubar" href="<s:url action="PlanetsList" />"><s:text name="MenuBar.planets" /></a> |
+    <a class="menubar" href="<s:url action="Logout" />"><s:text name="MenuBar.logout" /></a>
+</div>
\ No newline at end of file

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/statusMessage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/statusMessage.jsp?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/statusMessage.jsp (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/admin/statusMessage.jsp Sat Mar 20 18:37:51 2010
@@ -0,0 +1,26 @@
+<%--
+  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.
+--%>
+<s:if test="error != null">
+    <div class="error"><b><s:text name="error"/></b> <s:property value="error"/></div>
+</s:if>
+<s:elseif test="warning != null">
+    <div class="warning"><b><s:text name="warning"/></b> <s:property value="warning"/></div>
+</s:elseif>
+<s:elseif test="success != null">
+    <div class="success"><b><s:text name="success"/></b> <s:property value="success"/></div>
+</s:elseif>
\ No newline at end of file

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/login.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/login.jsp?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/login.jsp (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/login.jsp Sat Mar 20 18:37:51 2010
@@ -0,0 +1,43 @@
+<%--
+  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/jsp/jstl/fmt"  prefix="fmt" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title><s:text name="Login.pageTitle" /></title>
+        <link rel="stylesheet" type="text/css" href='<c:url value="/planet-ui/css/planet.css" />' />
+    </head>
+    <body>
+        <div id="wrapper">
+        <h1><s:text name="Login.pageTitle" /></h1>
+
+        <c:if test="${failed}">
+            <p class="error"><s:text name="Login.tryAgain" /></p>
+        </c:if>
+        <form id="loginForm" method="post" action="j_security_check">
+            <p><s:text name="Login.username" /> <input type="text" name="j_username" /></p>
+            <p><s:text name="Login.password" /> <input type="password" name="j_password" /></p>
+            <p><button type="submit"><s:text name="Login.button" /></button></p>
+        </form> 
+        </div>
+    </body>
+</html>

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/logout.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/logout.jsp?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/logout.jsp (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/jsps/logout.jsp Sat Mar 20 18:37:51 2010
@@ -0,0 +1,5 @@
+<%
+   // just invalidate session and redirect
+   request.getSession().invalidate();
+   response.sendRedirect(request.getContextPath()+"/");
+%>

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/scripts/genplanet.sh
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/scripts/genplanet.sh?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/scripts/genplanet.sh (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/scripts/genplanet.sh Sat Mar 20 18:37:51 2010
@@ -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-planet.jar \
+    org.apache.roller.util.TaskRunner \
+    ${WEBAPP_DIR} ${JARS_DIR} \
+    org.apache.roller.planet.tasks.GeneratePlanetTask

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/scripts/planet-custom.properties
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/scripts/planet-custom.properties?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/scripts/planet-custom.properties (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/scripts/planet-custom.properties Sat Mar 20 18:37:51 2010
@@ -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
+

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/scripts/refreshplanet.sh
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/scripts/refreshplanet.sh?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/scripts/refreshplanet.sh (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/scripts/refreshplanet.sh Sat Mar 20 18:37:51 2010
@@ -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-planet.jar \
+    org.apache.roller.util.TaskRunner \
+    ${WEBAPP_DIR} ${JARS_DIR} \
+    org.apache.roller.planet.tasks.RefreshPlanetTask

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/sun-web.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/sun-web.xml?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/sun-web.xml (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/sun-web.xml Sat Mar 20 18:37:51 2010
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Application Server 8.1 Servlet 2.4//EN' 'http://www.sun.com/software/appserver/dtds/sun-web-app_2_4-1.dtd'>
+
+<sun-web-app>
+    
+    <session-config>
+        <session-manager>
+        </session-manager>
+    </session-config>
+
+    <resource-ref>
+        <res-ref-name>jdbc/rollerdb</res-ref-name>
+        <jndi-name>jdbc/rollerdb</jndi-name>
+    </resource-ref>
+
+</sun-web-app>

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity.properties
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity.properties?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity.properties (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity.properties Sat Mar 20 18:37:51 2010
@@ -0,0 +1,62 @@
+# 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.
+
+# specify resource loaders to use
+resource.loader = template, webapp, class
+
+# for the loader we call 'template'
+template.resource.loader.description = Planet Template Resource Loader
+template.resource.loader.class = org.apache.roller.planet.ui.rendering.velocity.TemplateResourceLoader
+template.resource.loader.cache=true
+template.resource.loader.modificationCheckInterval=60
+
+# for the loader we call 'webapp'
+webapp.resource.loader.description = Webapp Resource Loader
+webapp.resource.loader.class = org.apache.roller.planet.ui.rendering.velocity.WebappResourceLoader
+webapp.resource.loader.cache=true
+webapp.resource.loader.modificationCheckInterval=60
+
+# for the loader we call 'class'
+class.resource.loader.description = Velocity Classpath Resource Loader
+class.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+class.resource.loader.cache=true
+class.resource.loader.modificationCheckInterval=60
+
+# log invalid template references?
+# set this to false to have a quieter velocity.log
+runtime.log.invalid.reference=false
+
+# tell Velocity to use Log4J
+runtime.log.logsystem.class=org.apache.velocity.runtime.log.SimpleLog4JLogSystem
+runtime.log.logsystem.log4j.category=org.apache.velocity
+
+# Override the default global library, set to blank to load no default
+velocimacro.library = 
+
+# Change to false for deployment environments.
+# Caching for the 'class' & 'webapp' ResourceLoaders must be false for this to work
+velocimacro.library.autoreload=true
+
+# Allow Velocimacros to be defined in regular templates
+velocimacro.permissions.allow.inline=true
+
+# Allow template authors to define macros in any template
+velocimacro.permissions.allow.inline.local.scope=false
+
+# set encoding/charset to UTF-8
+input.encoding=UTF-8
+output.encoding=UTF-8
+default.contentType=text/html; charset=utf-8

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/group-atom.vm
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/group-atom.vm?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/group-atom.vm (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/group-atom.vm Sat Mar 20 18:37:51 2010
@@ -0,0 +1,41 @@
+#**
+  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.
+
+*#<?xml version="1.0" encoding='utf-8'?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+    <title type="html">$utils.escapeXML($model.group.title)</title>
+    <subtitle type="html">$utils.escapeXML($model.group.description)</subtitle>
+    <id>$utils.escapeXML($model.group.title)</id>
+    <link rel="self" type="application/atom+xml" href="$url.feed.atom($model.group.handle)" />
+    <link rel="alternate" type="text/html" href="$url.group($model.group.handle)" />
+    <updated>$utils.formatRfc822Date($utils.now)</updated>
+    <generator uri="http://rollerweblogger.org">Roller Planet</generator>
+    #set($entries = $model.pager.items)
+    #foreach($entry in $entries)
+    <entry>
+        <id>$utils.escapeXML($entry.permalink)</id>
+        <title type="html">$utils.escapeXML($entry.title)</title>
+        <author><name>$utils.escapeXML($entry.author)</name></author>
+        <link rel="alternate" type="text/html" href="$utils.escapeXML($entry.permalink)"/>
+        <published>$utils.formatIso8601Date($entry.published)</published>
+        <updated>$utils.formatIso8601Date($entry.published)</updated> 
+        <category term="$utils.escapeXML($entry.category.name)" label="$utils.escapeXML($entry.category.name)" />
+        <content type="html">$utils.escapeXML($entry.text)</content>
+    </entry>
+#end
+</feed>
+

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/group-rss.vm
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/group-rss.vm?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/group-rss.vm (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/group-rss.vm Sat Mar 20 18:37:51 2010
@@ -0,0 +1,38 @@
+#**
+  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.
+
+*#<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<channel>
+    <title>$utils.escapeXML($model.group.title)</title>
+    <link>$utils.escapeXML($url.feed.rss($model.group.handle))</link>
+    <description>$utils.escapeXML($model.group.description)</description>
+    <lastBuildDate>$utils.formatRfc822Date($utils.now)</lastBuildDate>
+    <generator>Planet Roller</generator>
+    #set($entries = $model.pager.items)
+    #foreach( $entry in $entries )
+    <item>
+        <title>$utils.escapeXML($entry.title)</title>
+        <description>$utils.escapeXML($entry.content)</description>
+     	<category>$utils.escapeXML($entry.category.name)</category>
+        <link>$utils.escapeXML($entry.permalink)</link>
+        <pubDate>$utils.formatRfc822Date($entry.published)</pubDate>
+        <dc:creator>$utils.escapeXML($entry.author)</dc:creator>
+    </item>
+    #end
+</channel>
+</rss>

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/group.vm
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/group.vm?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/group.vm (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/group.vm Sat Mar 20 18:37:51 2010
@@ -0,0 +1,54 @@
+#**
+  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.
+
+*#<html>
+#set($group = $model.group)
+#set($entries = $model.pager.items)
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" >
+<title>$group.title</title>
+</head>
+<body>
+<table>
+   <tr>
+      <td width="80%" valign="top">
+         <h1>$group.title</h1>
+         <p><i>$group.description<i/></p>
+         <p>Last updated: $utils.formatRfc822Date($utils.now)</p>
+         #foreach($entry in $entries)
+            <h2>$entry.title</h2>
+            Blog: $entry.subscription.title <br/>
+            Date: $entry.published<br/>
+            <a href="$entry.permalink">Permalink</a><br/>
+            <p>$entry.content</p>
+         #end
+      </td>
+      <td width="20%" valign="top">
+         <h3>Other formats</h3>
+         <a href="$url.feed.atom($group.handle)">Atom 1.0 Feed</a><br/>
+         <a href="$url.opml($group.handle)">OPML Subscriptions</a>
+         <h3>Subscriptions</h3>
+         #foreach ($sub in $group.subscriptions)
+         <a href="$sub.siteURL">$sub.title</a> <a href="$sub.feedURL">(feed)</a>
+         <br/>
+         #end
+      </td>
+</tr>
+</table>
+
+</body>
+</html>
\ No newline at end of file

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/home.vm
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/home.vm?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/home.vm (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/home.vm Sat Mar 20 18:37:51 2010
@@ -0,0 +1,44 @@
+#**
+  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.
+
+*#
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" >
+    <title>$site.title</title>
+  </head>
+  <body>
+
+  <div class="siteHeading">
+    <h1 class="siteTitle">$site.title</h1>
+    <p class="siteDescription">$site.description</p>
+  </div>
+
+  <table class="planetListings">
+    #foreach($planet in $site.planets)
+    <tr>
+      <td class="planet">
+         <h3 class="planetTitle"><a href="$url.planet($planet.handle)">$planet.title</a></h3>
+         <p class="planetDescription">$planet.description</p>
+         <br/>
+      </td>
+    </tr>
+    #end
+  </table>
+
+  </body>
+</html>

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/opml.vm
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/opml.vm?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/opml.vm (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/opml.vm Sat Mar 20 18:37:51 2010
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding='utf-8'?>
+<opml version="1.1">
+<head>
+   <title>Subscriptions list for $utils.escapeXML($model.group.title)</title>
+   <dateCreated>$utils.formatRfc822Date($utils.now)</dateCreated>
+   <dateModified>$utils.formatRfc822Date($utils.now)</dateModified>
+   <ownerName>$model.planet.handle</ownerName>
+   <ownerEmail>$model.planet.handle</ownerEmail>
+
+</head>
+<body>
+<outline>
+   #foreach($sub in $model.group.subscriptions)
+   <outline text="$utils.escapeXML($sub.title)" 
+          xmlUrl="$utils.escapeXML($sub.feedURL)" 
+         htmlUrl="$utils.escapeXML($sub.siteURL)" />
+   #end
+</outline>
+</body>
+</opml>

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/planet.vm
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/planet.vm?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/planet.vm (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/velocity/planet.vm Sat Mar 20 18:37:51 2010
@@ -0,0 +1,44 @@
+#**
+  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.
+
+*#
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" >
+    <title>$model.planet.title</title>
+  </head>
+  <body>
+
+  <div class="planetHeading">
+    <h1 class="planetTitle">$model.planet.title</h1>
+    <p class="planetDescription">$model.planet.description</p>
+  </div>
+
+  <table class="groupListings">
+    #foreach($group in $model.planet.groups)
+    <tr>
+      <td class="planetGroup">
+         <h3 class="groupTitle"><a href="$url.group($group.handle)">$group.title</a></h3>
+         <p class="groupDescription">$group.description</p>
+         <br/>
+      </td>
+    </tr>
+    #end
+  </table>
+
+  </body>
+</html>

Added: roller/trunk/planet-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/WEB-INF/web.xml?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/WEB-INF/web.xml (added)
+++ roller/trunk/planet-web/src/main/webapp/WEB-INF/web.xml Sat Mar 20 18:37:51 2010
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+    
+    <display-name>Planet Roller</display-name>
+    
+    <filter>
+        <filter-name>struts2</filter-name>
+        <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
+    </filter>
+    
+    <filter>
+        <filter-name>PersistenceSessionFilter</filter-name>
+        <filter-class>org.apache.roller.planet.ui.core.filters.PersistenceSessionFilter</filter-class>
+    </filter>
+    
+    <filter>
+        <filter-name>RequestMappingFilter</filter-name>
+        <filter-class>org.apache.roller.planet.ui.rendering.filters.RequestMappingFilter</filter-class>
+    </filter>
+    
+    <filter>
+        <filter-name>DebugFilter</filter-name>
+        <filter-class>org.apache.roller.planet.ui.core.filters.DebugFilter</filter-class>
+    </filter>
+    
+    <!--
+    <filter-mapping>
+        <filter-name>DebugFilter</filter-name>
+        <url-pattern>*.action</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>
+    -->
+    
+    <filter-mapping>
+        <filter-name>PersistenceSessionFilter</filter-name>
+        <url-pattern>/planet-ui/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>
+    
+    <filter-mapping>
+        <filter-name>RequestMappingFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+    </filter-mapping>
+    
+    <filter-mapping>
+        <filter-name>struts2</filter-name>
+        <url-pattern>/*</url-pattern>
+        <dispatcher>REQUEST</dispatcher>
+        <dispatcher>FORWARD</dispatcher>
+    </filter-mapping>
+    
+    
+    <servlet>
+        <servlet-name>HomepageServlet</servlet-name>
+        <servlet-class>org.apache.roller.planet.ui.rendering.servlets.HomepageServlet</servlet-class>
+        <load-on-startup>5</load-on-startup>
+    </servlet>
+    
+    <servlet>
+        <servlet-name>FeedServlet</servlet-name>
+        <servlet-class>org.apache.roller.planet.ui.rendering.servlets.FeedServlet</servlet-class>
+        <load-on-startup>5</load-on-startup>
+    </servlet>
+    
+    <servlet>
+        <servlet-name>PageServlet</servlet-name>
+        <servlet-class>org.apache.roller.planet.ui.rendering.servlets.PageServlet</servlet-class>
+        <load-on-startup>5</load-on-startup>
+    </servlet>
+    
+    <servlet>
+        <servlet-name>OpmlServlet</servlet-name>
+        <servlet-class>org.apache.roller.planet.ui.rendering.servlets.OpmlServlet</servlet-class>
+        <load-on-startup>5</load-on-startup>
+    </servlet>
+    
+    <servlet-mapping>
+        <servlet-name>HomepageServlet</servlet-name>
+        <url-pattern>/planet-ui/rendering/homepage</url-pattern>
+    </servlet-mapping>
+    
+    <servlet-mapping>
+        <servlet-name>FeedServlet</servlet-name>
+        <url-pattern>/planet-ui/rendering/feed/*</url-pattern>
+    </servlet-mapping>
+    
+    <servlet-mapping>
+        <servlet-name>PageServlet</servlet-name>
+        <url-pattern>/planet-ui/rendering/page/*</url-pattern>
+    </servlet-mapping>
+    
+    <servlet-mapping>
+        <servlet-name>OpmlServlet</servlet-name>
+        <url-pattern>/planet-ui/rendering/opml/*</url-pattern>
+    </servlet-mapping>
+    
+    
+    <listener>
+        <listener-class>org.apache.roller.planet.ui.core.PlanetContext</listener-class>
+    </listener>
+    
+    <!--
+    <resource-ref>
+        <res-ref-name>jdbc/rollerdb</res-ref-name>
+        <res-type>javax.sql.DataSource</res-type>
+        <res-auth>Container</res-auth>
+    </resource-ref>
+    -->
+    
+    <welcome-file-list>
+        <welcome-file>index.jsp</welcome-file>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+    
+    <security-constraint>
+        <display-name>planet-ui</display-name>
+        <web-resource-collection>
+            <web-resource-name>planet-ui</web-resource-name>
+            <url-pattern>/planet-ui/admin/*</url-pattern>
+            <http-method>GET</http-method>
+            <http-method>POST</http-method>
+        </web-resource-collection>
+        <auth-constraint>
+            <description/>
+            <role-name>admin</role-name>
+        </auth-constraint>
+    </security-constraint> 
+    
+    <security-role>
+        <description/>
+        <role-name>admin</role-name>
+    </security-role>
+    
+    <login-config>
+        <auth-method>FORM</auth-method>
+        <form-login-config>
+            <form-login-page>/planet-ui/Login.action</form-login-page>
+            <form-error-page>/planet-ui/Login.action?failed=true</form-error-page>
+        </form-login-config>
+    </login-config>
+    
+</web-app>

Added: roller/trunk/planet-web/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/index.jsp?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/index.jsp (added)
+++ roller/trunk/planet-web/src/main/webapp/index.jsp Sat Mar 20 18:37:51 2010
@@ -0,0 +1,18 @@
+<%--
+  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.
+--%>
+<jsp:forward page="planet-ui/rendering/homepage" />
\ No newline at end of file

Added: roller/trunk/planet-web/src/main/webapp/planet-ui/css/planet.css
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/planet-ui/css/planet.css?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/planet-ui/css/planet.css (added)
+++ roller/trunk/planet-web/src/main/webapp/planet-ui/css/planet.css Sat Mar 20 18:37:51 2010
@@ -0,0 +1,112 @@
+#wrapper {
+    width: 730px;
+    margin-right: auto;
+    margin-left: auto;
+    text-align: left;
+    padding: 15px 20px 15px 20px;
+}
+
+body {
+    color: #666;
+    background-image: url(../images/body-bg-grey.png);
+    background-repeat: no-repeat;
+    background-position: top;
+    text-align: center;
+    margin: 0px;
+    padding: 0px;
+}
+
+h1,h2,h3 {
+    color: #4cbc00;
+    margin: 10px 0px 10px 0px;
+}
+
+a {
+    font-weight: bold;
+    color: #5c67e0;
+    text-decoration: none;
+}
+a:hover {
+    text-decoration: underline;
+}
+a.menubar {
+    font-size: larger;
+}
+
+img {
+    border: none;
+    padding: 0px 3px 0px 0px;
+}
+
+.fieldError {
+   color: red;
+}
+
+.error    { 
+    border: 1px red    solid;
+    background: #FFAAAA;
+    color: #000;
+    padding: 4px;
+}
+
+.errorMessage {
+    color: red;
+    font-weight: bold;
+}
+
+.success  { 
+    border: 1px green  solid; 
+    background: #AAFFAA;
+    color: #000;
+    padding: 4px;
+}
+
+.warning  { 
+    border: 1px yellow solid; 
+    background: #FFFFAA;
+    color: #000;
+    padding: 4px;
+}
+
+div.menubar {
+    text-align: right;
+}
+
+td.tdLabel {
+    vertical-align:top;
+}
+
+table.form {
+    width: 80%
+}
+table.data {
+    width: 100%;
+    font-size: small;
+    border-collapse: collapse;
+    border: 1px solid #a0a0a0;
+}
+table.data td, table.data th {
+    border-collapse: collapse;
+    border: 1px solid #a0a0a0;
+    padding: 3px;
+}
+table.data th {
+    background: #f3e4c8;
+}
+td.narrowColumn {
+    width: 15%;
+}
+td.labelColumn {
+    width: 25%;
+}
+td.valueColumn {
+    width: 75%;
+}
+tr.evenRow {
+    background: #f5f5f5;
+}
+table.data th {
+    background-image: url(../images/th-bg-grey.png);
+}
+
+

Added: roller/trunk/planet-web/src/main/webapp/planet-ui/images/body-bg-grey.png
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/planet-ui/images/body-bg-grey.png?rev=925653&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/planet-web/src/main/webapp/planet-ui/images/body-bg-grey.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/planet-web/src/main/webapp/planet-ui/images/delete.png
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/planet-ui/images/delete.png?rev=925653&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/planet-web/src/main/webapp/planet-ui/images/delete.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/planet-web/src/main/webapp/planet-ui/images/feed_add.png
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/planet-ui/images/feed_add.png?rev=925653&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/planet-web/src/main/webapp/planet-ui/images/feed_add.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/planet-web/src/main/webapp/planet-ui/images/feed_link.png
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/planet-ui/images/feed_link.png?rev=925653&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/planet-web/src/main/webapp/planet-ui/images/feed_link.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/planet-web/src/main/webapp/planet-ui/images/folder_add.png
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/planet-ui/images/folder_add.png?rev=925653&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/planet-web/src/main/webapp/planet-ui/images/folder_add.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/planet-web/src/main/webapp/planet-ui/images/folder_feed.png
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/planet-ui/images/folder_feed.png?rev=925653&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/planet-web/src/main/webapp/planet-ui/images/folder_feed.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/planet-web/src/main/webapp/planet-ui/images/page_white_world.png
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/planet-ui/images/page_white_world.png?rev=925653&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/planet-web/src/main/webapp/planet-ui/images/page_white_world.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/planet-web/src/main/webapp/planet-ui/images/th-bg-grey.png
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/planet-ui/images/th-bg-grey.png?rev=925653&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/planet-web/src/main/webapp/planet-ui/images/th-bg-grey.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/planet-web/src/main/webapp/planet-ui/images/world_link.png
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/planet-ui/images/world_link.png?rev=925653&view=auto
==============================================================================
Binary file - no diff available.

Propchange: roller/trunk/planet-web/src/main/webapp/planet-ui/images/world_link.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: roller/trunk/planet-web/src/main/webapp/planet-ui/index.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/main/webapp/planet-ui/index.jsp?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/main/webapp/planet-ui/index.jsp (added)
+++ roller/trunk/planet-web/src/main/webapp/planet-ui/index.jsp Sat Mar 20 18:37:51 2010
@@ -0,0 +1 @@
+<% response.sendRedirect("admin/ConfigForm.action"); %>

Added: roller/trunk/planet-web/src/test/resources/jetty.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/test/resources/jetty.xml?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/test/resources/jetty.xml (added)
+++ roller/trunk/planet-web/src/test/resources/jetty.xml Sat Mar 20 18:37:51 2010
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<Configure id="Server" class="org.mortbay.jetty.Server">
+
+<!-- Add lifecycle to start and stop Derby -->
+
+    <Call name="addLifeCycle">
+      <Arg>
+        <New class="org.apache.roller.weblogger.jetty.DerbyLifeCycle">
+            <Set name="database"><SystemProperty name="derby.dir" default="." /></Set>
+            <Set name="port"><SystemProperty name="derby.port" default="3223" /></Set>
+        </New>
+      </Arg>
+    </Call>
+
+<!-- Configure a log  -->
+
+    <New id="ServerLog" class="java.io.PrintStream">
+      <Arg>
+        <New class="org.mortbay.util.RolloverFileOutputStream">
+          <Arg>${project.build.directory}/yyyy_mm_dd.stderrout.log</Arg>
+          <Arg type="boolean">false</Arg>
+          <Arg type="int">90</Arg>
+          <Arg><Call class="java.util.TimeZone" name="getTimeZone"><Arg>GMT</Arg></Call></Arg>
+          <Get id="ServerLogName" name="datedFilename"/>
+        </New>
+      </Arg>
+    </New>
+
+    <Call class="org.mortbay.log.Log" name="info"><Arg>Redirecting stderr/stdout to <Ref id="ServerLogName"/></Arg></Call>
+    <Call class="java.lang.System" name="setErr"><Arg><Ref id="ServerLog"/></Arg></Call>
+    <Call class="java.lang.System" name="setOut"><Arg><Ref id="ServerLog"/></Arg></Call>
+
+</Configure>
+
+
+
+

Added: roller/trunk/planet-web/src/test/resources/planet-custom.properties
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/src/test/resources/planet-custom.properties?rev=925653&view=auto
==============================================================================
--- roller/trunk/planet-web/src/test/resources/planet-custom.properties (added)
+++ roller/trunk/planet-web/src/test/resources/planet-custom.properties Sat Mar 20 18:37:51 2010
@@ -0,0 +1,23 @@
+
+# Pluggable backend
+#guice.backend.module=org.apache.roller.planet.business.hibernate.PlanetModule
+
+database.configurationType=jdbc
+
+database.jdbc.driverClass=org.apache.derby.jdbc.ClientDriver
+database.jdbc.connectionURL=jdbc:derby://localhost:3221/rollerdb
+database.jdbc.username=APP
+database.jdbc.password=APP
+
+#jdbc.driverClass=com.mysql.jdbc.Driver
+#jdbc.connectionURL=jdbc:mysql://localhost:3306/rollertest
+#jdbc.username=scott
+#jdbc.password=tiger
+#openjpa.jdbc.DBDictionary=mysql(SupportsSubselect=false, UseClobs=true, SearchStringEscape=\\\\)
+
+#openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=TRACE
+
+cache.dir=${testPlanetCache}
+output.dir=${testOutputDirectory}/planetoutput
+#template.dir=./testcontext/WEB-INF/templates
+

Modified: roller/trunk/weblogger-web/src/main/webapp/themes/basic/theme.css
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/webapp/themes/basic/theme.css?rev=925653&r1=925652&r2=925653&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/webapp/themes/basic/theme.css (original)
+++ roller/trunk/weblogger-web/src/main/webapp/themes/basic/theme.css Sat Mar 20 18:37:51 2010
@@ -204,6 +204,7 @@ li.rReferersListItem {
   font-weight:normal;
   background:#FFF;	
   margin: 15px 15px 15px 15px;
+  width: 75%;
 }	
 			
 .comments-head	{ 



Mime
View raw message