roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r512419 - in /incubator/roller/branches/roller_4.0: ./ apps/planet/ 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/planet/pojo...
Date Tue, 27 Feb 2007 21:25:17 GMT
Author: snoopdave
Date: Tue Feb 27 13:25:14 2007
New Revision: 512419

URL: http://svn.apache.org/viewvc?view=rev&rev=512419
Log:
Merging from trunk, used this command:
svn merge -r 508659:512378 https://svn.apache.org/repos/asf/incubator/roller/trunk

Added:
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm-PlanetForm!save-validation.xml
      - copied unchanged from r512378, incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm-PlanetForm!save-validation.xml
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm-PlanetGroupForm!save-validation.xml
      - copied unchanged from r512378, incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm-PlanetGroupForm!save-validation.xml
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm-PlanetSubscriptionForm!save-validation.xml
      - copied unchanged from r512378, incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm-PlanetSubscriptionForm!save-validation.xml
    incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/JPAEMF.properties
      - copied, changed from r511518, incubator/roller/branches/roller_4.0/testdata/JPAEMF.properties
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/
      - copied from r512378, incubator/roller/trunk/tools/struts-2.0.5/
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/LICENSE.txt
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/LICENSE.txt
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/NOTICE.txt
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/NOTICE.txt
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/
      - copied from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/antlr-2.7.2.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/antlr-2.7.2.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/commons-beanutils-1.7.0.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/commons-beanutils-1.7.0.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/commons-chain-1.1.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/commons-chain-1.1.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/commons-validator-1.3.0.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/commons-validator-1.3.0.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/freemarker-2.3.8.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/freemarker-2.3.8.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/ognl-2.6.9.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/ognl-2.6.9.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/oro-2.0.8.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/oro-2.0.8.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/spring-aop-1.2.8.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/spring-aop-1.2.8.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/spring-beans-1.2.8.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/spring-beans-1.2.8.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/spring-context-1.2.8.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/spring-context-1.2.8.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/spring-core-1.2.8.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/spring-core-1.2.8.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/spring-web-1.2.8.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/spring-web-1.2.8.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/struts2-api-2.0.5.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/struts2-api-2.0.5.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/struts2-core-2.0.5.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/struts2-core-2.0.5.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/struts2-spring-plugin-2.0.5.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/struts2-spring-plugin-2.0.5.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.5/lib/xwork-2.0.0.jar
      - copied unchanged from r512378, incubator/roller/trunk/tools/struts-2.0.5/lib/xwork-2.0.0.jar
Removed:
    incubator/roller/branches/roller_4.0/testdata/JPAEMF.properties
    incubator/roller/branches/roller_4.0/tools/lib/commons-collections-3.1.jar
    incubator/roller/branches/roller_4.0/tools/struts-2.0.1/
Modified:
    incubator/roller/branches/roller_4.0/apps/planet/build.xml
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm.java
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetsList.java
    incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/package.properties
    incubator/roller/branches/roller_4.0/apps/planet/src/sql/createdb.vm
    incubator/roller/branches/roller_4.0/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java
    incubator/roller/branches/roller_4.0/apps/planet/test/java/org/apache/roller/planet/business/PlanetTest.java
    incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp
    incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp
    incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/velocity/group-atom.vm
    incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/velocity/opml.vm
    incubator/roller/branches/roller_4.0/apps/planet/web/planet-ui/css/planet.css
    incubator/roller/branches/roller_4.0/docs/installguide/generated/roller-install-guide.html
    incubator/roller/branches/roller_4.0/docs/installguide/generated/roller-install-guide.pdf
    incubator/roller/branches/roller_4.0/docs/installguide/roller-install-guide.odt
    incubator/roller/branches/roller_4.0/merges.txt
    incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/core/BasePageModel.java
    incubator/roller/branches/roller_4.0/web/WEB-INF/classes/roller.properties
    incubator/roller/branches/roller_4.0/web/WEB-INF/velocity/weblog.vm

Modified: incubator/roller/branches/roller_4.0/apps/planet/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/build.xml?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/build.xml (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/build.xml Tue Feb 27 13:25:14 2007
@@ -92,7 +92,7 @@
         <include name="jakarta-taglibs-standard-1.1.2/lib/serializer.jar" />
         
         <!-- Struts 2 -->
-        <include name="struts-2.0.1/lib/*.jar"/>
+        <include name="struts-2.0.5/lib/*.jar"/>
     </fileset>
     
     <path id="planet.business.path">

Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java Tue Feb 27 13:25:14 2007
@@ -171,6 +171,16 @@
     /** Delete entry. */
     public void deleteEntry(PlanetEntryData entry) throws RollerException;
     
+    
+    /**
+     * Delete all entries for a subscription.
+     *
+     * @param subscription The subscription to delete entries from.
+     * @throws RollerException If there is a problem doing the delete.
+     */
+    public void deleteEntries(PlanetSubscriptionData sub) throws RollerException;
+    
+    
     /** Clear any aggregations and update times that have been cached */
     public void clearCachedAggregations();
     

Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java Tue Feb 27 13:25:14 2007
@@ -103,6 +103,19 @@
         strategy.remove(entry);
     }
     
+    
+    public void deleteEntries(PlanetSubscriptionData sub) 
+        throws RollerException {
+        Iterator entries = sub.getEntries().iterator();
+        while(entries.hasNext()) {
+            strategy.remove(entries.next());
+        }
+        
+        // make sure and clear the other side of the assocation
+        sub.getEntries().clear();
+    }
+    
+    
     public void deletePlanet(PlanetData planet) 
         throws RollerException {
         strategy.remove(planet);
@@ -441,8 +454,8 @@
         FeedFetcherCache feedInfoCache =
                 new DiskFeedInfoCache(cacheDirName);
         
-        String proxyHost = PlanetRuntimeConfig.getProperty("site.proxyHost");
-        int proxyPort = PlanetRuntimeConfig.getIntProperty("site.proxyPort");
+        String proxyHost = PlanetRuntimeConfig.getProperty("site.proxyhost");
+        int proxyPort = PlanetRuntimeConfig.getIntProperty("site.proxyport");
         if (proxyHost != null && proxyPort > 0) {
             System.setProperty("proxySet", "true");
             System.setProperty("http.proxyHost", proxyHost);
@@ -473,7 +486,7 @@
             
             log.debug("   Entry count: " + count);
             if (count > 0) {
-                sub.purgeEntries();
+                this.deleteEntries(sub);
                 sub.addEntries(newEntries);
                 this.saveSubscription(sub);
                 this.strategy.flush();

Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java Tue Feb 27 13:25:14 2007
@@ -1,10 +1,19 @@
 /*
- * PlanetData.java
+ * 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
  *
- * Created on December 13, 2006, 5:09 PM
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
+ * 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.
  */
 
 package org.apache.roller.planet.pojos;
@@ -21,7 +30,7 @@
 public class PlanetData {
     
     private String id = null;
-    private String name = null;
+    private String title = null;
     private String handle = null;
     private Set groups = new HashSet();
     
@@ -31,7 +40,7 @@
     
     
     public PlanetData(String name, String handle) {
-        this.name = name;
+        this.title = name;
         this.handle = handle;
     }
     
@@ -48,14 +57,14 @@
     }
 
     /**
-     * @hibernate.property column="name" non-null="true" unique="false"
+     * @hibernate.property column="title" non-null="true" unique="false"
      */
-    public String getName() {
-        return name;
+    public String getTitle() {
+        return title;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setTitle(String title) {
+        this.title = title;
     }
 
     /**

Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetSubscriptionData.java Tue Feb 27 13:25:14 2007
@@ -218,7 +218,7 @@
     }
     
     /** 
-     * @hibernate.bag lazy="true" inverse="true" cascade="all-delete-orphan" 
+     * @hibernate.bag lazy="true" inverse="true" cascade="all" 
      * @hibernate.collection-key column="subscription_id"
      * @hibernate.collection-one-to-many class="org.apache.roller.planet.pojos.PlanetEntryData"
      */
@@ -248,8 +248,4 @@
         this.getEntries().addAll(newEntries);
     }
     
-    public void purgeEntries()
-    {
-        this.getEntries().clear();
-    }
 }

Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/tasks/TechnoratiRankingsTask.java Tue Feb 27 13:25:14 2007
@@ -51,8 +51,8 @@
             PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();
             Technorati technorati = null;
             try {
-                String proxyHost = PlanetRuntimeConfig.getProperty("site.proxyHost");
-                int proxyPort = PlanetRuntimeConfig.getIntProperty("site.proxyPort");
+                String proxyHost = PlanetRuntimeConfig.getProperty("site.proxyhost");
+                int proxyPort = PlanetRuntimeConfig.getIntProperty("site.proxyport");
                 if (proxyHost != null && proxyPort != -1) {
                     technorati = new Technorati(proxyHost, proxyPort);
                 } else {

Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm.java?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetForm.java Tue Feb 27 13:25:14 2007
@@ -73,6 +73,8 @@
     }
     
     
+    // TODO: Validation - check that planet handle is unique
+    // TODO: Validation - make sure html is not allowed in handle or title
     public String save() {
         
         if(this.planet != null) {
@@ -116,14 +118,15 @@
                 pmgr.savePlanet(this.planet);
                 pmgr.deleteGroup(group);
                 PlanetFactory.getPlanet().flush();
+                
+                setSuccess("PlanetForm.message.groupDeleteSucceeded", group.getHandle());
+                return INPUT;
             } catch (RollerException ex) {
                 log.error("Error deleting planet group", ex);
                 setError("PlanetForm.error.groupDeleteFailed", getGroupid());
                 return INPUT;
             }
             
-            setSuccess("PlanetForm.message.groupDeleteSucceeded");
-            return INPUT;
         } else {
             setError("PlanetForm.error.groupNull");
             return INPUT;

Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetGroupForm.java Tue Feb 27 13:25:14 2007
@@ -76,6 +76,10 @@
         return INPUT;
     }
     
+    
+    // TODO: Validation - check that group handle is unique within planet
+    // TODO: Validation - make sure that html is not allowed in handle or title
+    // TODO: Validation - make sure maxXXXEntries have a proper value range
     public String save() {
         // save a group group
         log.debug("Saving Planet Group ...");
@@ -114,16 +118,18 @@
                     pmgr.saveGroup(group);
                     PlanetFactory.getPlanet().flush();
                 }
+                
+                setSuccess("PlanetGroupForm.message.subscriptionDeleteSucceeded", sub.getTitle());
             }
             
+            setError("PlanetGroupForm.error.subscriptionNull");
+            return INPUT;
+            
         } catch (RollerException ex) {
             log.error("Unable to lookup planet group", ex);
             setError("PlanetGroupForm.error.subscriptionDeleteFailed", getSubid());
             return INPUT;
         }
-        
-        setSuccess("PlanetGroupForm.message.subscriptionDeleteSucceeded", getSubid());
-        return INPUT;
     }
 
     public String getPlanetid() {

Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetSubscriptionForm.java Tue Feb 27 13:25:14 2007
@@ -67,6 +67,8 @@
         return INPUT;
     }
     
+    
+    // TODO: Validation - make sure that html is not allowed in title
     public String save() {
         // save a subscription
         log.debug("Saving Planet Subscription ...");

Modified: incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetsList.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetsList.java?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetsList.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/PlanetsList.java Tue Feb 27 13:25:14 2007
@@ -69,7 +69,7 @@
         
         if(getPlanetid() != null && getPlanetid().length() > 0) {
             // delete a planet
-            log.info("Deleting Planet ... "+getPlanetid());
+            log.debug("Deleting Planet ... "+getPlanetid());
             
             try {
                 PlanetManager pMgr = PlanetFactory.getPlanet().getPlanetManager();
@@ -78,15 +78,16 @@
                     pMgr.deletePlanet(planet);
                     PlanetFactory.getPlanet().flush();
                 }
+                
+                // delete succeeded, handle rest of request as usual
+                setSuccess("PlanetsList.message.planetDeleteSucceeded", planet.getHandle());
+                return execute();
             } catch(Exception e) {
                 log.error("Error deleting planet", e);
                 setError("PlanetsList.error.planetDeleteFailed", getPlanetid());
                 return LIST;
             }
             
-            // delete succeeded, handle rest of request as usual
-            setSuccess("PlanetsList.message.planetDeleteSucceeded", getPlanetid());
-            return execute();
         } else {
             setError("PlanetsList.error.planetNull");
             return execute();

Modified: incubator/roller/branches/roller_4.0/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/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/package.properties?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/package.properties (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/java/org/apache/roller/planet/ui/admin/struts2/package.properties Tue Feb 27 13:25:14 2007
@@ -46,7 +46,7 @@
 You can set the title, handle for each planet.
 
 PlanetForm.handle=Handle
-PlanetForm.title=Name
+PlanetForm.title=Title
 
 PlanetForm.groupsHeading=Groups in this planet
 PlanetForm.groupTitle=Group Title
@@ -60,6 +60,11 @@
 PlanetForm.message.saveSucceeded=Planet saved.
 PlanetForm.message.groupDeleteSucceeded=Group {0} has been deleted.
 
+PlanetForm.error.handleNull=How can you have a planet with no handle?  Try again.
+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.saveFailed=Failed to save planet.
 PlanetForm.error.groupDeleteFailed=Failed to delete group {0}.
 PlanetForm.error.planetNull=Operation failed, planet was null
@@ -72,7 +77,7 @@
 PlanetGroupForm.heading=Edit Group
 PlanetGroupForm.returnToPlanet=Return to planet
 PlanetGroupForm.help=\
-You can set the title, handle, descrption and list of feeds for each group. \
+You can set the title, handle, description and list of feeds for each group. \
 What's a group? \
 A group is a collection of RSS or Atom feed subscriptions that will be aggregated together to form a Planet. \
 The GeneratePlanetTask program (runs every hour or so) will generate a set of HTML, OPML and RSS files for each group you define.
@@ -94,6 +99,16 @@
 PlanetGroupForm.message.saveSucceeded=Group saved.
 PlanetGroupForm.message.subscriptionDeleteSucceeded=Subscription {0} has been deleted.
 
+PlanetGroupForm.error.handleNull=How can you have a group with no handle?  Try again.
+PlanetGroupForm.error.handleSize=That's a pretty long handle you chose.  We only allow handles to be at most 32 characters.
+PlanetGroupForm.error.titleNull=Don't you want a title for your group?  Try again.
+PlanetGroupForm.error.titleSize=That's a pretty long title you chose.  We only allow titles to be at most 255 characters.
+PlanetGroupForm.error.descriptionSize=That's a pretty long description.  We only allow descriptions to be at most 255 characters.
+PlanetGroupForm.error.maxPageEntriesNull=How can we display your group if we don't know how many entries to show?
+PlanetGroupForm.error.maxPageEntriesInt=Don't try to be cheeky, you know we need a number here.
+PlanetGroupForm.error.maxFeedEntriesNull=How can we offer your group feed if we don't know how many entries to include?
+PlanetGroupForm.error.maxFeedEntriesInt=Don't try to be cheeky, you know we need a number here.
+
 PlanetGroupForm.error.saveFailed=Failed to save group.
 PlanetGroupForm.error.subscriptionDeleteFailed=Failed to delete subscription {0}.
 PlanetGroupForm.error.subscriptionNull=Operation failed, subscription was null.
@@ -114,6 +129,14 @@
 PlanetSubscriptionForm.addSubscription=Add another subscription
 
 PlanetSubscriptionForm.message.saveSucceeded=Subscription saved.
+
+PlanetSubscriptionForm.error.titleNull=Don't you want a title for your subscription?
+PlanetSubscriptionForm.error.titleSize=That's a pretty long title you chose.  We only allow titles to be at most 255 characters.
+PlanetSubscriptionForm.error.feedURLNull=How could we possibly subscribe without a feed url?
+PlanetSubscriptionForm.error.feedURLValid=Hmm, our url validator says you entered a non compliant url.  Want to double check it?
+PlanetSubscriptionForm.error.feedURLSize=That's a pretty long feed url.  We only allow feed urls to be at most 255 characters.
+PlanetSubscriptionForm.error.siteURLValid=Hmm, our url validator says you entered a non compliant url.  Want to double check it?
+PlanetSubscriptionForm.error.siteURLSize=That's a pretty long site url.  We only allow site urls to be at most 255 characters.
 
 PlanetSubscriptionForm.error.saveFailed=Failed to save subscription.
 PlanetSubscriptionForm.error.groupNull=Operation failed, group was null.

Modified: incubator/roller/branches/roller_4.0/apps/planet/src/sql/createdb.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/src/sql/createdb.vm?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/src/sql/createdb.vm (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/src/sql/createdb.vm Tue Feb 27 13:25:14 2007
@@ -25,29 +25,29 @@
 
 create table rag_planet (
     id              varchar(48) not null primary key,
-    name            varchar(255) not null,
+    title           varchar(255) not null,
     handle          varchar(32) not null
 );
-create index ragp_handle_idx on rag_planet(handle);
+alter table rag_planet add constraint ragp_handle_uq unique ( handle );
 
 
 create table rag_group (
     id               varchar(48) not null primary key,
-    handle           varchar(255) not null,
+    planet_id        varchar(48),
+    handle           varchar(32) not null,
     title            varchar(255) not null,
     description      varchar(255),
-    cat_restriction  $db.TEXT_SQL_TYPE,
-    group_page       varchar(255),
     max_page_entries integer default 30,
     max_feed_entries integer default 30,
-    planet_id        varchar(48)
+    cat_restriction  $db.TEXT_SQL_TYPE,
+    group_page       varchar(255)
 );
-alter table rag_group add constraint ragg_handle_uq unique ( handle$!db.INDEXSIZE );
+alter table rag_group add constraint ragg_handle_uq unique ( planet_id, handle );
 
 
 create table rag_subscription (
     id               varchar(48) not null primary key,
-    title            varchar(255),
+    title            varchar(255) not null,
     feed_url         varchar(255) not null,
     site_url         varchar(255),
     author           varchar(255),

Modified: incubator/roller/branches/roller_4.0/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/test/java/org/apache/roller/planet/business/PlanetManagerTest.java Tue Feb 27 13:25:14 2007
@@ -50,11 +50,13 @@
         
         {   // save subscriptions and a group
             PlanetSubscriptionData sub = new PlanetSubscriptionData();
+            sub.setTitle("test_url");
             sub.setFeedURL("test_url");
             planet.saveSubscription(sub);
             TestUtils.endSession(true);
             
             PlanetSubscriptionData sub1 = new PlanetSubscriptionData();
+            sub1.setTitle("test_url1");
             sub1.setFeedURL("test_url1");
             planet.saveSubscription(sub1);   
             
@@ -123,6 +125,7 @@
         
         {   // save subscription
             PlanetSubscriptionData sub = new PlanetSubscriptionData();
+            sub.setTitle("test_url");
             sub.setFeedURL("test_url");
             planet.saveSubscription(sub);
             TestUtils.endSession(true);
@@ -176,8 +179,7 @@
         {
             // purge entries
             PlanetSubscriptionData sub = planet.getSubscription("test_url");
-            sub.purgeEntries();
-            planet.saveSubscription(sub);
+            planet.deleteEntries(sub);
             TestUtils.endSession(true);
             
             // make sure they were removed
@@ -216,6 +218,7 @@
             planet.saveGroup(group);
             
             PlanetSubscriptionData sub = new PlanetSubscriptionData();
+            sub.setTitle(feed_url1);
             sub.setFeedURL(feed_url1);
             planet.saveSubscription(sub);
             
@@ -261,10 +264,12 @@
                 planet.saveGroup(group);
                 
                 PlanetSubscriptionData sub1 = new PlanetSubscriptionData();
+                sub1.setTitle(feed_url1);
                 sub1.setFeedURL(feed_url1);
                 planet.saveSubscription(sub1);
                 
                 PlanetSubscriptionData sub2 = new PlanetSubscriptionData();
+                sub2.setTitle(feed_url2);
                 sub2.setFeedURL(feed_url2);
                 planet.saveSubscription(sub2);
                 
@@ -320,9 +325,11 @@
             
             {
                 PlanetSubscriptionData sub1 = new PlanetSubscriptionData();
+                sub1.setTitle(feed_url1);
                 sub1.setFeedURL(feed_url1);
                 planet.saveSubscription(sub1);
                 PlanetSubscriptionData sub2 = new PlanetSubscriptionData();
+                sub2.setTitle(feed_url2);
                 sub2.setFeedURL(feed_url2);
                 planet.saveSubscription(sub2);
                 TestUtils.endSession(true);

Modified: incubator/roller/branches/roller_4.0/apps/planet/test/java/org/apache/roller/planet/business/PlanetTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/test/java/org/apache/roller/planet/business/PlanetTest.java?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/test/java/org/apache/roller/planet/business/PlanetTest.java (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/test/java/org/apache/roller/planet/business/PlanetTest.java Tue Feb 27 13:25:14 2007
@@ -52,7 +52,7 @@
         assertEquals("testPlanet", planet.getHandle());
         
         // modify
-        planet.setName("foo");
+        planet.setTitle("foo");
         mgr.savePlanet(planet);
         TestUtils.endSession(true);
         
@@ -60,7 +60,7 @@
         planet = null;
         planet = mgr.getPlanetById(testPlanet.getId());
         assertNotNull(planet);
-        assertEquals("foo", planet.getName());
+        assertEquals("foo", planet.getTitle());
         
         // remove
         mgr.deletePlanet(planet);

Modified: incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp Tue Feb 27 13:25:14 2007
@@ -49,7 +49,7 @@
             <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:textfield label="%{getText('PlanetForm.title')}" name="planet.title" size="40" />
                 <s:submit />
             </s:form>
             

Modified: incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/jsps/admin/PlanetsList.jsp Tue Feb 27 13:25:14 2007
@@ -43,6 +43,8 @@
             <%-- show a status message if needed --%>
             <%@include file="/WEB-INF/jsps/admin/statusMessage.jsp" %>
             
+            <p/>
+            
             <table class="data">
                 <tr>
                     <th><s:text name="PlanetsList.planetTitle" /></th>
@@ -58,7 +60,7 @@
                         <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: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/delete.png"/>' /><a href="javascript: void(0);" onclick="confirmPlanetDelete('<s:property value="id"/>', '<s:property value="handle"/>');"><s:text name="PlanetsList.deletePlanet"/></a></td>

Modified: incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/velocity/group-atom.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/velocity/group-atom.vm?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/velocity/group-atom.vm (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/velocity/group-atom.vm Tue Feb 27 13:25:14 2007
@@ -27,10 +27,10 @@
     #set($entries = $model.pager.items)
     #foreach($entry in $entries)
     <entry>
-        <id>$entry.permalink</id>
+        <id>$utils.escapeXML($entry.permalink)</id>
         <title type="html">$utils.escapeXML($entry.title)</title>
-        <author><name>$entry.author</name></author>
-        <link rel="alternate" type="text/html" href="$entry.permalink"/>
+        <author><name>$utils.escapeXML($entry.author)</name></author>
+        <link rel="alternate" type="text/html" href="$utils.escapeXML($entry.permalink)"/>
         <published>$utils.formatIso8601Date($entry.published)</published>
         <updated>$utils.formatIso8601Date($entry.published)</updated> 
         <category term="$utils.escapeXML($entry.category.name)" label="$utils.escapeXML($entry.category.name)" />

Modified: incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/velocity/opml.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/velocity/opml.vm?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/velocity/opml.vm (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/web/WEB-INF/velocity/opml.vm Tue Feb 27 13:25:14 2007
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding='utf-8'?>
 <opml version="1.1">
 <head>
-   <title>Subscriptions list for $model.group.title</title>
+   <title>Subscriptions list for $utils.escapeXML($model.group.title)</title>
    <dateCreated>$utils.formatRfc822Date($utils.now)</dateCreated>
    <dateModified>$utils.formatRfc822Date($utils.now)</dateModified>
    <ownerName>$model.planet.handle</ownerName>
@@ -11,9 +11,9 @@
 <body>
 <outline>
    #foreach($sub in $model.group.subscriptions)
-   <outline text="$sub.title" 
-          xmlUrl="$sub.feedURL" 
-         htmlUrl="$sub.siteURL" />
+   <outline text="$utils.escapeXML($sub.title)" 
+          xmlUrl="$utils.escapeXML($sub.feedURL)" 
+         htmlUrl="$utils.escapeXML($sub.siteURL)" />
    #end
 </outline>
 </body>

Modified: incubator/roller/branches/roller_4.0/apps/planet/web/planet-ui/css/planet.css
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/apps/planet/web/planet-ui/css/planet.css?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/apps/planet/web/planet-ui/css/planet.css (original)
+++ incubator/roller/branches/roller_4.0/apps/planet/web/planet-ui/css/planet.css Tue Feb 27 13:25:14 2007
@@ -49,6 +49,11 @@
     padding: 4px;
 }
 
+.errorMessage {
+    color: red;
+    font-weight: bold;
+}
+
 .success  { 
     border: 1px green  solid; 
     background: #AAFFAA;

Modified: incubator/roller/branches/roller_4.0/docs/installguide/generated/roller-install-guide.html
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/docs/installguide/generated/roller-install-guide.html?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/docs/installguide/generated/roller-install-guide.html (original)
+++ incubator/roller/branches/roller_4.0/docs/installguide/generated/roller-install-guide.html Tue Feb 27 13:25:14 2007
@@ -7,7 +7,7 @@
 	<META NAME="AUTHOR" CONTENT="Dave Johnson">
 	<META NAME="CREATED" CONTENT="20060123;11164600">
 	<META NAME="CHANGEDBY" CONTENT="Dave Johnson">
-	<META NAME="CHANGED" CONTENT="20061216;10482600">
+	<META NAME="CHANGED" CONTENT="20070226;10243900">
 	<STYLE>
 	<!--
 		@page { size: 8.5in 11in; margin: 0.5in }
@@ -356,8 +356,9 @@
 Activation jars.</P>
 <H3 CLASS="western"><A NAME="DDE_LINK4"></A>STEP 3.1: Download and
 install Hibernate</H3>
-<P CLASS="western">Roller <I>requires</I> the Hibernate persistence
-library, which you must download separately from Roller. 
+<P CLASS="western"><A NAME="DDE_LINK"></A>Roller <I>requires</I>
+<B>Hibernate Version 3.1.2</B>, which you must download separately
+from Roller. 
 </P>
 <P CLASS="western">	Download Hibernate 3.1.2 from SourceForge</P>
 <P CLASS="western">	<A HREF="http://prdownloads.sourceforge.net/hibernate/hibernate-3.1.2.tar.gz">http://prdownloads.sourceforge.net/hibernate/hibernate-3.1.2.tar.gz</A></P>
@@ -404,7 +405,7 @@
 	Hibernate configuration file to use the MySQL5 dialect (see Section
 	8.3 for details on that).</P>
 	<LI><P CLASS="western" STYLE="margin-bottom: 0in"><A NAME="st"></A>For
-	Oracle users, we recommend that you use the 10g (<A HREF="http://10.1.0.2/" TARGET="_blank" ONCLICK="return top.js.OpenExtLink(window,event,this)">10.1.0.2</A>
+	Oracle users, we recommend that you use the 10g (<A HREF="http://10.1.0.2/" TARGET="_blank">10.1.0.2</A>
 	or higher) drivers which should<BR>be packaged as ojdbc14.jar --
 	even if operating on Oracle 9 server.</P>
 </UL>
@@ -453,7 +454,6 @@
 	<LI><P CLASS="western"><FONT FACE="Courier New"><FONT SIZE=3>WEB-INF/dbscripts/derby/creatdb.sql</FONT></FONT></P>
 	<LI><P CLASS="western"><FONT FACE="Courier New"><FONT SIZE=3>WEB-INF/dbscripts/db2/creatdb.sql</FONT></FONT></P>
 	<LI><P CLASS="western"><FONT FACE="Courier New"><FONT SIZE=3>WEB-INF/dbscripts/oracle/creatdb.sql</FONT></FONT></P>
-	<LI><P CLASS="western"><FONT FACE="Courier New"><FONT SIZE=3>WEB-INF/dbscripts/oracle/creatdb.sql</FONT></FONT></P>
 </UL>
 <P CLASS="western">Here are some examples to show you how you might
 create the Roller tables in MySQL:</P>
@@ -492,15 +492,17 @@
 roller -h 127.0.0.1 -u scott -ptiger</FONT></P>
 <H2 CLASS="western" STYLE="page-break-before: always"><A NAME="section-InstallationGuide_2.x-STEP5DeployRollerToYourApplicationServer5"></A><A NAME="ref-InstallationGuide_2.x-5"></A>
 STEP 5: Deploy Roller to your application server</H2>
-<P CLASS="western">To deploy Roller to your application server you
-need to inform your application server:</P>
+<P CLASS="western">To deploy Roller you will need to inform your
+application server:</P>
 <UL>
 	<LI><P CLASS="western" STYLE="margin-bottom: 0in">Where to find the
-	Roller installation directory  
-	</P>
-	<LI><P CLASS="western">How to configure the Roller datasource under
-	the JNDI name <FONT FACE="Courier New">jdbc/rollerdb </FONT>
+	Roller installation directory</P>
+	<LI><P CLASS="western" STYLE="margin-bottom: 0in">How to configure
+	the Roller database data-source under the JNDI name <FONT FACE="Courier New">jdbc/rollerdb
+	</FONT>
 	</P>
+	<LI><P CLASS="western">How to configure the Roller email session
+	under the JNDI name <FONT FACE="Courier New, monospace">mail/Session</FONT></P>
 </UL>
 <P CLASS="western" STYLE="margin-bottom: 0in">For Tomcat you can do
 this by creating what's known as a context configuration file named
@@ -521,7 +523,8 @@
 to point to your database and the database username and password too.</P>
 <P CLASS="western" STYLE="margin-bottom: 0in"><BR>
 </P>
-<PRE><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;Context path=&quot;/roller&quot; docBase=&quot;<B>/usr/local/apache-roller-3.0-incubating/webapp/roller</B>&quot; debug=&quot;0&quot;&gt;</FONT></FONT>
+<PRE><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;Context path=&quot;/roller&quot; </FONT></FONT>
+  <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">docBase=&quot;<B>/usr/local/apache-roller-incubating-3.1/webapp/roller</B>&quot; debug=&quot;0&quot;&gt;</FONT></FONT>
   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;Resource name=&quot;jdbc/rollerdb&quot; auth=&quot;Container&quot; type=&quot;javax.sql.DataSource&quot; /&gt;</FONT></FONT>
   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;ResourceParams name=&quot;jdbc/rollerdb&quot;&gt;</FONT></FONT>
     <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;parameter&gt;</FONT></FONT>
@@ -555,10 +558,7 @@
       <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;/parameter&gt;</FONT></FONT>
   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;/ResourceParams&gt;</FONT></FONT>
   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">--&gt;</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;/Context&gt;</FONT></FONT></PRE><P CLASS="western">
-<BR><BR>
-</P>
-<P CLASS="western" STYLE="margin-bottom: 0in; page-break-before: always">
+<FONT SIZE=2 STYLE="font-size: 11pt"><FONT FACE="Courier New">&lt;/Context&gt;</FONT></FONT></PRE><P CLASS="western" STYLE="margin-bottom: 0in; page-break-before: always">
 <B>Example context configuration file for Tomcat 5.5.X users</B></P>
 <P CLASS="western" STYLE="margin-bottom: 0in"><BR>
 </P>
@@ -569,7 +569,8 @@
 to point to your database and the database username and password too.</P>
 <P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium"><BR>
 </P>
-<PRE><FONT FACE="Courier New"><FONT SIZE=3>&lt;Context path=&quot;/roller&quot; docBase=&quot;<B><FONT SIZE=2 STYLE="font-size: 11pt">/usr/local/apache-roller-3.0-incubating/webapp/roller</FONT></B>&quot; debug=&quot;0&quot;&gt;</FONT></FONT>
+<PRE><FONT FACE="Courier New"><FONT SIZE=3>&lt;Context path=&quot;/roller&quot; </FONT></FONT>
+  <FONT FACE="Courier New"><FONT SIZE=3>docBase=&quot;<B><FONT SIZE=2 STYLE="font-size: 11pt">/usr/local/apache-roller-<FONT SIZE=2 STYLE="font-size: 11pt">incubating-</FONT>3.1/webapp/roller</FONT></B>&quot; debug=&quot;0&quot;&gt;</FONT></FONT>
   <FONT FACE="Courier New"><FONT SIZE=3>&lt;Resource name=&quot;jdbc/rollerdb&quot; auth=&quot;Container&quot; </FONT></FONT>
       <FONT FACE="Courier New"><FONT SIZE=3>type=&quot;javax.sql.DataSource&quot;</FONT></FONT>
     <FONT FACE="Courier New"><FONT SIZE=3>driverClassName=&quot;com.mysql.jdbc.Driver&quot;</FONT></FONT>
@@ -587,11 +588,22 @@
      <FONT FACE="Courier New"><FONT SIZE=3>mail.smtp.host=&quot;mailhost.example.com&quot; /&gt;</FONT></FONT>
   <FONT FACE="Courier New"><FONT SIZE=3>--&gt;</FONT></FONT>
 <FONT FACE="Courier New"><FONT SIZE=3>&lt;/Context&gt;</FONT></FONT></PRE><P CLASS="western">
-<B>NOTES</B></P>
+<BR><BR>
+</P>
+<P CLASS="western"><B>NOTES</B></P>
 <UL>
-	<LI><P CLASS="western">If Roller starts up fine but later fails and
-	you find an error like the one below in your roller.log file then
-	try dropping your <FONT FACE="Courier New">maxActive</FONT>,
+	<LI><P CLASS="western"><B>Email configuration</B>. If you want to
+	use email notification of comments, group blogging invitations and
+	other events, you'll have  to enable that in your application
+	server. For Tomcat, you can do that by uncommenting the indicated
+	sections of the context configuration file above. No matter what
+	application server you use, you'll also have to uncomment the
+	<FONT FACE="Courier New, monospace">mail/Session</FONT> resource
+	reference <FONT FACE="Courier New, monospace">&lt;resource-ref&gt;</FONT>
+	near the end of the roller/WEB-INF/web.xml file.</P>
+	<LI><P CLASS="western"><B>The max_user_connections error</B>. If
+	Roller starts up fine but later fails and you find an error like the
+	one below in your roller.log file then try dropping your <FONT FACE="Courier New">maxActive</FONT>,
 	<FONT FACE="Courier New">maxIdle</FONT>, and <FONT FACE="Courier New">removeAbandoned</FONT>
 	values. Depending on your database configuration you may have to go
 	pretty low, such as setting <FONT FACE="Courier New">maxActive</FONT>
@@ -599,9 +611,11 @@
 	<FONT FACE="Courier New">removeAbandonedTimeout</FONT> to 60. 
 	</P>
 </UL>
-<P CLASS="western" STYLE="font-style: normal"><FONT FACE="Courier New"><FONT SIZE=2>	User
-scott@localhost has more than 'max_user_connections' active
-connections</FONT></FONT></P>
+<UL>
+	<LI><P CLASS="western" STYLE="font-style: normal"><FONT FACE="Courier New"><FONT SIZE=2>	User
+	scott@localhost has more than 'max_user_connections' active
+	connections</FONT></FONT></P>
+</UL>
 <P CLASS="western"><BR><BR>
 </P>
 <P CLASS="western"><BR><BR>
@@ -751,9 +765,10 @@
 <B>NOTE</B>: the default <FONT FACE="Courier New">roller.properties</FONT>
 file is shown in Appendix B.</P>
 <H4 CLASS="western"><A NAME="section-ConfigurationGuide_2.x-WhereToDefineCustomProperties"></A>
-Where to define custom properties</H4>
-<P CLASS="western" STYLE="margin-bottom: 0in">There are three ways
-you can alter the default configuration for Roller. 
+Don't edit roller.properties directly! Create an override file
+instead</H4>
+<P CLASS="western" STYLE="margin-bottom: 0in">There are two ways you
+can alter the default configuration for Roller. 
 </P>
 <P CLASS="western" STYLE="margin-bottom: 0in"><BR>
 </P>
@@ -859,37 +874,29 @@
 	</UL>
 </UL>
 <H3 CLASS="western"><SPAN STYLE="background: transparent">STEP 8.3:
-Verify the database dialet setting in the Hibernate configuration
+Verify the database dialect setting in the Hibernate configuration
 file</SPAN></H3>
 <P CLASS="western"><SPAN STYLE="background: transparent">If you're
 using MySQL 4.X for Roller, then you can skip this step.</SPAN></P>
 <P CLASS="western"><SPAN STYLE="background: transparent">If you're
-using some other database with Roller, then you must check the
-Hibernate dialect setting in the file
-<FONT FACE="Courier New">WEB-INF/classes/hibernate.cfg.xml</FONT>. 
-In that file, you'll see the section of code shown below. The line
-shown in bold is the current dialect setting. If you want to switch
-to another database, move the MySQLDialect line inside the<FONT FACE="Courier New">
-&lt;!-- --&gt;</FONT> comments and replace it with the line for your
-database of choice. </SPAN>
-</P>
-<P CLASS="western"><BR><BR>
+using some other database with Roller, then you must override the
+Hibernate dialect. In your roller-custom.properties override file,
+override the <SPAN STYLE="font-weight: medium"><FONT SIZE=2><FONT FACE="Courier New">hibernate.dialect</FONT></FONT><FONT SIZE=3><FONT FACE="Times New Roman, serif">
+property. For example, to set the dialect for MySQL 5, you would add
+this to your override file:</FONT></FONT></SPAN></SPAN></P>
+<P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium"><SPAN STYLE="background: transparent">
+  <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">hibernate.dialect=org.hibernate.dialect.MySQL5Dialect</SPAN></FONT></FONT></P>
+<P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium"><BR>
 </P>
-<PRE><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;!-- select SQL dialect, MySQL 3.X or 4.X by default --&gt;</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt"><B>&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.MySQLDialect&lt;/property&gt;</B></FONT></FONT>
-
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;!--</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">If you want to use HSQLDB, PostgreSQL, DB2 or Derby, Oracle, SQLServer then use the right dialect   </FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.HQLDBDialect&lt;/property&gt; </FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.PostgreSQLDialect&lt;/property&gt;</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.DB2Dialect&lt;/property&gt;</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.DerbyDialect&lt;/property&gt;</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.Oracle9Dialect&lt;/property&gt;</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.SQLServerDialect&lt;/property&gt;</FONT></FONT>
-
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">For MySQL 5.X, use the MySQL5 dialect and J/Connector 3.1.X</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">&lt;property name=&quot;dialect&quot;&gt;org.hibernate.dialect.MySQL5Dialect&lt;/property&gt;</FONT></FONT>
-<FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">--&gt;</FONT></FONT></PRE><P CLASS="western" STYLE="margin-bottom: 0in">
+<P CLASS="western" STYLE="font-weight: medium"><FONT FACE="Courier New"><FONT SIZE=2><SPAN STYLE="background: transparent"><FONT SIZE=3><FONT FACE="Times New Roman, serif">Here
+are all of the available dialect settings:</FONT></FONT></SPAN></FONT></FONT></P>
+<PRE>   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">org.hibernate.dialect.HQLDBDialect</FONT></FONT>
+   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">org.hibernate.dialect.PostgreSQLDialect</FONT></FONT>
+   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">org.hibernate.dialect.DB2Dialect</FONT></FONT>
+   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">org.hibernate.dialect.DerbyDialect</FONT></FONT>
+   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">org.hibernate.dialect.Oracle9Dialect</FONT></FONT>
+   <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">org.hibernate.dialect.SQLServerDialect</FONT></FONT>
+</PRE><P CLASS="western" STYLE="margin-bottom: 0in">
 <BR>
 </P>
 <P CLASS="western" STYLE="margin-bottom: 0in"><BR>
@@ -956,11 +963,11 @@
 	</P>
 </UL>
 <H3 CLASS="western"><SPAN STYLE="background: transparent">Important
-notes about Roller 3.0</SPAN></H3>
+notes for those upgrading from Roller 2.x to Roller 3.1</SPAN></H3>
 <P CLASS="western"><SPAN STYLE="background: transparent"><B>WARNING!</B>
-Roller 3.0 is a major release and makes some big changes to the way
-that Roller works. If you're upgrading you need to be aware of the
-new URL structure and the new template system.</SPAN></P>
+Roller 3.0 was a major release and made some big changes to the way
+that Roller works. If you're upgrading from the 2.x series you need
+to be aware of the new URL structure and the new template system.</SPAN></P>
 <P CLASS="western"><I><B><SPAN STYLE="background: transparent">The
 new URL structure</SPAN></B></I></P>
 <P CLASS="western"><SPAN STYLE="background: transparent">The most
@@ -1062,7 +1069,7 @@
 <PRE>   <FONT FACE="Courier New"><FONT SIZE=3>% cd $CATALINA_HOME/webapps</FONT></FONT>
    <FONT FACE="Courier New"><FONT SIZE=3>% mkdir /somewhere/safe/roller-old</FONT></FONT>
    <FONT FACE="Courier New"><FONT SIZE=3>% mv roller /somewhere/safe/roller-old</FONT></FONT></PRE><H3 CLASS="western">
-<A NAME="section-UpgradeGuide_2.1-STEP2InstallTheNewRoller2"></A><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller11"></A><A NAME="ref-UpgradeGuide_2.1-2"></A>
+<A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller11"></A><A NAME="section-UpgradeGuide_2.1-STEP2InstallTheNewRoller2"></A><A NAME="ref-UpgradeGuide_2.1-2"></A>
 UPGRADE STEP 2: Install the new Roller 
 </H3>
 <P CLASS="western">Follow the normal installation instructions to
@@ -1077,7 +1084,7 @@
 	the installation, we'll do that later 
 	</P>
 </UL>
-<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP3CopyResourcesAndUpdateConfigs3"></A><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller12"></A><A NAME="ref-UpgradeGuide_2.1-3"></A>
+<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller12"></A><A NAME="section-UpgradeGuide_2.1-STEP3CopyResourcesAndUpdateConfigs3"></A><A NAME="ref-UpgradeGuide_2.1-3"></A>
 UPGRADE STEP 3: Copy resources and update configs 
 </H3>
 <H4 CLASS="western"><A NAME="section-UpgradeGuide_2.1-3.1CopyYourOldResourcesAndOtherFilesYouveAdded"></A>
@@ -1099,26 +1106,36 @@
 </P>
 <H4 CLASS="western"><A NAME="section-UpgradeGuide_2.1-3.3ReviewConfigurationProperties"></A>
 3.3 Review configuration properties</H4>
-<P CLASS="western">Review properties as described in STEP #8 of the
-installation guide.</P>
+<P CLASS="western"><A NAME="DDE_LINK5"></A>Review properties as
+described in Section 8.0 of the installation guide. 
+</P>
 <UL>
-	<LI><P CLASS="western" STYLE="margin-bottom: 0in"><B>WARNING: In
-	Roller 2.3 we changed the Roller package names from org.roller to
-	org.apache.roller. Because of this you MUST review your
-	roller-custom.properties file, search for the string &ldquo;org.roller&rdquo;and
-	replace all occurances of it with &ldquo;org.apache.roller&rdquo;.</B></P>
+	<LI><P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium">
+	NOTE: Make sure you set the right Hibernate dialect for your
+	database in your roller-custom.properties file as discussed in
+	Section 8.3.</P>
 </UL>
-<P CLASS="western" STYLE="margin-bottom: 0in"><BR>
+<P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium"><BR>
+</P>
+<UL>
+	<LI><P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium">
+	NOTE: In Roller 2.3 we changed the Roller package names from
+	org.roller to org.apache.roller. Because of this you MUST review
+	your roller-custom.properties file, search for the string
+	&ldquo;org.roller&rdquo;and replace all occurances of it with
+	&ldquo;org.apache.roller&rdquo;.</P>
+</UL>
+<P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium"><BR>
 </P>
 <UL>
-	<LI VALUE=1><P CLASS="western" STYLE="margin-bottom: 0in"><B>WARNING:
-	The files required for Roller's JSPWiki plugin, Ekit editor and
-	Javascript enhanced editor have been removed from the Roller
+	<LI VALUE=1><P CLASS="western" STYLE="margin-bottom: 0in; font-weight: medium">
+	NOTE: The files required for Roller's JSPWiki plugin, Ekit editor
+	and Javascript enhanced editor have been removed from the Roller
 	distribution. If you'd like to continue to use these plugins, please
 	visit the Roller Support project on Java.Net
-	(http://roller.dev.java.net).</B></P>
+	(http://roller.dev.java.net).</P>
 </UL>
-<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP4UpgradeTheDatabase4"></A><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller13"></A><A NAME="ref-UpgradeGuide_2.1-4"></A>
+<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller13"></A><A NAME="section-UpgradeGuide_2.1-STEP4UpgradeTheDatabase4"></A><A NAME="ref-UpgradeGuide_2.1-4"></A>
 UPGRADE STEP 4: Upgrade the database 
 </H3>
 <P CLASS="western">Use the appropriate database upgrade script to
@@ -1165,7 +1182,7 @@
 <P CLASS="western">If you're upgrading from an earlier release you'll
 have to run each of the older scripts in order to upgrade your
 database.</P>
-<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP5StartupTomcat5"></A><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller14"></A><A NAME="ref-UpgradeGuide_2.1-5"></A>
+<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller14"></A><A NAME="section-UpgradeGuide_2.1-STEP5StartupTomcat5"></A><A NAME="ref-UpgradeGuide_2.1-5"></A>
 UPGRADE STEP 5: Startup your app server 
 </H3>
 <P CLASS="western">Use the standard Tomcat <FONT FACE="Courier New">startup.sh</FONT>

Modified: incubator/roller/branches/roller_4.0/docs/installguide/generated/roller-install-guide.pdf
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/docs/installguide/generated/roller-install-guide.pdf?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
Binary files - no diff available.

Modified: incubator/roller/branches/roller_4.0/docs/installguide/roller-install-guide.odt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/docs/installguide/roller-install-guide.odt?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
Binary files - no diff available.

Modified: incubator/roller/branches/roller_4.0/merges.txt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/merges.txt?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/merges.txt (original)
+++ incubator/roller/branches/roller_4.0/merges.txt Tue Feb 27 13:25:14 2007
@@ -3,6 +3,9 @@
 
 Temporary file to track merges from trunk into the roller_4.0 branch. 
 
+Feb. 27, 2007: merge latest from trunk
+svn merge -r 508659:512378 https://svn.apache.org/repos/asf/incubator/roller/trunk
+
 Feb. 20, 2007: merging more planet work from trunk
 svn merge -r 506461:508659 https://svn.apache.org/repos/asf/incubator/roller/trunk
 

Modified: incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/core/BasePageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/core/BasePageModel.java?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/core/BasePageModel.java (original)
+++ incubator/roller/branches/roller_4.0/src/org/apache/roller/ui/core/BasePageModel.java Tue Feb 27 13:25:14 2007
@@ -90,7 +90,7 @@
                 DateFormat.SHORT, request.getLocale());
         if (sdf instanceof SimpleDateFormat)
         {
-            return ((SimpleDateFormat)sdf).toLocalizedPattern();
+            return ((SimpleDateFormat)sdf).toPattern();
         }
         return "yyyy/MM/dd";
     }
@@ -101,7 +101,7 @@
                 DateFormat.MEDIUM, request.getLocale());
         if (sdf instanceof SimpleDateFormat)
         {
-            return ((SimpleDateFormat)sdf).toLocalizedPattern();
+            return ((SimpleDateFormat)sdf).toPattern();
         }
         return "MMM dd, yyyy";
     }

Copied: incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/JPAEMF.properties (from r511518, incubator/roller/branches/roller_4.0/testdata/JPAEMF.properties)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/JPAEMF.properties?view=diff&rev=512419&p1=incubator/roller/branches/roller_4.0/testdata/JPAEMF.properties&r1=511518&p2=incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/JPAEMF.properties&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/testdata/JPAEMF.properties (original)
+++ incubator/roller/branches/roller_4.0/testdata/WEB-INF/classes/JPAEMF.properties Tue Feb 27 13:25:14 2007
@@ -1,5 +1,6 @@
 
-# Database dialect options for Glassfish JPA/Toplink
+#-----------------------------------------------------------------------------
+# Database configuration for Glassfish JPA/Toplink
 
 # Default test setup runs Derby
 toplink.jdbc.driver=org.apache.derby.jdbc.ClientDriver
@@ -9,32 +10,17 @@
 
 # Alternative MySQL example (see ant.properties and roller-custom.properties)
 #toplink.jdbc.driver=com.mysql.jdbc.Driver
-#toplink.jdbc.url=jdbc:mysql://localhost:3306/roller
+#toplink.jdbc.url=jdbc:mysql://snoopdave:3306/rollertest
 #toplink.jdbc.user=scott
 #toplink.jdbc.password=tiger
 
 toplink.logging.level=FINEST
 
-# Target database properties: Toplink defaults to automatic detection of 
-# target database, but that works only if the JDBC driver supports the 
-# right metadata -- so sometimes setting toplink.target-database is required.
-# 
-# http://www.oracle.com/technology/products/ias/toplink/jpa/resources/toplink-jpa-extensions.html#CJAEBIJC
+#-----------------------------------------------------------------------------
+# Database configuration for Apache OpenJPA (incubating)
 
-# Auto-detection is the default
-#toplink.target-database=Auto
-
-# Why three options for Derby?
-#toplink.target-database=Derby
-#toplink.target-database=Cloudscape
-#toplink.target-database=JavaDB
-
-# Other databases. No MySQL5? 
-#toplink.target-database=MySQL4
-#toplink.target-database=PostgreSQL
-#toplink.target-database=Oracle
-#toplink.target-database=HSQL
-#toplink.target-database=DB2
-
-# Other generic SQL database
-#toplink.target-database=Database
+#openjpa.ConnectionDriverName=com.mysql.jdbc.Driver
+#openjpa.ConnectionURL=jdbc:mysql://localhost:3306/rollertest
+#openjpa.ConnectionUserName=scott
+#openjpa.ConnectionPassword=tiger
+#openjpa.Log=DefaultLevel=TRACE, Tool=INFO

Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/classes/roller.properties?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/classes/roller.properties Tue Feb 27 13:25:14 2007
@@ -228,9 +228,13 @@
 schemeenforcement.enabled=false
 
 # URL patterns that require HTTPS
-schemeenforcement.https.urls=/j_security_check,/roller-ui/login-redirect.jsp,\
-/roller-ui/login.do,/roller-ui/user.do,/roller-ui/yourProfile.do,\
-/roller-ui/admin/user.do,/roller-ui/authoring/userdata
+schemeenforcement.https.urls=/roller_j_security_check,\
+/roller-ui/login-redirect.jsp,\
+/roller-ui/login.do,\
+/roller-ui/user.do,\
+/roller-ui/yourProfile.do,\
+/roller-ui/admin/user.do,\
+/roller-ui/authoring/userdata
 
 # Password security settings
 passwds.encryption.enabled=false

Modified: incubator/roller/branches/roller_4.0/web/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/web/WEB-INF/velocity/weblog.vm?view=diff&rev=512419&r1=512418&r2=512419
==============================================================================
--- incubator/roller/branches/roller_4.0/web/WEB-INF/velocity/weblog.vm (original)
+++ incubator/roller/branches/roller_4.0/web/WEB-INF/velocity/weblog.vm Tue Feb 27 13:25:14 2007
@@ -695,7 +695,7 @@
             <select name="cat">
             <option value="">- In Category -</option>
             #foreach( $cat in $cats )
-              <option #if($cat.name == $model.term)selected="selected"#end>$cat.name</option>
+              <option #if($cat.name == $model.weblogCategory.name)selected="selected"#end>$cat.name</option>
             #end
             </select>
 



Mime
View raw message