roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r514799 - in /incubator/roller/branches/roller_4.0_newbackend/apps/planet: ./ nbproject/ src/java/org/apache/roller/planet/business/hibernate/ src/java/org/apache/roller/planet/pojos/ src/java/org/apache/roller/planet/ui/admin/struts2/ src/...
Date Mon, 05 Mar 2007 18:41:32 GMT
Author: snoopdave
Date: Mon Mar  5 10:41:30 2007
New Revision: 514799

URL: http://svn.apache.org/viewvc?view=rev&rev=514799
Log:
Merging from trunk and JPA fixes

Added:
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PlanetURLModel.java
      - copied unchanged from r514725, incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PlanetURLModel.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/SiteModel.java
      - copied unchanged from r514725, incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/SiteModel.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/SiteURLModel.java
      - copied unchanged from r514725, incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/SiteURLModel.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/HomepageServlet.java
      - copied unchanged from r514725, incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/HomepageServlet.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/velocity.log
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/velocity/home.vm
      - copied unchanged from r514725, incubator/roller/trunk/apps/planet/web/WEB-INF/velocity/home.vm
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/velocity/planet.vm
      - copied unchanged from r514725, incubator/roller/trunk/apps/planet/web/WEB-INF/velocity/planet.vm
Removed:
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/URLModel.java
Modified:
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/build.xml
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/nbproject/project.xml
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm-PlanetForm!save-validation.xml
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/package.properties
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/MultiPlanetRequestMapper.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/FeedModel.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PageModel.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PlanetGroupModel.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/UtilitiesModel.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/FeedServlet.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/OpmlServlet.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/PageServlet.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupPageRequest.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupRequest.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/sql/createdb.vm
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/sql/droptables.sql
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/JPAEMF.properties
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/META-INF/persistence.xml
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/planet-custom.properties
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/META-INF/persistence.xml
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/log4j.properties
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/planet.properties
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/velocity/group.vm
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/web.xml
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/index.jsp
    incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/planet-ui/css/planet.css

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/build.xml?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/build.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/build.xml Mon Mar  5 10:41:30 2007
@@ -73,12 +73,12 @@
         <include name="hibernate-3.1/lib/jdbc2_0-stdext.jar"/>
 
         <!-- needed for JPA -->
-        <include name="toplink-essentials-9.1/toplink-essentials.jar"/>
-        <!-- 
         <include name="openjpa-0.9.6/openjpa-all-0.9.6-incubating.jar"/>
         <include name="openjpa-0.9.6/persistence-api-1.0.jar"/>
         <include name="openjpa-0.9.6/serp-1.11.0.jar"/>
         <include name="openjpa-0.9.6/geronimo-j2ee-connector_1.5_spec.jar"/>
+        <!-- 
+        <include name="toplink-essentials-9.1/toplink-essentials.jar"/>
         -->
         
         <!-- needed for ROME -->
@@ -212,16 +212,16 @@
         <mkdir dir="${build.compile.business}/META-INF" />
         <copy todir="${build.compile.business}/META-INF" file="testdata/META-INF/persistence.xml" />
                 
-        <!-- OpenJPA bytecode enhancement
+        <!-- OpenJPA bytecode enhancement -->
         <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="planet.business.path" />
         <openjpac>
             <config propertiesFile="web/WEB-INF/classes/META-INF/persistence.xml" />
             <classpath>
                 <path refid="planet.business.path"/>
                 <pathelement location="${build.compile.business}" />
-                <pathelement location="${build.compile.business}/org/apache/roller/pojos" />
+                <pathelement location="${build.compile.business}/org/apache/roller/planet/pojos" />
             </classpath>
-        </openjpac> -->
+        </openjpac>
         
         <!-- Jar up the business layer -->
         <mkdir dir="${build.lib}"/>

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/nbproject/project.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/nbproject/project.xml?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/nbproject/project.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/nbproject/project.xml Mon Mar  5 10:41:30 2007
@@ -4,7 +4,7 @@
     <configuration>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
             <!-- Do not use Project Properties customizer when editing this file manually. -->
-            <name>planet_4.0</name>
+            <name>planet_4.0_newbackend</name>
             <properties>
                 <property name="ant.script">build.xml</property>
             </properties>

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java Mon Mar  5 10:41:30 2007
@@ -78,8 +78,13 @@
         strategy.store(planet);
     }
     
-    public void saveGroup(PlanetGroupData group) 
-        throws RollerException {
+    public void saveGroup(PlanetGroupData group)  throws RollerException {
+        if (group.getId() == null || getGroupById(group.getId()) == null) {
+            // If new group, make sure hadnle is unique within Planet
+            if (getGroup(group.getPlanet(), group.getHandle()) != null) {
+                throw new RollerException("ERROR group handle already exists in Planet");
+            }
+        }
         strategy.store(group);
     }
         
@@ -255,8 +260,6 @@
             criteria.add(Expression.eq("handle", handle));
             if(planet != null) {
                 criteria.add(Expression.eq("planet", planet));
-            } else {
-                criteria.add(Expression.isNull("planet"));
             }
             return (PlanetGroupData) criteria.uniqueResult();
         } catch (HibernateException e) {
@@ -278,8 +281,6 @@
             Criteria criteria = session.createCriteria(PlanetGroupData.class);
             if(planet != null) {
                 criteria.add(Expression.eq("planet", planet));
-            } else {
-                criteria.add(Expression.isNull("planet"));
             }
             return criteria.list();
         } catch (HibernateException e) {
@@ -441,13 +442,13 @@
             cacheDir = new File(cacheDirName);
             if (!cacheDir.exists()) cacheDir.mkdirs();
         } catch (Exception e) {
-            log.error("Unable to create planet cache directory");
+            log.error("Unable to create planet cache directory: " + cacheDir.getPath(), e);
             return;
         }
         
         // abort if cache dir is not writable
         if (!cacheDir.canWrite()) {
-            log.error("Planet cache directory is not writable");
+            log.error("Planet cache directory is not writable: " + cacheDir.getPath());
             return;
         }
         

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java Mon Mar  5 10:41:30 2007
@@ -31,8 +31,9 @@
 public class PlanetData {
     
     private String id = UUIDGenerator.generateUUID();
-    private String title = null;
     private String handle = null;
+    private String title = null;
+    private String description = null;
     private Set groups = new HashSet();
     
     
@@ -58,6 +59,17 @@
     }
 
     /**
+     * @hibernate.property column="handle" non-null="true" unique="true"
+     */
+    public String getHandle() {
+        return handle;
+    }
+
+    public void setHandle(String handle) {
+        this.handle = handle;
+    }
+    
+    /**
      * @hibernate.property column="title" non-null="true" unique="false"
      */
     public String getTitle() {
@@ -69,16 +81,16 @@
     }
 
     /**
-     * @hibernate.property column="handle" non-null="true" unique="true"
+     * @hibernate.property column="description" non-null="false" unique="false"
      */
-    public String getHandle() {
-        return handle;
+    public String getDescription() {
+        return description;
     }
 
-    public void setHandle(String handle) {
-        this.handle = handle;
+    public void setDescription(String description) {
+        this.description = description;
     }
-
+    
     /** 
      * @hibernate.set lazy="true" invert="true" cascade="all"
      * @hibernate.collection-key column="planet_id"

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.orm.xml Mon Mar  5 10:41:30 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="PlanetData"
             class="org.apache.roller.planet.pojos.PlanetData">
         <table name="rag_planet"/>
-        <table-generator name="PLANET-TABLE-GENERATOR" table="planet_id_table" pk-column-name="pk" value-column-name="value" pk-column-value="1"/>
         <named-query name="PlanetData.getAll">
             <query>SELECT p FROM PlanetData p</query>
         </named-query>
@@ -25,6 +24,9 @@
             </id>
             <basic name="title">
                 <column name="title" insertable="true" updatable="true" unique="false"/>
+            </basic>
+            <basic name="description">
+                <column name="description" insertable="true" updatable="true" unique="false"/>
             </basic>
             <basic name="handle">
                 <column name="handle" insertable="true" updatable="true" unique="true"/>

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetEntryData.orm.xml Mon Mar  5 10:41:30 2007
@@ -11,7 +11,6 @@
     <package>org.apache.roller.planet.pojos</package>
     <entity metadata-complete="true" name="PlanetEntryData" class="org.apache.roller.planet.pojos.PlanetEntryData">
         <table name="rag_entry"/>
-        <table-generator name="PLANET-TABLE-GENERATOR" table="planet_id_table" pk-column-name="pk" value-column-name="value" pk-column-value="1"/>
         <named-query name="PlanetEntryData.getByFeedURL">
             <query>SELECT p FROM PlanetEntryData p WHERE p.subscription.feedURL = ?1</query>
         </named-query>

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetGroupData.orm.xml Mon Mar  5 10:41:30 2007
@@ -11,7 +11,6 @@
     <package>org.apache.roller.planet.pojos</package>
     <entity metadata-complete="true" name="PlanetGroupData" class="org.apache.roller.planet.pojos.PlanetGroupData">
         <table name="rag_group"/>
-        <table-generator name="PLANET-TABLE-GENERATOR" table="planet_id_table" pk-column-name="pk" value-column-name="value" pk-column-value="1"/>
         <named-query name="PlanetGroupData.getByHandle">
             <query>SELECT p FROM PlanetGroupData p WHERE p.handle = ?1</query>
         </named-query>

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.orm.xml Mon Mar  5 10:41:30 2007
@@ -12,7 +12,6 @@
     <entity metadata-complete="true" name="PlanetSubscriptionData"
             class="org.apache.roller.planet.pojos.PlanetSubscriptionData">
         <table name="rag_subscription"/>
-        <table-generator name="PLANET-TABLE-GENERATOR" table="planet_id_table" pk-column-name="pk" value-column-name="value" pk-column-value="1"/>
         <named-query name="PlanetSubscriptionData.getAll">
             <query>SELECT p FROM PlanetSubscriptionData p</query>
         </named-query>

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm-PlanetForm!save-validation.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm-PlanetForm%21save-validation.xml?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm-PlanetForm!save-validation.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm-PlanetForm!save-validation.xml Mon Mar  5 10:41:30 2007
@@ -35,4 +35,15 @@
             <message key="PlanetForm.error.titleSize">title must be less than 255 characters</message>
         </field-validator>
     </field>
+    
+    <!-- validate the planet description field -->
+    <field name="planet.description">
+        
+        <!-- description has a max size -->
+        <field-validator type="stringlength">
+            <param name="maxLength">255</param>
+            <param name="trim">true</param>
+            <message key="PlanetForm.error.descriptionSize">description must be less than 255 characters</message>
+        </field-validator>
+    </field>
 </validators>

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/package.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/package.properties?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/package.properties (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/package.properties Mon Mar  5 10:41:30 2007
@@ -47,6 +47,7 @@
 
 PlanetForm.handle=Handle
 PlanetForm.title=Title
+PlanetForm.description=Description
 
 PlanetForm.groupsHeading=Groups in this planet
 PlanetForm.groupTitle=Group Title
@@ -64,6 +65,7 @@
 PlanetForm.error.titleNull=Don't you want a title for your planet?  Try again.
 PlanetForm.error.handleSize=That's a pretty long handle you chose.  We only allow handles to be at most 32 characters.
 PlanetForm.error.titleSize=That's a pretty long title you chose.  We only allow titles to be at most 255 characters.
+PlanetForm.error.descriptionSize=That's a pretty long description you chose.  We only allow descriptions to be at most 255 characters.
 
 PlanetForm.error.saveFailed=Failed to save planet.
 PlanetForm.error.groupDeleteFailed=Failed to delete group {0}.

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/MultiPlanetRequestMapper.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/MultiPlanetRequestMapper.java?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/MultiPlanetRequestMapper.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/MultiPlanetRequestMapper.java Mon Mar  5 10:41:30 2007
@@ -35,7 +35,7 @@
 
 
 /**
- * Planets's multi-planet request mapper.
+ * Multi-planet request mapper.
  *
  * This request mapper is used to map all planet specific urls of the form
  * /<planet handle>/* to the appropriate servlet for handling the actual
@@ -153,10 +153,12 @@
         // special handling for trailing slash issue
         // we need this because by http standards the urls /foo and /foo/ are
         // supposed to be considered different, so we must enforce that
-        if(planetContext == null && !trailingSlash) {
-            // this means someone referred to a planet index page with the 
-            // shortest form of url /<planet> and we need to do a redirect 
-            // to /<planet>/
+        if( (planetContext == null && !trailingSlash) ||
+            (groupHandle != null && groupContext == null && !trailingSlash) ) {
+            
+            // this means someone referred to a planet or group index page 
+            // with the shortest form of url /<planet> or /<planet>/group/<group>
+            // and we need to add a slash to the url and redirect
             String redirectUrl = request.getRequestURI() + "/";
             if(request.getQueryString() != null) {
                 redirectUrl += "?"+request.getQueryString();
@@ -165,6 +167,12 @@
             response.sendRedirect(redirectUrl);
             return true;
             
+        } else if(groupContext != null && trailingSlash) {
+            // this means that someone has accessed a url and included a 
+            // trailing slash, like /<planet>/group/<group>/feed/atom/ which is
+            // not supported, so we need to offer up a 404 Not Found
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+            return true;
         }
         
         // calculate forward url

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/FeedModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/FeedModel.java?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/FeedModel.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/FeedModel.java Mon Mar  5 10:41:30 2007
@@ -34,21 +34,20 @@
 /**
  * Model which provides information needed to render a planet feed.
  */
-public class FeedModel implements Model {
+public class FeedModel extends PlanetGroupModel {
     
     private static Log log = LogFactory.getLog(FeedModel.class);
     
     private PlanetGroupFeedRequest feedRequest = null;
-    private Map requestParameters = null;
-    private PlanetData planet = null;
-    private PlanetGroupData group = null;
     
     
     /** 
      * Creates an un-initialized new instance, Roller calls init() to complete
      * construction. 
      */
-    public FeedModel() {}
+    public FeedModel() {
+        super();
+    }
     
     
     /** 
@@ -64,6 +63,9 @@
      */
     public void init(Map initData) throws RollerException {
         
+        // parent gets to go first
+        super.init(initData);
+        
         // we expect the init data to contain a weblogRequest object
         PlanetRequest planetRequest = (PlanetRequest) initData.get("planetRequest");
         if(planetRequest == null) {
@@ -78,37 +80,12 @@
             throw new RollerException("weblogRequest is not a WeblogPageRequest."+
                     "  PageModel only supports page requests.");
         }
-        
-        // custom request parameters
-        this.requestParameters = (Map)initData.get("requestParameters");
-        
-        // extract planet object
-        planet = feedRequest.getPlanet();
-        
-        // extract weblog object
-        group = feedRequest.getGroup();
-    }
-    
-    
-    /**
-     * Get planet being displayed.
-     */
-    public PlanetData getPlanet() {
-        return planet;
-    }
-    
-    
-    /**
-     * Get group being displayed.
-     */
-    public PlanetGroupData getGroup() {
-        return group;
     }
     
     
     public Pager getPager() {
         
-        String pagerUrl = URLUtilities.getPlanetGroupURL(planet.getHandle(), feedRequest.getGroupHandle());
+        String pagerUrl = URLUtilities.getPlanetGroupURL(getPlanet().getHandle(), feedRequest.getGroupHandle());
         
         return new PlanetEntriesPager(
                 null,
@@ -117,18 +94,6 @@
                 0,
                 0,
                 30);
-    }
-    
-    
-    /**
-     * Get request parameter by name.
-     */
-    public String getRequestParameter(String paramName) {
-        String[] values = (String[])requestParameters.get(paramName);
-        if (values != null && values.length > 0) {
-            return values[0];
-        }
-        return null;
     }
     
 }

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PageModel.java?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PageModel.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PageModel.java Mon Mar  5 10:41:30 2007
@@ -32,23 +32,21 @@
 
 
 /**
- * Model which provides information needed to render a weblog page.
+ * Model which provides information needed to render a planet page.
  */
-public class PageModel implements Model {
+public class PageModel extends PlanetGroupModel {
     
     private static Log log = LogFactory.getLog(PageModel.class);
     
     private PlanetGroupPageRequest pageRequest = null;
-    private Map requestParameters = null;
-    private PlanetData planet = null;
-    private PlanetGroupData group = null;
     
     
     /** 
-     * Creates an un-initialized new instance, Roller calls init() to complete
-     * construction. 
+     * Creates an un-initialized new instance.
      */
-    public PageModel() {}
+    public PageModel() {
+        super();
+    }
     
     
     /** 
@@ -64,6 +62,9 @@
      */
     public void init(Map initData) throws RollerException {
         
+        // parent gets to go first
+        super.init(initData);
+        
         // we expect the init data to contain a weblogRequest object
         PlanetRequest planetRequest = (PlanetRequest) initData.get("planetRequest");
         if(planetRequest == null) {
@@ -78,37 +79,12 @@
             throw new RollerException("weblogRequest is not a WeblogPageRequest."+
                     "  PageModel only supports page requests.");
         }
-        
-        // custom request parameters
-        this.requestParameters = (Map)initData.get("requestParameters");
-        
-        // extract planet object
-        planet = pageRequest.getPlanet();
-        
-        // extract group object
-        group = pageRequest.getGroup();
-    }
-    
-    
-    /**
-     * Get planet being displayed.
-     */
-    public PlanetData getPlanet() {
-        return planet;
-    }
-    
-    
-    /**
-     * Get group being displayed.
-     */
-    public PlanetGroupData getGroup() {
-        return group;
     }
     
     
     public Pager getPager() {
         
-        String pagerUrl = URLUtilities.getPlanetGroupURL(planet.getHandle(), pageRequest.getGroupHandle());
+        String pagerUrl = URLUtilities.getPlanetGroupURL(getPlanet().getHandle(), pageRequest.getGroupHandle());
         
         return new PlanetEntriesPager(
                 null,
@@ -117,18 +93,6 @@
                 0,
                 0,
                 30);
-    }
-    
-    
-    /**
-     * Get request parameter by name.
-     */
-    public String getRequestParameter(String paramName) {
-        String[] values = (String[])requestParameters.get(paramName);
-        if (values != null && values.length > 0) {
-            return values[0];
-        }
-        return null;
     }
     
 }

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PlanetGroupModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PlanetGroupModel.java?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PlanetGroupModel.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/PlanetGroupModel.java Mon Mar  5 10:41:30 2007
@@ -29,14 +29,13 @@
 
 
 /**
- * Model which provides information needed to render a weblog page.
+ * Model which provides information common to a planet group request
  */
 public class PlanetGroupModel implements Model {
     
     private static Log log = LogFactory.getLog(PlanetGroupModel.class);
     
     private PlanetGroupRequest planetGroupRequest = null;
-    private Map requestParameters = null;
     private PlanetData planet = null;
     private PlanetGroupData group = null;
     
@@ -61,24 +60,21 @@
      */
     public void init(Map initData) throws RollerException {
         
-        // we expect the init data to contain a weblogRequest object
+        // we expect the init data to contain a planetRequest object
         PlanetRequest planetRequest = (PlanetRequest) initData.get("planetRequest");
         if(planetRequest == null) {
             throw new RollerException("expected planetRequest from init data");
         }
         
-        // PageModel only works on page requests, so cast planetRequest
-        // into a PlanetRequest and if it fails then throw exception
+        // only works on planet group requests, so cast planetRequest
+        // into a PlanetGroupRequest and if it fails then throw exception
         if(planetRequest instanceof PlanetGroupRequest) {
             this.planetGroupRequest = (PlanetGroupRequest) planetRequest;
         } else {
-            throw new RollerException("weblogRequest is not a WeblogPageRequest."+
-                    "  PageModel only supports page requests.");
+            throw new RollerException("planetRequest is not a PlanetGroupRequest."+
+                    "  PlanetGroupModel only supports planet group requests.");
         }
         
-        // custom request parameters
-        this.requestParameters = (Map)initData.get("requestParameters");
-        
         // extract planet object
         planet = planetGroupRequest.getPlanet();
         
@@ -100,18 +96,6 @@
      */
     public PlanetGroupData getGroup() {
         return group;
-    }
-    
-    
-    /**
-     * Get request parameter by name.
-     */
-    public String getRequestParameter(String paramName) {
-        String[] values = (String[])requestParameters.get(paramName);
-        if (values != null && values.length > 0) {
-            return values[0];
-        }
-        return null;
     }
     
 }

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/UtilitiesModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/UtilitiesModel.java?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/UtilitiesModel.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/model/UtilitiesModel.java Mon Mar  5 10:41:30 2007
@@ -37,6 +37,7 @@
 import org.apache.roller.planet.util.RegexUtil;
 import org.apache.roller.planet.util.Utilities;
 
+
 /**
  * Model which provides access to a set of general utilities.
  */
@@ -87,7 +88,6 @@
     private static final Pattern QUOTE_PATTERN = 
             Pattern.compile("&quot;", Pattern.CASE_INSENSITIVE);
     
-    private HttpServletRequest request = null;
     private TimeZone tz = null;
     
     
@@ -99,9 +99,6 @@
     
     /** Init page model based on request */
     public void init(Map initData) throws RollerException {
-        
-        // extract request object
-        this.request = (HttpServletRequest) initData.get("request");
     }
     
         

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/FeedServlet.java?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/FeedServlet.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/FeedServlet.java Mon Mar  5 10:41:30 2007
@@ -115,7 +115,6 @@
         try {
             // populate the rendering model
             Map initData = new HashMap();
-            initData.put("request", request);
             initData.put("planetRequest", feedRequest);
             
             // Load models for feeds

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/OpmlServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/OpmlServlet.java?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/OpmlServlet.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/OpmlServlet.java Mon Mar  5 10:41:30 2007
@@ -103,7 +103,6 @@
         try {
             // populate the rendering model
             Map initData = new HashMap();
-            initData.put("request", request);
             initData.put("planetRequest", opmlRequest);
             
             // Load models for feeds

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/PageServlet.java?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/PageServlet.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/servlets/PageServlet.java Mon Mar  5 10:41:30 2007
@@ -82,10 +82,6 @@
             }
             
             group = pageRequest.getGroup();
-            if(group == null) {
-                throw new RollerException("unable to lookup group: "+
-                        pageRequest.getGroupHandle());
-            }
 
         } catch(Exception e) {
             // invalid feed request format or weblog doesn't exist
@@ -103,10 +99,9 @@
         try {
             // populate the rendering model
             Map initData = new HashMap();
-            initData.put("request", request);
             initData.put("planetRequest", pageRequest);
             
-            // Load models for feeds
+            // Load models for pages
             String pageModels = PlanetConfig.getProperty("rendering.pageModels");
             ModelLoader.loadModels(pageModels, model, initData, true);
 
@@ -123,8 +118,20 @@
         Renderer renderer = null;
         try {
             log.debug("Looking up renderer");
-            Template template = new StaticTemplate("group.vm", null, "velocity");
+            
+            // what template are we going to render?
+            Template template = null;
+            if(group == null) {
+                // planet homepage
+                template = new StaticTemplate("planet.vm", null, "velocity");
+            } else {
+                // group homepage
+                template = new StaticTemplate("group.vm", null, "velocity");
+            }
+            
+            // get the Renderer
             renderer = RendererManager.getRenderer(template);
+            
         } catch(Exception e) {
             // nobody wants to render my content :(
 
@@ -132,14 +139,15 @@
             response.sendError(HttpServletResponse.SC_NOT_FOUND);
             return;
         }
-
-        // render content.  use default size of about 24K for a standard page
+        
+        
+        // render content
         try {
             log.debug("Doing rendering");
             renderer.render(model, response.getWriter());
         } catch(Exception e) {
             // bummer, error during rendering
-            log.error("Error during rendering for group.vm", e);
+            log.error("Error during rendering", e);
 
             if(!response.isCommitted()) response.reset();
             response.sendError(HttpServletResponse.SC_NOT_FOUND);

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupPageRequest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupPageRequest.java?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupPageRequest.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupPageRequest.java Mon Mar  5 10:41:30 2007
@@ -50,7 +50,7 @@
             throws InvalidRequestException {
         
         // let our parent take care of their business first
-        // parent determines weblog handle and locale if specified
+        // parent determines planet handle
         super(request);
         
         // we only want the path info left over from after our parents parsing

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupRequest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupRequest.java?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupRequest.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/java/org/apache/roller/planet/ui/rendering/util/PlanetGroupRequest.java Mon Mar  5 10:41:30 2007
@@ -30,7 +30,7 @@
 /**
  * Represents a request to a planet group.
  * 
- * /<planetHandle>/<groupHandle>[/extra/path/info]
+ * /<planetHandle>/group/<groupHandle>[/extra/path/info]
  *
  */
 public class PlanetGroupRequest extends PlanetRequest {
@@ -72,9 +72,6 @@
                 this.pathInfo = urlPath[1];
             }
             
-        } else {
-            throw new InvalidRequestException("invalid feed path info, "+
-                    request.getRequestURL());
         }
         
         if(log.isDebugEnabled()) {

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/sql/createdb.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/sql/createdb.vm?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/sql/createdb.vm (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/sql/createdb.vm Mon Mar  5 10:41:30 2007
@@ -9,31 +9,23 @@
 -- *****************************************************
 -- Create the tables and indices
 
-
-create table planet_id_table (
-    pk              int not null primary key,
-    value           int not null
-);
-insert into planet_id_table (pk, value) values (1, 0);
-
-
 create table rag_properties (
     name     varchar(255) not null primary key,
     value    $db.TEXT_SQL_TYPE
 );
 
-
 create table rag_planet (
     id              varchar(48) not null primary key,
+    handle          varchar(32) not null,
     title           varchar(255) not null,
-    handle          varchar(32) not null
+    description     varchar(255)
 );
 alter table rag_planet add constraint ragp_handle_uq unique ( handle );
 
 
 create table rag_group (
     id               varchar(48) not null primary key,
-    planet_id        varchar(48),
+    planet_id        varchar(48) not null,
     handle           varchar(32) not null,
     title            varchar(255) not null,
     description      varchar(255),

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/sql/droptables.sql
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/sql/droptables.sql?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/sql/droptables.sql (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/src/sql/droptables.sql Mon Mar  5 10:41:30 2007
@@ -14,7 +14,6 @@
 -- copyright in this work, please see the NOTICE file in the top level
 -- directory of this distribution.
 
-drop table planet_id_table;
 drop table rag_entry;
 drop table rag_group_subscription;
 drop table rag_subscription;

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java Mon Mar  5 10:41:30 2007
@@ -31,6 +31,7 @@
 import org.apache.roller.planet.business.Planet;
 import org.apache.roller.planet.business.PlanetFactory;
 import org.apache.roller.planet.business.PlanetManager;
+import org.apache.roller.planet.pojos.PlanetData;
 import org.apache.roller.planet.pojos.PlanetEntryData;
 import org.apache.roller.planet.pojos.PlanetGroupData;
 import org.apache.roller.planet.pojos.PlanetSubscriptionData;
@@ -41,8 +42,27 @@
  */
 public class PlanetManagerTest extends TestCase {
     
-    public static Log log = LogFactory.getLog(PlanetManagerTest.class);
+    public static Log log = LogFactory.getLog(PlanetManagerTest.class);   
+    private PlanetData testPlanet = null;
+    private PlanetData testPlanet = null;
     
+        
+    protected void setUp() throws Exception {
+        testPlanet = TestUtils.setupPlanet("groupTestPlanet");
+    }
+        
+    protected void tearDown() throws Exception {
+        TestUtils.teardownPlanet(testPlanet.getId());
+    }
+    
+    protected void setUp() throws Exception {
+        testPlanet = TestUtils.setupPlanet("groupTestPlanet");
+    }
+    
+    
+    protected void tearDown() throws Exception {
+        TestUtils.teardownPlanet(testPlanet.getId());
+    }
     
     public void testSubscriptionStorage() throws Exception {
         
@@ -64,6 +84,7 @@
             group.setDescription("test_group_desc");
             group.setHandle("test_handle");
             group.setTitle("test_title");
+            group.setPlanet(testPlanet);
             planet.saveGroup(group);
             
             TestUtils.endSession(true);
@@ -218,6 +239,7 @@
             group.setDescription("test_group_desc");
             group.setHandle("test_handle");
             group.setTitle("test_title");
+            group.setPlanet(testPlanet);
             planet.saveGroup(group);
             
             PlanetSubscriptionData sub = new PlanetSubscriptionData();
@@ -264,6 +286,7 @@
                 group.setDescription("test_group_desc");
                 group.setHandle("test_handle");
                 group.setTitle("test_title");
+                group.setPlanet(testPlanet);
                 planet.saveGroup(group);
                 
                 PlanetSubscriptionData sub1 = new PlanetSubscriptionData();

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/JPAEMF.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/JPAEMF.properties?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/JPAEMF.properties (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/JPAEMF.properties Mon Mar  5 10:41:30 2007
@@ -1,15 +1,21 @@
 
 # JPA/TopLink and Derby
-toplink.jdbc.driver=org.apache.derby.jdbc.ClientDriver
-toplink.jdbc.url=jdbc:derby://localhost:3219/planet
-toplink.jdbc.user=APP
-toplink.jdbc.password=APP
+#toplink.jdbc.driver=org.apache.derby.jdbc.ClientDriver
+#toplink.jdbc.url=jdbc:derby://localhost:3219/planet
+#toplink.jdbc.user=APP
+#toplink.jdbc.password=APP
 
 # JPA/TopLink and MySQL
 #toplink.jdbc.driver=com.mysql.jdbc.Driver
 #toplink.jdbc.url=jdbc:mysql://localhost/test_planet
 #toplink.jdbc.user=roller
 #toplink.jdbc.password=roller
+
+# OpenJPA and Derby
+openjpa.ConnectionDriverName=org.apache.derby.jdbc.ClientDriver
+openjpa.ConnectionURL=jdbc:derby://localhost:3219/planet
+openjpa.ConnectionUserName=APP
+openjpa.ConnectionPassword=APP
 
 # OpenJPA and MySQL
 #openjpa.ConnectionDriverName=com.mysql.jdbc.Driver

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/META-INF/persistence.xml?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/META-INF/persistence.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/META-INF/persistence.xml Mon Mar  5 10:41:30 2007
@@ -1,9 +1,9 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
     
     <persistence-unit name ="PlanetPU" transaction-type = "RESOURCE_LOCAL">        
-        <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
-        <!--
         <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+        <!--
+        <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
         <provider>org.hibernate.ejb.HibernatePersistence</provider>
         -->
         <mapping-file>org/apache/roller/planet/pojos/PropertyData.orm.xml</mapping-file>

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/planet-custom.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/planet-custom.properties?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/planet-custom.properties (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/testdata/planet-custom.properties Mon Mar  5 10:41:30 2007
@@ -1,4 +1,8 @@
 
+persistence.planet.classname=org.apache.roller.planet.business.jpa.JPAPlanetImpl
+#persistence.planet.classname=org.apache.roller.planet.business.datamapper.jpa.JPAPlanetImpl
+#persistence.planet.classname=org.apache.roller.planet.business.hibernate.HibernatePlanetImpl
+
 jdbc.driverClass=org.apache.derby.jdbc.ClientDriver
 jdbc.connectionURL=jdbc:derby://localhost:3219/planet
 jdbc.username=app

Added: incubator/roller/branches/roller_4.0_newbackend/apps/planet/velocity.log
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/velocity.log?view=auto&rev=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/velocity.log (added)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/velocity.log Mon Mar  5 10:41:30 2007
@@ -0,0 +1,44 @@
+Mon Mar 05 10:36:41 EST 2007  [debug] AvalonLogSystem initialized using logfile 'velocity.log'
+Mon Mar 05 10:36:41 EST 2007   [info] ************************************************************** 
+Mon Mar 05 10:36:41 EST 2007   [info] Starting Jakarta Velocity v1.4
+Mon Mar 05 10:36:41 EST 2007   [info] RuntimeInstance initializing.
+Mon Mar 05 10:36:41 EST 2007   [info] Default Properties File: org/apache/velocity/runtime/defaults/velocity.properties
+Mon Mar 05 10:36:41 EST 2007   [info] Trying to use logger class org.apache.velocity.runtime.log.AvalonLogSystem
+Mon Mar 05 10:36:41 EST 2007   [info] Using logger class org.apache.velocity.runtime.log.AvalonLogSystem
+Mon Mar 05 10:36:41 EST 2007   [info] Default ResourceManager initializing. (class org.apache.velocity.runtime.resource.ResourceManagerImpl)
+Mon Mar 05 10:36:41 EST 2007   [info] Resource Loader Instantiated: org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Mon Mar 05 10:36:41 EST 2007   [info] ClasspathResourceLoader : initialization starting.
+Mon Mar 05 10:36:41 EST 2007   [info] ClasspathResourceLoader : initialization complete.
+Mon Mar 05 10:36:41 EST 2007   [info] ResourceCache : initialized. (class org.apache.velocity.runtime.resource.ResourceCacheImpl)
+Mon Mar 05 10:36:41 EST 2007   [info] Default ResourceManager initialization complete.
+Mon Mar 05 10:36:41 EST 2007   [info] Loaded System Directive: org.apache.velocity.runtime.directive.Literal
+Mon Mar 05 10:36:41 EST 2007   [info] Loaded System Directive: org.apache.velocity.runtime.directive.Macro
+Mon Mar 05 10:36:41 EST 2007   [info] Loaded System Directive: org.apache.velocity.runtime.directive.Parse
+Mon Mar 05 10:36:41 EST 2007   [info] Loaded System Directive: org.apache.velocity.runtime.directive.Include
+Mon Mar 05 10:36:41 EST 2007   [info] Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
+Mon Mar 05 10:36:41 EST 2007   [info] Created: 20 parsers.
+Mon Mar 05 10:36:41 EST 2007   [info] Velocimacro : initialization starting.
+Mon Mar 05 10:36:41 EST 2007   [info] Velocimacro : adding VMs from VM library template : VM_global_library.vm
+Mon Mar 05 10:36:41 EST 2007  [error] ResourceManager : unable to find resource 'VM_global_library.vm' in any resource loader.
+Mon Mar 05 10:36:41 EST 2007   [info] Velocimacro : error using  VM library template VM_global_library.vm : org.apache.velocity.exception.ResourceNotFoundException: Unable to find resource 'VM_global_library.vm'
+Mon Mar 05 10:36:41 EST 2007   [info] Velocimacro :  VM library template macro registration complete.
+Mon Mar 05 10:36:41 EST 2007   [info] Velocimacro : allowInline = true : VMs can be defined inline in templates
+Mon Mar 05 10:36:41 EST 2007   [info] Velocimacro : allowInlineToOverride = false : VMs defined inline may NOT replace previous VM definitions
+Mon Mar 05 10:36:41 EST 2007   [info] Velocimacro : allowInlineLocal = false : VMs defined inline will be  global in scope if allowed.
+Mon Mar 05 10:36:41 EST 2007   [info] Velocimacro : messages on  : VM system will output logging messages
+Mon Mar 05 10:36:41 EST 2007   [info] Velocimacro : autoload off  : VM system will not automatically reload global library macros
+Mon Mar 05 10:36:41 EST 2007   [info] Velocimacro : initialization complete.
+Mon Mar 05 10:36:41 EST 2007   [info] Velocity successfully started.
+Mon Mar 05 10:36:41 EST 2007   [info] ResourceManager : found control.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Mon Mar 05 10:36:41 EST 2007   [info] Velocimacro : added new VM : #addColumnNull( table column type ) : source = macros.vm
+Mon Mar 05 10:36:41 EST 2007   [info] Velocimacro : added new VM : #addColumnNotNull( table column type default ) : source = macros.vm
+Mon Mar 05 10:36:41 EST 2007   [info] Velocimacro : added new VM : #dropNotNullFromTableId( table ) : source = macros.vm
+Mon Mar 05 10:36:41 EST 2007   [info] Velocimacro : added new VM : #longtext( size ) : source = macros.vm
+Mon Mar 05 10:36:41 EST 2007   [info] ResourceManager : found macros.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Mon Mar 05 10:36:41 EST 2007   [info] ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Mon Mar 05 10:36:41 EST 2007   [info] ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Mon Mar 05 10:36:41 EST 2007   [info] ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Mon Mar 05 10:36:41 EST 2007   [info] ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Mon Mar 05 10:36:41 EST 2007   [info] ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Mon Mar 05 10:36:41 EST 2007   [info] ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+Mon Mar 05 10:36:41 EST 2007   [info] ResourceManager : found createdb.vm with loader org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/META-INF/persistence.xml?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/META-INF/persistence.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/META-INF/persistence.xml Mon Mar  5 10:41:30 2007
@@ -1,9 +1,9 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
     
     <persistence-unit name ="PlanetPU" transaction-type = "RESOURCE_LOCAL">
-        <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
-        <!--
         <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+        <!--
+        <provider>oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider</provider>
         <provider>org.hibernate.ejb.HibernatePersistence</provider>
         -->
         <jta-data-source>jdbc/planetdb</jta-data-source>

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/log4j.properties?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/log4j.properties (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/log4j.properties Mon Mar  5 10:41:30 2007
@@ -16,12 +16,12 @@
 
 # Properties for configuring Log4j for this application
 # This is the configuring for logging displayed in the Application Server
-log4j.rootCategory=INFO, roller
+log4j.rootCategory=INFO, planet
 
-log4j.appender.roller=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.roller.File=${catalina.base}/logs/planet.log
-log4j.appender.roller.layout=org.apache.log4j.PatternLayout
-log4j.appender.roller.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} %C{1}:%M - %m%n
+log4j.appender.planet=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.planet.File=${catalina.base}/logs/planet.log
+log4j.appender.planet.layout=org.apache.log4j.PatternLayout
+log4j.appender.planet.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} %C{1}:%M - %m%n
 
 # Options are: DEBUG, INFO, WARN, ERROR, FATAL
 # Roller code

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/planet.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/planet.properties?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/planet.properties (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/classes/planet.properties Mon Mar  5 10:41:30 2007
@@ -40,25 +40,23 @@
 # properties in this file are accessed like this ...
 #    PlanetConfig.getProperty("propname");
 
-# Business layer implementation to be used
-persistence.planet.classname=org.apache.roller.planet.business.hibernate.HibernatePlanetImpl
-#persistence.planet.classname=org.apache.roller.planet.business.jpa.JPAPlanetImpl
-
-# choose a url strategy
-urlstrategy.classname=\
-org.apache.roller.planet.business.MultiPlanetURLStrategy
-
 # You MUST override and set these three properties correctly:
 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
 
+# Business layer implementation to be used
+#persistence.planet.classname=\
+#org.apache.roller.planet.business.hibernate.HibernatePlanetImpl
+persistence.planet.classname=\
+org.apache.roller.planet.business.jpa.JPAPlanetImpl
+
+# choose a url strategy
+urlstrategy.classname=\
+org.apache.roller.planet.business.MultiPlanetURLStrategy
 
 # The set of default Roller renderer factories.
 rendering.rollerRendererFactories=\
@@ -80,22 +78,26 @@
 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.multiPlanetMapper.userProtectedUrls=
+
+rendering.homepageModels=\
+org.apache.roller.planet.ui.rendering.model.SiteModel,\
+org.apache.roller.planet.ui.rendering.model.SiteURLModel,\
+org.apache.roller.planet.ui.rendering.model.UtilitiesModel
 
 rendering.pageModels=\
 org.apache.roller.planet.ui.rendering.model.PageModel,\
-org.apache.roller.planet.ui.rendering.model.URLModel,\
+org.apache.roller.planet.ui.rendering.model.PlanetURLModel,\
 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.URLModel,\
+org.apache.roller.planet.ui.rendering.model.PlanetURLModel,\
 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.URLModel,\
+org.apache.roller.planet.ui.rendering.model.PlanetURLModel,\
 org.apache.roller.planet.ui.rendering.model.UtilitiesModel
 
 # Hibernate dialect: You must override this to use a database other than MySQL4

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp Mon Mar  5 10:41:30 2007
@@ -50,6 +50,7 @@
                 <s:hidden name="planetid" />
                 <s:textfield label="%{getText('PlanetForm.handle')}" name="planet.handle" size="40" />
                 <s:textfield label="%{getText('PlanetForm.title')}" name="planet.title" size="40" />
+                <s:textarea label="%{getText('PlanetForm.description')}" name="planet.description" cols="47" rows="3" />
                 <s:submit />
             </s:form>
             
@@ -60,7 +61,6 @@
                 
                 <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>
@@ -72,8 +72,7 @@
                         </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}" />'><s:text name="PlanetForm.link" /></a></td>
+                            <td><img src='<s:url value="/planet-ui/images/world_link.png"/>' /><a href='<s:url value="/%{planet.handle}/group/%{handle}/" />'><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>

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp Mon Mar  5 10:41:30 2007
@@ -54,7 +54,7 @@
                 <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: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 />

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp Mon Mar  5 10:41:30 2007
@@ -48,7 +48,6 @@
             <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>
@@ -61,8 +60,7 @@
                     </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><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/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>

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/velocity/group.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/velocity/group.vm?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/velocity/group.vm (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/velocity/group.vm Mon Mar  5 10:41:30 2007
@@ -48,4 +48,7 @@
          #end
       </td>
 </tr>
-</body></html>
+</table>
+
+</body>
+</html>
\ No newline at end of file

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/web.xml?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/web.xml (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/WEB-INF/web.xml Mon Mar  5 10:41:30 2007
@@ -50,16 +50,25 @@
         <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>
@@ -67,6 +76,11 @@
     </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>
@@ -81,9 +95,11 @@
         <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>

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/index.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/index.jsp?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/index.jsp (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/index.jsp Mon Mar  5 10:41:30 2007
@@ -15,5 +15,4 @@
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
 --%>
-
-need a homepage
+<jsp:forward page="planet-ui/rendering/homepage" />
\ No newline at end of file

Modified: incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/planet-ui/css/planet.css
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/planet-ui/css/planet.css?view=diff&rev=514799&r1=514798&r2=514799
==============================================================================
--- incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/planet-ui/css/planet.css (original)
+++ incubator/roller/branches/roller_4.0_newbackend/apps/planet/web/planet-ui/css/planet.css Mon Mar  5 10:41:30 2007
@@ -72,6 +72,10 @@
     text-align: right;
 }
 
+td.tdLabel {
+    vertical-align:top;
+}
+
 table.form {
     width: 80%
 }



Mime
View raw message