Return-Path: 
 <roller-commits-return-2802-apmail-incubator-roller-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org
Received: (qmail 94326 invoked from network); 8 Feb 2007 22:59:01 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 8 Feb 2007 22:59:00 -0000
Received: (qmail 2418 invoked by uid 500); 8 Feb 2007 22:59:07 -0000
Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org
Received: (qmail 2291 invoked by uid 500); 8 Feb 2007 22:59:07 -0000
Mailing-List: contact roller-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:roller-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:roller-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:roller-commits@incubator.apache.org>
List-Id: <roller-commits.incubator.apache.org>
Reply-To: roller-dev@incubator.apache.org
Delivered-To: mailing list roller-commits@incubator.apache.org
Received: (qmail 2200 invoked by uid 99); 8 Feb 2007 22:59:06 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Feb 2007 14:59:06 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Feb 2007 14:58:52 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 80DF21A9825; Thu,  8 Feb 2007 14:58:32 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r505078 [5/6] - in /incubator/roller/trunk: apps/planet/
 apps/planet/nbproject/
 apps/planet/src/java/org/apache/roller/planet/business/
 apps/planet/src/java/org/apache/roller/planet/business/hibernate/
 apps/planet/src/java/org/apache/roller...
Date: Thu, 08 Feb 2007 22:58:25 -0000
To: roller-commits@incubator.apache.org
From: agilliland@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070208225832.80DF21A9825@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Copied: incubator/roller/trunk/apps/planet/web/WEB-INF/classes/ehcache.xml (from r503923, incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ehcache.xml)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/classes/ehcache.xml?view=diff&rev=505078&p1=incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ehcache.xml&r1=503923&p2=incubator/roller/trunk/apps/planet/web/WEB-INF/classes/ehcache.xml&r2=505078
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/ehcache.xml (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/classes/ehcache.xml Thu Feb  8 14:58:16 2007
@@ -9,20 +9,5 @@
         timeToIdleSeconds="1200"
         timeToLiveSeconds="1200"
         overflowToDisk="false" />
-
-    <cache name="org.apache.roller.pojos.RollerPropertyData"
-        maxElementsInMemory="100"
-        eternal="false"
-        overflowToDisk="false" />
-        
-    <cache name="org.apache.roller.pojos.UserData"
-        maxElementsInMemory="1000"
-        eternal="false"
-        overflowToDisk="false" />
-        
-    <cache name="org.apache.roller.pojos.WebsiteData"
-        maxElementsInMemory="1000"
-        eternal="false"
-        overflowToDisk="false" />
   
 </ehcache>

Copied: incubator/roller/trunk/apps/planet/web/WEB-INF/classes/hibernate.cfg.xml (from r503923, incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/hibernate.cfg.xml)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/classes/hibernate.cfg.xml?view=diff&rev=505078&p1=incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/hibernate.cfg.xml&r1=503923&p2=incubator/roller/trunk/apps/planet/web/WEB-INF/classes/hibernate.cfg.xml&r2=505078
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/hibernate.cfg.xml (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/classes/hibernate.cfg.xml Thu Feb  8 14:58:16 2007
@@ -35,15 +35,17 @@
         <property name="hibernate.current_session_context_class">org.apache.roller.planet.business.hibernate.ThreadLocalSessionContextNoAutoClose</property>
 
         <!-- Hibernate L2 Caching -->
+        <property name="hibernate.cache.use_second_level_cache">false</property>
         <property name="hibernate.cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
         <property name="hibernate.generate_statistics">true</property>
         <property name="hibernate.cache.use_structured_entries">true</property>
         
         <!-- Map Planet POJO classes -->
-        <mapping resource="org/apache/roller/planet/pojos/PlanetConfigData.hbm.xml" />
+        <mapping resource="org/apache/roller/planet/pojos/PlanetData.hbm.xml" />
         <mapping resource="org/apache/roller/planet/pojos/PlanetGroupData.hbm.xml" />
         <mapping resource="org/apache/roller/planet/pojos/PlanetEntryData.hbm.xml" />
         <mapping resource="org/apache/roller/planet/pojos/PlanetSubscriptionData.hbm.xml" />
+        <mapping resource="org/apache/roller/planet/pojos/PropertyData.hbm.xml" />
                 
     </session-factory>
 </hibernate-configuration>

Copied: incubator/roller/trunk/apps/planet/web/WEB-INF/classes/log4j.properties (from r503923, incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/log4j.properties)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/classes/log4j.properties?view=diff&rev=505078&p1=incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/log4j.properties&r1=503923&p2=incubator/roller/trunk/apps/planet/web/WEB-INF/classes/log4j.properties&r2=505078
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/log4j.properties (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/classes/log4j.properties Thu Feb  8 14:58:16 2007
@@ -25,7 +25,7 @@
 
 # Options are: DEBUG, INFO, WARN, ERROR, FATAL
 # Roller code
-log4j.category.org.apache.roller=INFO
+log4j.category.org.apache.roller.planet=INFO
 log4j.category.net.java.roller=INFO
 
 # Roller dependent libraries
@@ -41,8 +41,6 @@
 log4j.category.org.tuckey.web.filters.urlrewrite=DEBUG
 log4j.category.com.opensymphony.oscache=ERROR
 log4j.category.com.danga.MemCached=WARN
-
-log4j.category.org.apache.roller.planet.business.hibernate.HibernatePlanetManagerImpl=DEBUG
 
 
 

Copied: incubator/roller/trunk/apps/planet/web/WEB-INF/classes/planet.properties (from r503923, incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/planet.properties)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/classes/planet.properties?view=diff&rev=505078&p1=incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/planet.properties&r1=503923&p2=incubator/roller/trunk/apps/planet/web/WEB-INF/classes/planet.properties&r2=505078
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/planet.properties (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/classes/planet.properties Thu Feb  8 14:58:16 2007
@@ -45,15 +45,51 @@
 org.apache.roller.planet.business.hibernate.HibernatePlanetImpl
 
 # You MUST override and set these three properties correctly:
-planet.aggregator.cache.dir=/var/planet/cache
-planet.aggregator.output.dir=/usr/local/planet/webapp
-planet.aggregator.template.dir=/usr/local/planet/webapp/WEB-INF/templates
+cache.dir=/var/planet/cache
+output.dir=/usr/local/planet/webapp
+template.dir=/usr/local/planet/webapp/WEB-INF/templates
 
 # Name of control template (in template dir) to be used
 planet.aggregator.mainPage=control.vm
 
 # Number of Technorati queries allowed per day
 planet.aggregator.technorati.limit=500
+
+
+# The set of default Roller renderer factories.
+rendering.rollerRendererFactories=\
+org.apache.roller.planet.ui.rendering.velocity.VelocityRendererFactory
+
+# The set of user defined renderer factories.  These are prepended to the list above.
+rendering.userRendererFactories=
+
+# The set of default Roller request mappers
+rendering.rollerRequestMappers=\
+org.apache.roller.planet.ui.rendering.MultiPlanetRequestMapper
+
+# The set of user defined request mappers.  These are prepended to the list above.
+rendering.userRequestMappers=
+
+# Url path elements which can NEVER be considered a weblog url
+# each represents a url at the application root, i.e. /<elem>/*
+rendering.multiPlanetMapper.rollerProtectedUrls=\
+planet-ui,index.jsp,favicon.ico,robots.txt
+
+# Set of user defined protected urls.  These are added to the set above.
+rendering.multiPlanetMapper.userProtectedUrls=\
+images,css
+
+rendering.pageModels=\
+org.apache.roller.planet.ui.rendering.model.PageModel,\
+org.apache.roller.planet.ui.rendering.model.UtilitiesModel
+
+rendering.feedModels=\
+org.apache.roller.planet.ui.rendering.model.FeedModel,\
+org.apache.roller.planet.ui.rendering.model.UtilitiesModel
+
+rendering.opmlModels=\
+org.apache.roller.planet.ui.rendering.model.PlanetGroupModel,\
+org.apache.roller.planet.ui.rendering.model.UtilitiesModel
 
 # Hibernate dialect: You must override this to use a database other than MySQL4
 hibernate.dialect=org.hibernate.dialect.MySQLDialect

Added: incubator/roller/trunk/apps/planet/web/WEB-INF/classes/planetRuntimeConfigDefs.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/classes/planetRuntimeConfigDefs.xml?view=auto&rev=505078
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/classes/planetRuntimeConfigDefs.xml (added)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/classes/planetRuntimeConfigDefs.xml Thu Feb  8 14:58:16 2007
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+  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.
+-->
+
+<!--
+  STOP!!!!  This is NOT a Roller configuration file!!
+  Users of Roller should never need to edit this file.  The properties listed
+  here are changed on the Roller Admin Settings page.
+  
+  This file defines what properties are made available to get/set
+  during the running of the Roller application.  These properties
+  are stored in the database and the code *must* be able to make
+  use of changed values during runtime.
+  
+  Also included in this file is meta-data which defines what class
+  of property we are dealing with, it's default value, and information
+  on how to populate the display that allows for changing the value.
+  
+  NOTE: order does matter!!  the display is populated in a linear fashion
+	starting from the first display-group and moving down.
+-->
+
+<runtime-configs> 
+
+ <!--
+   The global-properties represents the base set of roller runtime properties.
+   In *most* cases you should be putting your properties here and they can
+   then be changed from the admin configuration page at ...
+        /admin/rollerConfig.do
+ -->
+ <config-def name="global-properties">
+
+   <!-- Site Settings Group -->
+   <display-group name="siteSettings" key="ConfigForm.siteSettings" >
+       
+       <property-def  name="site.name"  key="ConfigForm.title">
+           <type>string</type>
+           <default-value>Roller Planet</default-value>
+       </property-def>
+       <property-def  name="site.description"  key="ConfigForm.description">
+           <type>string</type>
+           <default-value>A default install of the Roller Planet open source aggregation server</default-value>
+       </property-def>
+       <property-def  name="site.adminname"  key="ConfigForm.adminName">
+           <type>string</type>
+           <default-value></default-value>
+       </property-def>
+       <property-def  name="site.adminemail"  key="ConfigForm.adminEmail">
+           <type>string</type>
+           <default-value></default-value>
+       </property-def>
+       <property-def  name="site.absoluteurl"  key="ConfigForm.absoluteUrl">
+           <type>string</type>
+           <default-value></default-value>
+       </property-def>
+       <property-def  name="site.proxyhost"  key="ConfigForm.proxyHost">
+           <type>string</type>
+           <default-value></default-value>
+       </property-def>
+       <property-def  name="site.proxyport"  key="ConfigForm.proxyPort">
+           <type>string</type>
+           <default-value>0</default-value>
+       </property-def>
+       
+   </display-group >
+   
+ </config-def>
+ 
+</runtime-configs>

Copied: incubator/roller/trunk/apps/planet/web/WEB-INF/classes/rome.properties (from r503923, incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/rome.properties)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/classes/rome.properties?view=diff&rev=505078&p1=incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/rome.properties&r1=503923&p2=incubator/roller/trunk/apps/planet/web/WEB-INF/classes/rome.properties&r2=505078
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/classes/rome.properties (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/classes/rome.properties Thu Feb  8 14:58:16 2007
@@ -17,40 +17,40 @@
 
 # Some RSS 0.91 feeds have pubDates in items
 
-WireFeedParser.classes=org.apache.roller.util.rome.PlanetRSS091UParser \
-	                   org.apache.roller.util.rome.PlanetRSS091NParser    
+WireFeedParser.classes=org.apache.roller.planet.util.rome.PlanetRSS091UParser \
+	                   org.apache.roller.planet.util.rome.PlanetRSS091NParser    
 	                                
-Converter.classes     =org.apache.roller.util.rome.PlanetConverterForRSS091U \
-	                   org.apache.roller.util.rome.PlanetConverterForRSS091N \
-	                   org.apache.roller.util.rome.PlanetConverterForRSS20
+Converter.classes     =org.apache.roller.planet.util.rome.PlanetConverterForRSS091U \
+	                   org.apache.roller.planet.util.rome.PlanetConverterForRSS091N \
+	                   org.apache.roller.planet.util.rome.PlanetConverterForRSS20
 	              
 # Handle funky RSS (RSS 2.0 with <dc:date> and/or <content:encoded>)
 
 rss_2.0.feed.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
-                                      org.apache.roller.util.rome.ContentModuleGenerator
+                                      org.apache.roller.planet.util.rome.ContentModuleGenerator
                                       
 rss_2.0.item.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
-                                      org.apache.roller.util.rome.ContentModuleGenerator
+                                      org.apache.roller.planet.util.rome.ContentModuleGenerator
                                       
 rss_2.0.feed.ModuleParser.classes    =com.sun.syndication.io.impl.DCModuleParser \
-                                      org.apache.roller.util.rome.ContentModuleParser
+                                      org.apache.roller.planet.util.rome.ContentModuleParser
                                       
 rss_2.0.item.ModuleParser.classes    =com.sun.syndication.io.impl.DCModuleParser \
-                                      org.apache.roller.util.rome.ContentModuleParser
+                                      org.apache.roller.planet.util.rome.ContentModuleParser
                                       
 # Handle <content:encoded> in RSS 1.0 
 
 rss_1.0.feed.ModuleParser.classes    =com.sun.syndication.io.impl.DCModuleParser \
-                                      org.apache.roller.util.rome.ContentModuleParser
+                                      org.apache.roller.planet.util.rome.ContentModuleParser
                                       
 rss_1.0.item.ModuleParser.classes    =com.sun.syndication.io.impl.DCModuleParser \
-                                      org.apache.roller.util.rome.ContentModuleParser
+                                      org.apache.roller.planet.util.rome.ContentModuleParser
                                       
 rss_1.0.feed.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
-                                      org.apache.roller.util.rome.ContentModuleGenerator
+                                      org.apache.roller.planet.util.rome.ContentModuleGenerator
 
 rss_1.0.item.ModuleGenerator.classes =com.sun.syndication.io.impl.DCModuleGenerator \
-                                      org.apache.roller.util.rome.ContentModuleGenerator
+                                      org.apache.roller.planet.util.rome.ContentModuleGenerator
                                   
                                   
 

Added: incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.properties?view=auto&rev=505078
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.properties (added)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.properties Thu Feb  8 14:58:16 2007
@@ -0,0 +1,4 @@
+struts.objectFactory = spring
+struts.devMode = false
+#struts.action.extension = do
+struts.enable.DynamicMethodInvocation = false

Added: incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.xml?view=auto&rev=505078
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.xml (added)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.xml Thu Feb  8 14:58:16 2007
@@ -0,0 +1,46 @@
+<!DOCTYPE struts PUBLIC
+    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+    "http://struts.apache.org/dtds/struts-2.0.dtd">
+<struts>
+    <!-- core package space -->
+    <package name="planet" namespace="/planet-ui" extends="struts-default">
+        <action name="Login" class="org.apache.roller.planet.ui.core.struts2.Login">
+            <result>/planet-ui/login.jsp</result>
+        </action>
+        <action name="Logout" class="org.apache.roller.planet.ui.core.struts2.Logout">
+            <result>/planet-ui/logout.jsp</result>
+        </action>
+        <action name="MainMenu" class="org.apache.roller.planet.ui.core.struts2.MainMenu">
+            <result>/WEB-INF/jsps/MainMenu.jsp</result>
+        </action>
+    </package>
+    
+    <!-- site admin package space -->
+    <package name="planetadmin" namespace="/planet-ui/admin" extends="planet">
+        
+        <!-- use stack which supports the use of the Preparable interface on actions -->
+        <default-interceptor-ref name="paramsPrepareParamsStack"/>
+        
+        <action name="ConfigForm!*" method="{1}"
+                class="org.apache.roller.planet.ui.admin.struts2.ConfigForm">
+            <result name="input">/WEB-INF/jsps/admin/ConfigForm.jsp</result>
+        </action>
+        <action name="PlanetsList!*" method="{1}"
+                class="org.apache.roller.planet.ui.admin.struts2.PlanetsList">
+            <result name="list">/WEB-INF/jsps/admin/PlanetsList.jsp</result>
+            <interceptor-ref name="basicStack"/>
+        </action>
+        <action name="PlanetForm!*" method="{1}"
+                class="org.apache.roller.planet.ui.admin.struts2.PlanetForm">
+            <result name="input">/WEB-INF/jsps/admin/PlanetForm.jsp</result>
+        </action>
+        <action name="PlanetGroupForm!*" method="{1}"
+                class="org.apache.roller.planet.ui.admin.struts2.PlanetGroupForm">
+            <result name="input">/WEB-INF/jsps/admin/PlanetGroupForm.jsp</result>
+        </action>
+        <action name="PlanetSubscriptionForm!*" method="{1}"
+                class="org.apache.roller.planet.ui.admin.struts2.PlanetSubscriptionForm">
+            <result name="input">/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp</result>
+        </action>
+    </package>
+</struts>
\ No newline at end of file

Added: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/MainMenu.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/MainMenu.jsp?view=auto&rev=505078
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/MainMenu.jsp (added)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/MainMenu.jsp Thu Feb  8 14:58:16 2007
@@ -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.
+--%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title><s:text name="Menu.pageTitle" /></title>
+        <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/planet.css" />" />
+    </head>
+    <body>
+        <div id="wrapper">
+            
+            <h1><s:text name="Menu.heading" /></h1>
+            
+            <p><a href='<s:url value="/" />'><s:text name="Menu.mainPlanetLink" /></a></p>
+            
+            <p><a href='<s:url action="Register" />'><s:text name="Menu.mainRegistrationLink" /></a></p>
+            
+            <p><a href='<s:url action="ConfigForm" namespace="/planet-ui/admin" />'><s:text name="Menu.mainConsoleLink" /></a></p>
+            
+        </div>
+    </body>
+</html>

Added: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp?view=auto&rev=505078
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp (added)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp Thu Feb  8 14:58:16 2007
@@ -0,0 +1,118 @@
+<%--
+  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 uri="http://java.sun.com/jsp/jstl/xml" prefix="x" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<%-- Start by parsing our config defs using the jstl xml toolkit --%>
+<%-- Then we'll progress through the config defs and print out the form --%>
+<x:parse var="configDefs">
+  <%= org.apache.roller.planet.config.PlanetRuntimeConfig.getRuntimeConfigDefsAsString() %>
+</x:parse>
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title><s:text name="ConfigForm.pageTitle" /></title>
+        <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/planet.css" />" />
+    </head>
+    <body>
+        <div id="wrapper">
+
+            <%-- show the menu bar --%>
+            <%@include file="/WEB-INF/jsps/admin/menu.jsp" %>
+            
+            <h2><s:text name="ConfigForm.formTitle" /></h2>
+            
+            <p><s:text name="ConfigForm.formHelp" /></p>
+            
+            <%-- show a status message if needed --%>
+            <%@include file="/WEB-INF/jsps/admin/statusMessage.jsp" %>
+            
+            <s:url id="action" action="ConfigForm" method="save" />
+            <s:form name="ConfigForm" action="%{action}">
+                
+                <table class="formtableNoDesc">
+                    
+                    <x:forEach select="$configDefs//config-def[@name='global-properties']/display-group">
+                        <c:set var="displayGroupKey"><x:out select="@key"/></c:set>
+                        
+                        <tr>
+                            <td colspan="3"><h3><s:text name="${displayGroupKey}" /></h3></td>
+                        </tr>
+                        
+                        <x:forEach select="property-def">
+                            <c:set var="propLabelKey"><x:out select="@key"/></c:set>
+                            <c:set var="name"><x:out select="@name"/></c:set>
+                            
+                            <tr>
+                                <td class="label"><s:text name="${propLabelKey}" /></td>
+                                
+                                <%-- choose the right html input element for the display --%>
+                                <x:choose>
+                                    
+                                    <%-- "string" type means use a simple textbox --%>
+                                    <x:when select="type='string'">
+                                        <td class="field"><input type="text" name='<c:out value="${name}"/>' value='<s:property value="properties['${name}'].value"/>' size="35" /></td>
+                                    </x:when>
+                                    
+                                    <%-- "text" type means use a full textarea --%>
+                                    <x:when select="type='text'">
+                                        <td class="field">
+                                            <textarea name='<c:out value="${name}"/>' rows="<x:out select="rows"/>" cols="<x:out select="cols"/>"><c:out value="${RollerProps[name].value}"/></textarea>
+                                        </td>
+                                    </x:when>
+                                    
+                                    <%-- "boolean" type means use a checkbox --%>
+                                    <x:when select="type='boolean'">
+                                        <c:choose>
+                                            <c:when test="${RollerProps[name].value eq 'true'}">
+                                                <td class="field"><input type="checkbox" name='<c:out value="${name}"/>' CHECKED></td>
+                                            </c:when>
+                                            <c:otherwise>
+                                                <td class="field"><input type="checkbox" name='<c:out value="${name}"/>'></td>
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </x:when>
+                                    
+                                    <%-- if it's something we don't understand then use textbox --%>
+                                    <x:otherwise>
+                                        <td class="field"><input type="text" name='<c:out value="${name}"/>' size="50" /></td>
+                                    </x:otherwise>
+                                </x:choose>
+                                
+                                <td class="description"><%-- <fmt:message key="" /> --%></td>
+                            </tr>
+                            
+                        </x:forEach>
+                        
+                        <tr>
+                            <td colspan="2">&nbsp;</td>
+                        </tr>
+                        
+                    </x:forEach>
+                    
+                </table>
+                
+                <s:submit />
+                
+            </s:form>
+            
+        </div>
+    </body>
+</html>

Added: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp?view=auto&rev=505078
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp (added)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp Thu Feb  8 14:58:16 2007
@@ -0,0 +1,91 @@
+<%--
+  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="PlanetForm.pageTitle" /></title>
+        <link rel="stylesheet" type="text/css" href="<s:url value="/planet-ui/planet.css" />" />
+        <script type="text/javascript">
+        function confirmGroupDelete(groupid, handle) {
+          if (window.confirm('Are you sure you want to remove group: ' + handle)) {
+            document.location.href='<s:url action="PlanetForm" method="deleteGroup" includeParams="none"/>?groupid='+groupid;
+          }
+        }
+        </script>
+    </head>
+    <body>
+        <div id="wrapper">
+            
+            <%-- show the menu bar --%>
+            <%@include file="/WEB-INF/jsps/admin/menu.jsp" %>
+            
+            <h2><s:text name="PlanetForm.heading" /></h2>
+            
+            <p><s:text name="PlanetForm.help" /></p>
+            
+            <%-- show a status message if needed --%>
+            <%@include file="/WEB-INF/jsps/admin/statusMessage.jsp" %>
+            
+            <p><a href='<s:url action="PlanetsList" includeParams="none"/>'><s:text name="PlanetForm.returnToList"/></a></p>
+            
+            <s:url id="action" action="PlanetForm" method="save" includeParams="none" />
+            <s:form name="PlanetForm" action="%{action}">
+                <s:hidden name="planetid" />
+                <s:textfield label="%{getText('PlanetForm.handle')}" name="planet.handle" size="40" />
+                <s:textfield label="%{getText('PlanetForm.title')}" name="planet.name" size="40" />
+                <s:submit />
+            </s:form>
+            
+            
+            <s:if test="planet.id != null">
+                
+                <h2><s:text name="PlanetForm.groupsHeading"/></h2>
+                
+                <table class="data">
+                    <tr>
+                        <th><s:text name="PlanetForm.groupHandle" /></th>
+                        <th><s:text name="PlanetForm.groupTitle" /></th>
+                        <th><s:text name="PlanetForm.groupURL" /></th>
+                        <th><s:text name="PlanetForm.action" /></th>
+                    </tr>
+                    
+                    <s:iterator value="planet.groups" status="status">
+                        <s:url id="editgroupurl" action="PlanetGroupForm" includeParams="none">
+                            <s:param name="groupid"><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="%{editgroupurl}"><s:property value="title"/></s:a></td>
+                            <td><s:property value="handle"/></td>
+                            <td><img src='<s:url value="/planet-ui/images/world_link.png"/>' /><a href='<s:url value="/%{planet.handle}/group/%{handle}" includeParams="none"/>'><s:text name="PlanetForm.link" /></a></td>
+                            <td><img src='<s:url value="/planet-ui/images/delete.png"/>' /><a href="javascript: void(0);" onclick="confirmGroupDelete('<s:property value="id"/>', '<s:property value="handle"/>');"><s:text name="PlanetForm.deleteGroup"/></a></td>
+                        </tr>
+                    </s:iterator>
+                </table>
+                
+                <s:url id="addurl" action="PlanetGroupForm">
+                    <s:param name="planetid"><s:property value="planet.id"/></s:param>
+                </s:url>
+                <p><img src='<s:url value="/planet-ui/images/folder_add.png"/>' /><s:a href="%{addurl}"><s:text name="PlanetForm.addGroup"/></s:a></p>
+                
+            </s:if>
+            
+        </div>
+    </body>
+</html>

Added: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp?view=auto&rev=505078
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp (added)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp Thu Feb  8 14:58:16 2007
@@ -0,0 +1,97 @@
+<%--
+  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/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" includeParams="none"/>?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:url id="action" action="PlanetGroupForm" method="save" includeParams="none" />
+            <s:form name="PlanetGroupForm" action="%{action}">
+                <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:textfield label="%{getText('PlanetGroupForm.description')}" name="group.description" size="40" />
+                <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.subsSiteURL" /></th>
+                        <th><s:text name="PlanetGroupForm.subsFeedURL" /></th>
+                        <th><s:text name="PlanetGroupForm.action" /></th>
+                    </tr>
+                    
+                    <s:iterator value="group.subscriptions" status="status">
+                        <s:url id="editurl" action="PlanetSubscriptionForm">
+                            <s:param name="subid"><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="%{editurl}"><s:property value="title"/></s:a></td>
+                            <td><img src='<s:url value="/planet-ui/images/world_link.png"/>' /><a href='<s:property value="siteURL"/>'><s:text name="PlanetGroupForm.subsSiteURL" /></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>
+                
+                <s:url id="addsuburl" action="PlanetSubscriptionForm">
+                    <s:param name="groupid"><s:property value="group.id"/></s:param>
+                </s:url>
+                <p><img src='<s:url value="/planet-ui/images/feed_add.png"/>' /><s:a href="%{addsuburl}"><s:text name="PlanetGroupForm.addSub"/></s:a></p>
+                
+            </s:if>
+            
+        </div>
+    </body>
+</html>

Added: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp?view=auto&rev=505078
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp (added)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp Thu Feb  8 14:58:16 2007
@@ -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/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" includeParams="none" />
+            <s:form name="PlanetSubscriptionForm" action="%{action}">
+                <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" includeParams="none">
+                    <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: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp?view=auto&rev=505078
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp (added)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp Thu Feb  8 14:58:16 2007
@@ -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/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" includeParams="none"/>?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" %>
+            
+            <table class="data">
+                <tr>
+                    <th><s:text name="PlanetsList.planetTitle" /></th>
+                    <th><s:text name="PlanetsList.planetHandle" /></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="name"/></s:a></td>
+                        <td><s:property value="handle"/></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: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/menu.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/menu.jsp?view=auto&rev=505078
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/menu.jsp (added)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/menu.jsp Thu Feb  8 14:58:16 2007
@@ -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="/" includeParams="none"/>"><s:text name="MenuBar.home" /></a> |
+    <a class="menubar" href="<s:url action="ConfigForm" includeParams="none"/>"><s:text name="MenuBar.config" /></a> |
+    <a class="menubar" href="<s:url action="PlanetsList" includeParams="none"/>"><s:text name="MenuBar.planets" /></a> |
+    <a class="menubar" href="<s:url action="Logout" includeParams="none"/>"><s:text name="MenuBar.logout" /></a>
+</div>
\ No newline at end of file

Added: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/statusMessage.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/statusMessage.jsp?view=auto&rev=505078
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/statusMessage.jsp (added)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/statusMessage.jsp Thu Feb  8 14:58:16 2007
@@ -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: incubator/roller/trunk/apps/planet/web/WEB-INF/velocity.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/velocity.properties?view=auto&rev=505078
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/velocity.properties (added)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/velocity.properties Thu Feb  8 14:58:16 2007
@@ -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

Copied: incubator/roller/trunk/apps/planet/web/WEB-INF/web.xml (from r503923, incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/web.xml?view=diff&rev=505078&p1=incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/web.xml&r1=503923&p2=incubator/roller/trunk/apps/planet/web/WEB-INF/web.xml&r2=505078
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/WEB-INF/web.xml (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/web.xml Thu Feb  8 14:58:16 2007
@@ -2,63 +2,93 @@
 <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.utils.PersistenceSessionFilter</filter-class>
-    </filter>  
+        <filter-class>org.apache.roller.planet.ui.core.filters.PersistenceSessionFilter</filter-class>
+    </filter>
     
     <filter>
-        <filter-name>LoadableFormFilter</filter-name>
-        <filter-class>org.apache.roller.planet.ui.utils.LoadableFormFilter</filter-class>
-    </filter> 
+        <filter-name>RequestMappingFilter</filter-name>
+        <filter-class>org.apache.roller.planet.ui.rendering.filters.RequestMappingFilter</filter-class>
+    </filter>
     
     <filter>
-        <filter-name>MyFacesExtensionsFilter</filter-name>
-        <filter-class>org.apache.myfaces.webapp.filter.ExtensionsFilter</filter-class>
+        <filter-name>DebugFilter</filter-name>
+        <filter-class>org.apache.roller.planet.ui.core.struts2.DebugFilter</filter-class>
     </filter>
-
+    
+    <!--
     <filter-mapping>
-        <filter-name>MyFacesExtensionsFilter</filter-name>
-        <url-pattern>*.faces</url-pattern>
-        <init-param>
-            <!-- Uploaded OPML files should be fairly small -->
-            <param-name>uploadMaxFileSize</param-name>
-            <param-value>500k</param-value>
-        </init-param>
-        <init-param>
-            <param-name>uploadThresholdSize</param-name>
-            <param-value>100k</param-value>
-        </init-param>
+        <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>
-        <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
     
     <filter-mapping>
-        <filter-name>LoadableFormFilter</filter-name>
+        <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>FeedServlet</servlet-name>
+        <servlet-class>org.apache.roller.planet.ui.rendering.servlets.FeedServlet</servlet-class>
+        <load-on-startup>1</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>1</load-on-startup>
+    </servlet>
     <servlet>
-        <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <servlet-name>OpmlServlet</servlet-name>
+        <servlet-class>org.apache.roller.planet.ui.rendering.servlets.OpmlServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
-    </servlet>    
+    </servlet>
+    
+    <servlet-mapping>
+        <servlet-name>FeedServlet</servlet-name>
+        <url-pattern>/planet-ui/rendering/feed/*</url-pattern>
+    </servlet-mapping>
+    
     <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.faces</url-pattern>
+        <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>
+    
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>
-        </welcome-file-list>
+    </welcome-file-list>
     
     <error-page>
         <error-code>500</error-code>
@@ -77,17 +107,19 @@
             <description/>
             <role-name>admin</role-name>
         </auth-constraint>
-    </security-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.jsp</form-login-page>
-            <form-error-page>/planet-ui/login.jsp?error=true</form-error-page>
+            <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>
-    <security-role>
-        <description/>
-        <role-name>admin</role-name>
-    </security-role>
     
 </web-app>

Copied: incubator/roller/trunk/apps/planet/web/index.jsp (from r503923, incubator/roller/trunk/sandbox/planetroller/web/index.jsp)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/index.jsp?view=diff&rev=505078&p1=incubator/roller/trunk/sandbox/planetroller/web/index.jsp&r1=503923&p2=incubator/roller/trunk/apps/planet/web/index.jsp&r2=505078
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/index.jsp (original)
+++ incubator/roller/trunk/apps/planet/web/index.jsp Thu Feb  8 14:58:16 2007
@@ -15,28 +15,5 @@
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
 --%>
-<%@ page import="org.apache.roller.planet.business.PlanetManager" %>
-<%@ page import="org.apache.roller.planet.business.PlanetFactory" %>
-<%@ page import="org.apache.roller.planet.pojos.PlanetConfigData" %>
-<%@ page import="org.apache.roller.planet.pojos.PlanetGroupData" %>
-<%
-    // 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();
-        
-        // and check to see if group aggregation exists yet
-        String groupPath = application.getRealPath("/" + group.getHandle());
-        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 %>" />
+
+need a homepage

Added: incubator/roller/trunk/apps/planet/web/planet-ui/index.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/planet-ui/index.jsp?view=auto&rev=505078
==============================================================================
--- incubator/roller/trunk/apps/planet/web/planet-ui/index.jsp (added)
+++ incubator/roller/trunk/apps/planet/web/planet-ui/index.jsp Thu Feb  8 14:58:16 2007
@@ -0,0 +1 @@
+<% response.sendRedirect("admin/ConfigForm.action"); %>

Copied: incubator/roller/trunk/apps/planet/web/planet-ui/login.jsp (from r503923, incubator/roller/trunk/sandbox/planetroller/web/planet-ui/login.jsp)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/planet-ui/login.jsp?view=diff&rev=505078&p1=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/login.jsp&r1=503923&p2=incubator/roller/trunk/apps/planet/web/planet-ui/login.jsp&r2=505078
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/login.jsp (original)
+++ incubator/roller/trunk/apps/planet/web/planet-ui/login.jsp Thu Feb  8 14:58:16 2007
@@ -15,30 +15,28 @@
   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"%>  
+<%@ 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" %>
-<fmt:setBundle basename="ApplicationResources" />
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title><fmt:message key="loginPageTitle" /></title>
+        <title><s:text name="Login.pageTitle" /></title>
         <link rel="stylesheet" type="text/css" href='<c:url value="/planet-ui/planet.css" />' />
     </head>
     <body>
         <div id="wrapper">
-        <h1><fmt:message key="loginPageTitle" /></h1>
-       
-        <a href='<c:url value="/index.jsp" />'><fmt:message key="appReturnToSite" /></a>
+        <h1><s:text name="Login.pageTitle" /></h1>
 
-        <c:if test="${requestScope['error'] == 'true'}">
-            <fmt:message key="loginTryAgain" />
+        <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><fmt:message key="loginUsername" /> <input type="text" name="j_username" /></p>
-            <p><fmt:message key="loginPassword" /> <input type="password" name="j_password" /></p>
-            <p><button type="submit"><fmt:message key="loginButton" /></button></p>
+            <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>

Copied: incubator/roller/trunk/apps/planet/web/planet-ui/logout.jsp (from r503923, incubator/roller/trunk/sandbox/planetroller/web/planet-ui/logout.jsp)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/planet-ui/logout.jsp?view=diff&rev=505078&p1=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/logout.jsp&r1=503923&p2=incubator/roller/trunk/apps/planet/web/planet-ui/logout.jsp&r2=505078
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/logout.jsp (original)
+++ incubator/roller/trunk/apps/planet/web/planet-ui/logout.jsp Thu Feb  8 14:58:16 2007
@@ -1,6 +1,5 @@
-<%@ page import="javax.servlet.*" %>
 <%
+   // just invalidate session and redirect
    request.getSession().invalidate();
-   RequestDispatcher rd = request.getRequestDispatcher("/index.jsp");
-   rd.forward(request, response);
+   response.sendRedirect(request.getContextPath()+"/");
 %>

Copied: incubator/roller/trunk/apps/planet/web/planet-ui/planet.css (from r503923, incubator/roller/trunk/sandbox/planetroller/web/planet-ui/planet.css)
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/planet-ui/planet.css?view=diff&rev=505078&p1=incubator/roller/trunk/sandbox/planetroller/web/planet-ui/planet.css&r1=503923&p2=incubator/roller/trunk/apps/planet/web/planet-ui/planet.css&r2=505078
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/planet-ui/planet.css (original)
+++ incubator/roller/trunk/apps/planet/web/planet-ui/planet.css Thu Feb  8 14:58:16 2007
@@ -20,25 +20,52 @@
     color: #4cbc00;
     margin: 10px 0px 10px 0px;
 }
-a:link {
+
+a {
     font-weight: bold;
     color: #5c67e0;
+    text-decoration: none;
 }
-a:visited {
-    font-weight: bold;
-    color: #5c67e0;
+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; }
-.success  { border: 1px green  solid; background: #AAFFAA; }
-.warning  { border: 1px yellow solid; background: #FFFFAA; }
+.error    { 
+    border: 1px red    solid;
+    background: #FFAAAA;
+    color: #000;
+    padding: 4px;
+}
+
+.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;
+}
 
 table.form {
     width: 80%

Added: incubator/roller/trunk/apps/planet/web/planet-ui/refresh.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/planet-ui/refresh.jsp?view=auto&rev=505078
==============================================================================
--- incubator/roller/trunk/apps/planet/web/planet-ui/refresh.jsp (added)
+++ incubator/roller/trunk/apps/planet/web/planet-ui/refresh.jsp Thu Feb  8 14:58:16 2007
@@ -0,0 +1,7 @@
+<%@page contentType="text/html"%>
+<%@page pageEncoding="UTF-8"%>
+<%@ page import="org.apache.roller.planet.tasks.*" %>
+<%
+RefreshPlanetTask task = new RefreshPlanetTask();
+task.run();
+%>
\ No newline at end of file

Modified: incubator/roller/trunk/metadata/database/createdb.vm
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/metadata/database/createdb.vm?view=diff&rev=505078&r1=505077&r2=505078
==============================================================================
--- incubator/roller/trunk/metadata/database/createdb.vm (original)
+++ incubator/roller/trunk/metadata/database/createdb.vm Thu Feb  8 14:58:16 2007
@@ -442,6 +442,18 @@
     proxy_port       integer default -1
 );
 
+create table rag_properties (
+    name     varchar(255) not null primary key,
+    value    $TEXT_SQL_TYPE
+);
+
+create table rag_planet (
+    id              varchar(48) not null primary key,
+    name            varchar(255) not null,
+    handle          varchar(32) not null
+);
+create index ragp_handle_idx on rag_planet(handle); 
+
 create table rag_group (
     id               varchar(48) not null primary key,
     handle           varchar(255) not null,
@@ -450,7 +462,8 @@
     cat_restriction  $TEXT_SQL_TYPE,
     group_page       varchar(255),
     max_page_entries integer default 30,
-    max_feed_entries integer default 30
+    max_feed_entries integer default 30,
+    planet_id        varchar(48)
 );
 alter table rag_group add constraint ragg_handle_uq unique ( handle$!INDEXSIZE );
 

Modified: incubator/roller/trunk/metadata/database/droptables.sql
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/metadata/database/droptables.sql?view=diff&rev=505078&r1=505077&r2=505078
==============================================================================
--- incubator/roller/trunk/metadata/database/droptables.sql (original)
+++ incubator/roller/trunk/metadata/database/droptables.sql Thu Feb  8 14:58:16 2007
@@ -15,11 +15,13 @@
 -- directory of this distribution.
 
 -- planet tables
+drop table rag_properties;
 drop table rag_config;
 drop table rag_group;
 drop table rag_subscription;
 drop table rag_entry;
 drop table rag_group_subscription;
+drop table rag_planet;
 
 -- non-associated tables
 drop table newsfeed;
@@ -55,3 +57,4 @@
 drop table website;
 drop table userrole;
 drop table rolleruser;
+

Modified: incubator/roller/trunk/sandbox/planetroller/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/build.xml?view=diff&rev=505078&r1=505077&r2=505078
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/build.xml (original)
+++ incubator/roller/trunk/sandbox/planetroller/build.xml Thu Feb  8 14:58:16 2007
@@ -45,7 +45,6 @@
     <fileset id="roller-jars" dir="${ro.tools}">
         <!-- needed for Hibernate -->
         <include name="hibernate-3.1/hibernate3.jar"/>
-        <include name="hibernate-3.1/lib/antlr.jar"/>
         <include name="hibernate-3.1/lib/asm.jar"/>
         <include name="hibernate-3.1/lib/asm-attrs.jar"/>
         <include name="hibernate-3.1/lib/cglib-2.1.3.jar"/>
@@ -65,17 +64,12 @@
         
         <!-- General dependencies -->
         <include name="lib/commons-codec-1.3.jar"/>
-        <include name="struts-1.2.4/lib/antlr.jar"/>
-        <include name="struts-1.2.4/lib/commons-lang-2.0.jar"/>
-        <include name="struts-1.2.4/lib/commons-logging.jar"/>
         <include name="struts-1.2.4/lib/commons-fileupload.jar"/>
-        <include name="struts-1.2.4/lib/commons-validator.jar"/>
-        <include name="struts-1.2.4/lib/commons-collections.jar"/>
         <include name="lib/log4j-1.2.11.jar"/>
         <include name="lib/jaxen-full.jar"/>
         <include name="lib/saxpath.jar"/>
-        <include name="lib/activation.jar"/>
-        <include name="lib/mail.jar"/>
+        <include name="buildtime/activation.jar"/>
+        <include name="buildtime/mail.jar"/>
     </fileset>
     
     <path id="planet.path">
@@ -90,12 +84,13 @@
             <include name="servlet-api.jar"/>
         </fileset>
         
-        <fileset dir="${ro.web}/WEB-INF/lib">
-            <include name="commons-logging-1.0.4.jar"/>
-            <include name="commons-lang-2.1.jar"/>  
-            <include name="myfaces-api-1.1.4.jar"/>  
-            <include name="tomahawk-1.1.3.jar"/>  
-        </fileset>                      
+        <fileset dir="./lib">
+            <include name="*.jar"/>  
+        </fileset>
+        
+        <fileset dir="./lib/struts2">
+            <include name="*.jar"/>
+        </fileset>
     </path>
     
     <path id="xdoclet.path">
@@ -192,7 +187,14 @@
             <fileset dir="../../apps/planet/build/lib">
                 <include name="roller-planet.jar"/>
             </fileset>
-        
+            
+            <fileset dir="./lib">
+                <include name="*.jar"/>  
+            </fileset>
+            
+            <fileset dir="./lib/struts2">
+                <include name="*.jar"/>
+            </fileset>
         </copy>         
 
         <copy todir="${build.webapp}">

Modified: incubator/roller/trunk/sandbox/planetroller/nbproject/project.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/nbproject/project.xml?view=diff&rev=505078&r1=505077&r2=505078
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/nbproject/project.xml (original)
+++ incubator/roller/trunk/sandbox/planetroller/nbproject/project.xml Thu Feb  8 14:58:16 2007
@@ -64,7 +64,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">web/WEB-INF/lib/commons-beanutils-1.7.0.jar:web/WEB-INF/lib/commons-codec-1.3.jar:web/WEB-INF/lib/commons-collections-3.1.jar:web/WEB-INF/lib/commons-digester-1.6.jar:web/WEB-INF/lib/commons-el-1.0.jar:web/WEB-INF/lib/commons-lang-2.1.jar:web/WEB-INF/lib/commons-logging-1.0.4.jar:web/WEB-INF/lib/jstl.jar:web/WEB-INF/lib/myfaces-api-1.1.4.jar:web/WEB-INF/lib/myfaces-impl-1.1.4.jar:web/WEB-INF/lib/standard.jar:web/WEB-INF/lib/tomahawk-1.1.3.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:lib/antlr.jar:lib/asm-attrs.jar:lib/asm.jar:lib/cglib-2.1.3.jar:lib/commons-fileupload.jar:lib/commons-lang-2.0.jar:lib/commons-logging.jar:lib/commons-validator.jar:lib/dom4j-1.6.1.jar:lib/ehcache-1.1.jar:lib/hibernate3.jar:lib/jaxen-full.jar:lib/jdbc2_0-stdext.jar:lib/jdom.jar:lib/jta.jar:lib/log4j-1.2.11.jar:lib/roller-business.jar:lib/roller-web.jar:lib/rome-0.8.jar:lib/rome-fetcher-0.8.jar:lib/saxpath.jar:lib/servlet-api.jar:lib/velocity-1
 .4.jar:lib/velocity-dep-1.4.jar:lib/activation.jar:lib/mail.jar:../../apps/planet/build/lib/roller-planet.jar</classpath>
+                <classpath mode="compile">web/WEB-INF/lib/commons-codec-1.3.jar:web/WEB-INF/lib/commons-collections-3.1.jar:web/WEB-INF/lib/commons-digester-1.6.jar:web/WEB-INF/lib/commons-el-1.0.jar:web/WEB-INF/lib/commons-lang-2.1.jar:web/WEB-INF/lib/jstl.jar:web/WEB-INF/lib/myfaces-api-1.1.4.jar:web/WEB-INF/lib/myfaces-impl-1.1.4.jar:web/WEB-INF/lib/standard.jar:web/WEB-INF/lib/tomahawk-1.1.3.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:lib/asm-attrs.jar:lib/asm.jar:lib/cglib-2.1.3.jar:lib/commons-fileupload.jar:lib/commons-lang-2.0.jar:lib/commons-logging.jar:lib/commons-validator.jar:lib/dom4j-1.6.1.jar:lib/ehcache-1.1.jar:lib/hibernate3.jar:lib/jaxen-full.jar:lib/jdbc2_0-stdext.jar:lib/jdom.jar:lib/jta.jar:lib/log4j-1.2.11.jar:lib/roller-business.jar:lib/roller-web.jar:lib/rome-0.8.jar:lib/rome-fetcher-0.8.jar:lib/saxpath.jar:lib/servlet-api.jar:lib/velocity-1.4.jar:lib/velocity-dep-1.4.jar:lib/activation.jar:lib/mail.jar:build/lib/roller-planet-business.jar
 :lib/struts2/commons-collections-3.1.jar:lib/struts2/commons-logging-1.0.4.jar:lib/struts2/freemarker-2.3.4.jar:lib/struts2/ognl-2.6.7.jar:lib/struts2/spring-aop-1.2.8.jar:lib/struts2/spring-beans-1.2.8.jar:lib/struts2/spring-context-1.2.8.jar:lib/struts2/spring-core-1.2.8.jar:lib/struts2/spring-web-1.2.8.jar:lib/struts2/struts2-api-2.0.1.jar:lib/struts2/struts2-core-2.0.1.jar:lib/struts2/xwork-2.0-beta-1.jar</classpath>
                 <source-level>1.4</source-level>
             </compilation-unit>
             <compilation-unit>

Added: incubator/roller/trunk/tools/jakarta-taglibs-standard-1.1.2/lib/serializer.jar
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tools/jakarta-taglibs-standard-1.1.2/lib/serializer.jar?view=auto&rev=505078
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/trunk/tools/jakarta-taglibs-standard-1.1.2/lib/serializer.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/trunk/tools/lib/commons-collections-3.1.jar
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tools/lib/commons-collections-3.1.jar?view=auto&rev=505078
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/trunk/tools/lib/commons-collections-3.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/trunk/tools/lib/commons-digester-1.6.jar
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tools/lib/commons-digester-1.6.jar?view=auto&rev=505078
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/trunk/tools/lib/commons-digester-1.6.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/trunk/tools/lib/commons-lang-2.1.jar
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tools/lib/commons-lang-2.1.jar?view=auto&rev=505078
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/trunk/tools/lib/commons-lang-2.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/trunk/tools/lib/commons-logging-1.0.4.jar
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tools/lib/commons-logging-1.0.4.jar?view=auto&rev=505078
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/trunk/tools/lib/commons-logging-1.0.4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream