You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/04/07 20:01:49 UTC

svn commit: r526464 [1/2] - in /incubator/roller/trunk: ./ 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/pojos/ apps/...

Author: snoopdave
Date: Sat Apr  7 11:01:47 2007
New Revision: 526464

URL: http://svn.apache.org/viewvc?view=rev&rev=526464
Log:
Making Roller work with latest Roller-Planet code

Added:
    incubator/roller/trunk/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java
    incubator/roller/trunk/testdata/WEB-INF/security.xml
    incubator/roller/trunk/web/WEB-INF/classes/org/
    incubator/roller/trunk/web/WEB-INF/classes/org/apache/
    incubator/roller/trunk/web/WEB-INF/classes/org/apache/xmlrpc/
    incubator/roller/trunk/web/WEB-INF/classes/org/apache/xmlrpc/webserver/
    incubator/roller/trunk/web/WEB-INF/classes/org/apache/xmlrpc/webserver/XmlRpcServlet.properties
    incubator/roller/trunk/web/WEB-INF/classes/planetRuntimeConfigDefs.xml
Removed:
    incubator/roller/trunk/src/org/apache/roller/planet/tasks/RefreshEntriesTask.java
    incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/forms/PlanetConfigForm.java
Modified:
    incubator/roller/trunk/apps/planet/build.xml
    incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java
    incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java
    incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
    incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
    incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java
    incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.properties
    incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp
    incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp
    incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp
    incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp
    incubator/roller/trunk/build.xml
    incubator/roller/trunk/metadata/database/tmpls/3xx-to-400-migration.vm
    incubator/roller/trunk/metadata/xdoclet/global-forwards.xml
    incubator/roller/trunk/properties.xmlf
    incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetManagerImpl.java
    incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java
    incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetConfigAction.java
    incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetGroupsAction.java
    incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetSubscriptionsAction.java
    incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/forms/PlanetSubscriptionForm.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/PlanetModel.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/pagers/PlanetEntriesPager.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/plugins/SmileysPlugin.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/servlets/PlanetFeedServlet.java
    incubator/roller/trunk/src/org/apache/roller/ui/rendering/util/cache/PlanetCache.java
    incubator/roller/trunk/tools/roller-planet/roller-planet-business.jar
    incubator/roller/trunk/web/WEB-INF/classes/commons-logging.properties
    incubator/roller/trunk/web/WEB-INF/classes/planet-hibernate.cfg.xml
    incubator/roller/trunk/web/WEB-INF/classes/planet.properties
    incubator/roller/trunk/web/WEB-INF/jsps/admin/PlanetConfig.jsp
    incubator/roller/trunk/web/WEB-INF/jsps/admin/PlanetGroups.jsp
    incubator/roller/trunk/web/WEB-INF/jsps/admin/PlanetSubscriptions.jsp

Modified: incubator/roller/trunk/apps/planet/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/build.xml?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/apps/planet/build.xml (original)
+++ incubator/roller/trunk/apps/planet/build.xml Sat Apr  7 11:01:47 2007
@@ -73,8 +73,7 @@
         <include name="lib/jdom.jar"/>
         
         <!-- Velocity -->
-        <include name="lib/velocity-1.4.jar"/>
-        <include name="lib/velocity-dep-1.4.jar"/>
+        <include name="lib/velocity-1.5.jar"/>
     </fileset>
     
     <fileset id="web.tools" dir="${tools}">
@@ -86,6 +85,9 @@
         
         <!-- Struts 2 -->
         <include name="struts-2.0.5/lib/*.jar"/>
+        
+        <!-- Struts 2 depends on Spring -->
+        <include name="spring-1.2/spring.jar"/>
     </fileset>
     
     <path id="planet.business.path">
@@ -118,7 +120,6 @@
             <include name="*.jar"/>
         </fileset>
         <pathelement location="${tools}/buildtime/ant-1.6.2/ant.jar"/>
-        <pathelement location="${tools}/buildtime/strutstest-2.0.0.jar"/>
         <pathelement location="${tools}/buildtime/junit-3.8.1.jar"/>
         <pathelement location="${tools}/buildtime/derby.jar"/>
         <pathelement location="${tools}/buildtime/derbyclient.jar"/>
@@ -290,9 +291,14 @@
         <mkdir dir="${build.dbscripts}/oracle" />
         <mkdir dir="${build.dbscripts}/postgresql" />
         
+        <path id="texen.path">
+            <fileset refid="business.tools" />
+            <pathelement location="${root}/metadata/database/" />
+            <pathelement location="${sql}" />
+        </path>
         <taskdef name="texen" 
                  classname="org.apache.velocity.texen.ant.TexenTask"
-                 classpath="${tools}/lib/velocity-dep-1.4.jar:${root}/metadata/database/:${sql}" />
+                 classpathref="texen.path" />
                  
         <texen
             controlTemplate="control.vm" 
@@ -433,6 +439,71 @@
     <target name="nothing">
         <!-- this task does nothing and is here so that 
              dynamic task definitions have a no-op choice -->
+    </target>
+        
+    <!-- Netbeans-only: debug single class -->
+    <target name="debug-selected-files" if="netbeans.home" depends="build-tests" 
+            description="Debug a Single File">
+        <fail unless="classname">Must set property 'classname'</fail>
+        <antcall target="start-db" />
+        <antcall target="init-db" />
+        <nbjpdastart name="${classname}" addressproperty="jpda.address" transport="dt_socket">
+            <classpath>
+                <path refid="test.path"/>
+                <pathelement location="${build.compile.test}"/>
+                <pathelement location="${basedir}/testdata" />
+                <pathelement path="${test.db.cpath}" />
+            </classpath>
+        </nbjpdastart>
+        <java classname="${classname}" fork="true" dir="${build.test}">
+            <jvmarg value="-Xdebug"/>
+            <jvmarg value="-Xnoagent"/>
+            <jvmarg value="-Djava.compiler=none"/>
+            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-Dcatalina.base=${build.test}"/> 
+            <jvmarg value="-Dbuild=${build}"/>
+            <jvmarg value="-Droller.custom.config=${build.tests}/planet-custom.properties"/>
+            <classpath>
+                <path refid="test.path"/>
+                <pathelement location="${build.compile.test}"/>
+                <pathelement location="${basedir}/testdata" />
+                <pathelement path="${test.db.cpath}" />
+            </classpath>
+        </java>
+        <antcall target="stop-db" />
+    </target>
+    
+    <!-- Netbeans-only: debug single test class -->
+    <target name="test-selected-files" if="netbeans.home" depends="build-tests" 
+            description="Test/debug a Single File">
+        <fail unless="classname">Must set property 'classname'</fail>
+        <antcall target="start-db" />
+        <antcall target="init-db" />   
+        <nbjpdastart name="junit.textui.TestRunner" addressproperty="jpda.address" transport="dt_socket">
+            <classpath>
+                <path refid="test.path"/>
+                <pathelement location="${build.compile.test}"/>
+                <pathelement location="${basedir}/testdata" />
+                <pathelement path="${test.db.cpath}" />
+            </classpath>
+        </nbjpdastart>
+        <java classname="junit.textui.TestRunner" fork="true" dir="${build.test}">
+            <arg value="${classname}" />
+            <jvmarg value="-Xdebug"/>
+            <jvmarg value="-Xnoagent"/>
+            <jvmarg value="-Djava.compiler=none"/>
+            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-Dcatalina.base=${build.test}"/> 
+            <jvmarg value="-Dbuild=${build}"/>
+            <jvmarg value="-Droller.custom.config=${build.tests}/planet-custom.properties"/>
+            <classpath>
+                <path refid="test.path"/>
+                <pathelement location="${build.compile.test}"/>
+                <pathelement location="${basedir}/testdata" />
+                <pathelement path="${test.db.cpath}" />
+            </classpath>
+        </java>
+        <antcall target="stop-db" />
     </target>
     
 </project>

Modified: incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java (original)
+++ incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/PlanetManager.java Sat Apr  7 11:01:47 2007
@@ -157,28 +157,26 @@
     /**
      * Get Entries for a Group in reverse chonological order.
      *
-     * @param group Restrict to entries from one group.
+     * @param groups Restrict to entries from these groups (list of PlanetGroupData objects)
      * @param offset Offset into results (for paging)
-     * @param len Maximum number of results to return (for paging)
+     * @param len    Maximum number of results to return (for paging)
      */
     public List getEntries(PlanetGroupData group, int offset, int len) 
         throws RollerException;
-    
-    
+       
     /**
      * Get Entries for a Group in reverse chonological order, optionally 
      * constrained to a certain timeframe.
      *
-     * @param group Restrict to entries from one group.
+     * @param groups Restrict to entries from these groups (list of PlanetGroupData objects)
      * @param startDate The oldest date for entries to include.
-     * @param endDate The newest date for entries to include.
-     * @param offset Offset into results (for paging)
-     * @param len Maximum number of results to return (for paging)
+     * @param endDate   The newest date for entries to include.
+     * @param offset    Offset into results (for paging)
+     * @param len       Maximum number of results to return (for paging)
      */
-    public List getEntries(PlanetGroupData group, 
+    public List getEntries(List groups, 
                            Date startDate, 
                            Date endDate,
                            int offset, 
-                           int len) throws RollerException;
-    
+                           int len) throws RollerException;    
 }

Modified: incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java (original)
+++ incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/RomeFeedFetcher.java Sat Apr  7 11:01:47 2007
@@ -43,11 +43,11 @@
 
 
 /**
- * A FeedFetcher based on the 'Rome' subscription parsing library.
+ * A FeedFetcher based on the ROME RSS/Atom feed parser (http://rome.dev.java.net).
  */
 public class RomeFeedFetcher implements FeedFetcher {
     
-    private static Log log = LogFactory.getLog(HibernatePlanetManagerImpl.class);
+    private static Log log = LogFactory.getLog(RomeFeedFetcher.class);
     
     
     public RomeFeedFetcher() {}

Modified: incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java (original)
+++ incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java Sat Apr  7 11:01:47 2007
@@ -310,20 +310,23 @@
     }
     
     
-    // lookup Entries from a specific Group
+    // Lookup Entries from a specific group
     public List getEntries(PlanetGroupData group, int offset, int len) 
             throws RollerException {
-        return getEntries(group, null, null, offset, len);
+        return getEntries(Collections.singletonList(group), null, null, offset, len);
     } 
     
-    
-    // lookup Entries from a specific Group
-    public List getEntries(PlanetGroupData group, Date startDate, 
+    // Lookup Entries from a specific list of groups
+    public List getEntries(List groups, Date startDate, 
                            Date endDate, int offset, int length)
             throws RollerException {
         
-        if(group == null) {
-            throw new RollerException("group cannot be null");
+        if (groups == null) {
+            throw new RollerException("groups cannot be null");
+        }
+        
+        if (groups.size() == 0) {
+            throw new RollerException("groups cannot be empty");
         }
         
         List ret = null;
@@ -335,7 +338,14 @@
             StringBuffer sb = new StringBuffer();
             sb.append("select e from PlanetEntryData e ");
             sb.append("join e.subscription.groups g ");
-            sb.append("where g=:group ");
+            
+            sb.append("where (");
+            for (int i=0; i<groups.size(); i++) {
+                if (i > 0) sb.append(" and ");
+                sb.append(" g=:group" + i);
+            }
+            sb.append(")");
+            
             if (startDate != null) {
                 sb.append("and e.pubTime > :startDate ");
             }
@@ -345,7 +355,10 @@
             sb.append("order by e.pubTime desc");
             
             Query query = session.createQuery(sb.toString());
-            query.setParameter("group", group);
+            for (int i=0; i<groups.size(); i++) {
+                PlanetGroupData group = (PlanetGroupData)groups.get(i);
+                query.setParameter("group" + i, group);
+            }
             if(offset > 0) {
                 query.setFirstResult(offset);
             }
@@ -360,27 +373,6 @@
             }
             
             ret = query.list();
-
-            // old logic used when group was null, this is hacky and weird!
-//            else {
-//                StringBuffer sb = new StringBuffer();
-//                sb.append("select e from org.apache.roller.planet.pojos.PlanetEntryData e ");
-//                sb.append("join e.subscription.groups g ");
-//                sb.append("where (g.handle='external' or g.handle='all') ");
-//                sb.append("and e.pubTime < :endDate ");
-//                if (startDate != null) {
-//                    sb.append("and e.pubTime > :startDate ");
-//                }
-//                sb.append("order by e.pubTime desc");
-//                Query query = session.createQuery(sb.toString());
-//                query.setFirstResult(offset);
-//                if (length != -1) query.setMaxResults(length);
-//                query.setParameter("endDate", endDate);
-//                if (startDate != null) {
-//                    query.setParameter("startDate", startDate);
-//                }
-//                ret = query.list();
-//            }
             
             long endTime = System.currentTimeMillis();
             

Modified: incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java (original)
+++ incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/pojos/PlanetData.java Sat Apr  7 11:01:47 2007
@@ -105,7 +105,7 @@
     
     
     /** 
-     * @hibernate.set lazy="true" invert="true" cascade="all" sort="natural"
+     * @hibernate.set lazy="true" inverse="true" cascade="all" sort="natural"
      * @hibernate.collection-key column="planet_id"
      * @hibernate.collection-one-to-many class="org.apache.roller.planet.pojos.PlanetGroupData"
      */

Modified: incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java (original)
+++ incubator/roller/trunk/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java Sat Apr  7 11:01:47 2007
@@ -99,7 +99,7 @@
                         rawEntries = planetManager.getEntries(sub, offset, length+1);
                     }
                 } else if (group != null) {
-                    rawEntries = planetManager.getEntries(group, startDate, null, offset, length+1);
+                    rawEntries = planetManager.getEntries(Collections.singletonList(group), startDate, null, offset, length+1);
                 } else {
                     //rawEntries = planetManager.getEntries(startDate, null, offset, length+1);
                     rawEntries = Collections.EMPTY_LIST;

Modified: incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.properties
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.properties?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.properties (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/classes/struts.properties Sat Apr  7 11:01:47 2007
@@ -1,9 +1,9 @@
 
 struts.objectFactory = spring
 
-struts.devMode = false
+struts.devMode = true
 
-struts.enable.DynamicMethodInvocation = false
+struts.enable.DynamicMethodInvocation = true
 
 # prevent the damn s:url calls from including undesired query params by default
 struts.url.includeParams=none

Modified: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/ConfigForm.jsp Sat Apr  7 11:01:47 2007
@@ -44,8 +44,7 @@
             <%-- show a status message if needed --%>
             <%@include file="/WEB-INF/jsps/admin/statusMessage.jsp" %>
             
-            <s:url id="action" action="ConfigForm" method="save" />
-            <s:form name="ConfigForm" action="%{action}">
+            <s:form name="ConfigForm" action="ConfigForm!save">
                 
                 <table class="formtableNoDesc">
                     

Modified: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetForm.jsp Sat Apr  7 11:01:47 2007
@@ -45,8 +45,7 @@
             
             <p><a href='<s:url action="PlanetsList" includeParams="get" />'><s:text name="PlanetForm.returnToList"/></a></p>
             
-            <s:url id="action" action="PlanetForm" method="save" />
-            <s:form name="PlanetForm" action="%{action}">
+            <s:form name="PlanetForm" action="PlanetForm!save">
                 <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" />

Modified: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetGroupForm.jsp Sat Apr  7 11:01:47 2007
@@ -48,8 +48,7 @@
             </s:url>
             <p><s:a href="%{planetformurl}"><s:text name="PlanetGroupForm.returnToPlanet"/></s:a></p>
             
-            <s:url id="action" action="PlanetGroupForm" method="save" />
-            <s:form name="PlanetGroupForm" action="%{action}">
+            <s:form name="PlanetGroupForm" action="PlanetGroupForm!save">
                 <s:hidden name="planetid" value="%{group.planet.id}" />
                 <s:hidden name="groupid" value="%{group.id}" />
                 <s:textfield label="%{getText('PlanetGroupForm.handle')}" name="group.handle" size="40" />

Modified: incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp (original)
+++ incubator/roller/trunk/apps/planet/web/WEB-INF/jsps/admin/PlanetSubscriptionForm.jsp Sat Apr  7 11:01:47 2007
@@ -42,7 +42,7 @@
             <p><s:a href="%{groupformurl}"><s:text name="PlanetSubscriptionForm.returnToGroup"/></s:a></p>
             
             <s:url id="action" action="PlanetSubscriptionForm" method="save" />
-            <s:form name="PlanetSubscriptionForm" action="%{action}">
+            <s:form name="PlanetSubscriptionForm" action="PlanetSubscriptionForm!save">
                 <s:hidden name="groupid" />
                 <s:hidden name="subid" value="%{subscription.id}" />
                 <s:textfield label="%{getText('PlanetSubscriptionForm.title')}" name="subscription.title" size="40" />

Modified: incubator/roller/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/build.xml?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/build.xml (original)
+++ incubator/roller/trunk/build.xml Sat Apr  7 11:01:47 2007
@@ -421,6 +421,7 @@
         <fileset refid="struts.jars" />
         <fileset refid="spring.jars" /> 
         <fileset refid="jstl.jars" />
+        <fileset refid="xmlrpc.jars" />
         
         <fileset refid="roller-planet.jars" />
         
@@ -483,9 +484,14 @@
         <mkdir dir="${build.dbscripts}/oracle" />
         <mkdir dir="${build.dbscripts}/postgresql" />
         
+         <path id="texen.path">
+            <fileset refid="base.jars" />
+            <pathelement location="${basedir}/metadata/database/" />
+            <pathelement location="${basedir}/metadata/database/tmpls/" />
+        </path>
         <taskdef name="texen" 
                  classname="org.apache.velocity.texen.ant.TexenTask"
-                 classpath="${ro.tools}/lib/velocity-dep-1.4.jar:${basedir}/metadata/database/:${basedir}/metadata/database/tmpls/" />
+                 classpathref="texen.path" />
                  
         <texen
             controlTemplate="control.vm" 
@@ -838,7 +844,7 @@
 </target>
 
 
-<target name="build-tests" depends="build-web, gen-dbscripts" description="Build unit tests">
+<target name="build-tests" depends="all" description="Build unit tests">
     
     <mkdir dir="${build.tests}" />
     <mkdir dir="${build.tests}/logs" />
@@ -876,11 +882,15 @@
 	    <exclude name="jsps/**" />
         </fileset>
     </copy>
+    <mkdir dir="${build.tests}/themes" />
+    <copy todir="${build.tests}/themes">
+        <fileset dir="${basedir}/web/themes" />
+    </copy>
 
     <!-- 
     Copy custom testing files which will overwrite some config files 
     -->
-    <copy todir="${build.tests}">
+    <copy todir="${build.tests}" overwrite="true">
         <fileset dir="${basedir}/testdata" />
     </copy>
     
@@ -973,20 +983,19 @@
         <formatter type="xml"/>
         <batchtest toDir="${build.reports}/presentation/xml">
             <fileset dir="${build.compile.tests}">
-		<include name="org/apache/roller/ui/UIPluginManagerTest.class"/>
-                <include name="org/apache/roller/ui/authoring/struts/actions/BookmarksActionTest.class"/>           
-                <include name="org/apache/roller/ui/authoring/struts/actions/WeblogEntryActionTest.class"/>           
-                <include name="org/apache/roller/webservices/xmlrpc/RollerXmlRpcServerTest.class"/>  
-                <include name="org/apache/roller/ui/rendering/velocity/plugins/smileys/SmileysTest.class"/>
+                
+                <!-- UI tests, some require mock web container -->
+                <include name="org/apache/roller/ui/UITestSuite.class"/>
+                
             </fileset>
         </batchtest>
     </junit>
     
     <junitreport todir="${build.reports}/presentation/xml">
-       <fileset dir="${build.reports}/presentation/xml">
-          <include name="TEST-*.xml"/>
-       </fileset>
-    <report format="noframes" toDir="${build.reports}/presentation/html"/>
+        <fileset dir="${build.reports}/presentation/xml">
+            <include name="TEST-*.xml"/>
+        </fileset>
+        <report format="noframes" toDir="${build.reports}/presentation/html"/>
     </junitreport>
     
     <!-- allow for shutdown of test db -->
@@ -1003,9 +1012,12 @@
     
 	<junit fork="true" dir="${build.tests}"  showOutput="true">
         <batchtest toDir="${build.reports}/utils/xml">
-            <fileset dir="${build.tests}/WEB-INF/classes">
-                <include name="org/apache/roller/util/*Test.class"/>
-            </fileset>
+            <fileset dir="${build.compile.tests}">
+                
+                <!-- Utilitities that require no database or web container -->
+                <include name="org/apache/roller/util/UtilitiesTestSuite.class"/>
+                
+            </fileset>            
         </batchtest>
 		<!-- needed to satisfy ref in log4j.properties -->
         <jvmarg value="-Dcatalina.base=."/> 
@@ -1024,59 +1036,59 @@
 
 </target>
 
-    <target name="test-rap" depends="test-rap-sdk, test-rap-handler"/>
+<target name="test-rap" depends="test-rap-sdk, test-rap-handler"/>
    
-    <target name="test-rap-sdk">
-        <mkdir dir="${build.reports}/webservices/adminprotocol/sdk/xml"/>
-        <mkdir dir="${build.reports}/webservices/adminprotocol/sdk/html"/>
-
-        <junit fork="true" dir="${build.tests}" printsummary="on" showOutput="true">
-            <syspropertyset>
-                <propertyref builtin="commandline"/>
-            </syspropertyset>
-            <classpath>
-                <path refid="tests.run.path"/>
-            </classpath>
-            <formatter type="xml"/>
-            <batchtest toDir="${build.reports}/webservices/protocol/sdk/xml">
-                <fileset dir="${build.tests}/WEB-INF/classes">
-                    <include name="org/apache/roller/webservices/protocol/sdk/*EntryTest.class"/>
-                </fileset>
-            </batchtest>
-        </junit>
-        <junitreport todir="${build.reports}/webservices/protocol/sdk/xml">
-            <fileset dir="${build.reports}/webservices/protocol/sdk/xml">
-                <include name="TEST-*.xml"/>
+<target name="test-rap-sdk">
+    <mkdir dir="${build.reports}/webservices/adminprotocol/sdk/xml"/>
+    <mkdir dir="${build.reports}/webservices/adminprotocol/sdk/html"/>
+
+    <junit fork="true" dir="${build.tests}" printsummary="on" showOutput="true">
+        <syspropertyset>
+            <propertyref builtin="commandline"/>
+        </syspropertyset>
+        <classpath>
+            <path refid="tests.run.path"/>
+        </classpath>
+        <formatter type="xml"/>
+        <batchtest toDir="${build.reports}/webservices/protocol/sdk/xml">
+            <fileset dir="${build.tests}/WEB-INF/classes">
+                <include name="org/apache/roller/webservices/protocol/sdk/*EntryTest.class"/>
             </fileset>
-            <report format="noframes" toDir="${build.reports}/webservices/protocol/sdk/html"/>
-        </junitreport>
-    </target>
-    
-    <target name="test-rap-handler">
-        <mkdir dir="${build.reports}/webservices/protocol/xml"/>
-        <mkdir dir="${build.reports}/webservices/protocol/html"/>
-
-        <junit fork="true" dir="${build.tests}" printsummary="on">
-            <syspropertyset>
-                <propertyref builtin="commandline"/>
-            </syspropertyset>
-            <classpath>
-                <path refid="tests.run.path"/>
-            </classpath>
-            <formatter type="xml"/>
-            <batchtest toDir="${build.reports}/webservices/protocol/xml">
-                <fileset dir="${build.tests}/WEB-INF/classes">
-                    <include name="org/apache/roller/webservices/protocol/*HandlerTest.class"/>
-                </fileset>
-            </batchtest>
-        </junit>
-        <junitreport todir="${build.reports}/webservices/protocol/xml">
-            <fileset dir="${build.reports}/webservices/protocol/xml">
-                <include name="TEST-*.xml"/>
+        </batchtest>
+    </junit>
+    <junitreport todir="${build.reports}/webservices/protocol/sdk/xml">
+        <fileset dir="${build.reports}/webservices/protocol/sdk/xml">
+            <include name="TEST-*.xml"/>
+        </fileset>
+        <report format="noframes" toDir="${build.reports}/webservices/protocol/sdk/html"/>
+    </junitreport>
+</target>
+
+<target name="test-rap-handler">
+    <mkdir dir="${build.reports}/webservices/protocol/xml"/>
+    <mkdir dir="${build.reports}/webservices/protocol/html"/>
+
+    <junit fork="true" dir="${build.tests}" printsummary="on">
+        <syspropertyset>
+            <propertyref builtin="commandline"/>
+        </syspropertyset>
+        <classpath>
+            <path refid="tests.run.path"/>
+        </classpath>
+        <formatter type="xml"/>
+        <batchtest toDir="${build.reports}/webservices/protocol/xml">
+            <fileset dir="${build.tests}/WEB-INF/classes">
+                <include name="org/apache/roller/webservices/protocol/*HandlerTest.class"/>
             </fileset>
-            <report format="noframes" toDir="${build.reports}/webservices/protocol/html"/>
-        </junitreport>
-    </target>
+        </batchtest>
+    </junit>
+    <junitreport todir="${build.reports}/webservices/protocol/xml">
+        <fileset dir="${build.reports}/webservices/protocol/xml">
+            <include name="TEST-*.xml"/>
+        </fileset>
+        <report format="noframes" toDir="${build.reports}/webservices/protocol/html"/>
+    </junitreport>
+</target>
 
 <!-- You can specify testClass using -DtestClass=foo -->
 <property name="testClass" value="org.apache.roller.business.TaskLockTest"/>

Modified: incubator/roller/trunk/metadata/database/tmpls/3xx-to-400-migration.vm
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/metadata/database/tmpls/3xx-to-400-migration.vm?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/metadata/database/tmpls/3xx-to-400-migration.vm (original)
+++ incubator/roller/trunk/metadata/database/tmpls/3xx-to-400-migration.vm Sat Apr  7 11:01:47 2007
@@ -4,8 +4,21 @@
 DON'T RUN THIS, IT'S NOT A DATABASE CREATION SCRIPT!!!
 **#
 
+create table rag_planet (
+    id              varchar(48) not null primary key,
+    handle          varchar(32) not null,
+    title           varchar(255) not null,
+    description     varchar(255)
+);
+alter table rag_planet add constraint ragp_handle_uq unique ( handle );
+
+insert into rag_planet (id,title,handle) values ('default_planet','default_planet','default_planet');
+update rag_group set planet_id='default_planet';
+
+-- new column to support account activation by email
 #addColumnNull("rolleruser" "activationcode" "varchar(48)")
 
+-- new column to allow setting of page template content-type
 #addColumnNull("webpage" "outputtype" "varchar(48)")
 
 -- add new action column to webpage table, default value is custom
@@ -40,4 +53,4 @@
 --alter table website drop column userid;
 --alter table website drop column weblogdayid;
 --alter table weblogentry drop column publishentry;
---alter table weblogentry drop column link;
\ No newline at end of file
+--alter table weblogentry drop column link;

Modified: incubator/roller/trunk/metadata/xdoclet/global-forwards.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/metadata/xdoclet/global-forwards.xml?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/global-forwards.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/global-forwards.xml Sat Apr  7 11:01:47 2007
@@ -68,7 +68,7 @@
 
 <!-- planet admin UI actions -->
 
-<forward name="planetConfig"             path="/roller-ui/admin/planetConfig.do?method=getConfig"/>
+<forward name="planetConfig"             path="/roller-ui/admin/planetConfig.do"/>
 <forward name="planetSubscriptions"      path="/roller-ui/admin/planetSubscriptions.do?method=getSubscriptions"/>
 <forward name="planetGroups"             path="/roller-ui/admin/planetGroups.do?method=getGroups"/>
 <forward name="planetGroupSubscriptions" path="/roller-ui/admin/planetGroupSubscriptions.do?method=getGroupSubscriptions"/>

Modified: incubator/roller/trunk/properties.xmlf
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/properties.xmlf?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/properties.xmlf (original)
+++ incubator/roller/trunk/properties.xmlf Sat Apr  7 11:01:47 2007
@@ -84,6 +84,9 @@
     <include name="commons-betwixt-1.0-beta-1.jar" />
     <include name="commons-cache.jar" />
     <include name="commons-codec-1.3.jar" />
+    <include name="commons-logging-1.0.4.jar" />
+    <include name="commons-lang-2.1.jar" />
+    <include name="commons-collections-3.1.jar" />
     <include name="concurrent-1.3.2.jar"/>
     <include name="jaxen-full.jar" />
     <include name="saxpath.jar" />
@@ -92,9 +95,7 @@
     <include name="log4j-1.2.11.jar"/>
     <include name="rome-0.9.jar"/>
     <include name="rome-fetcher-0.9.jar"/>
-    <include name="velocity-1.4.jar"/>
-    <include name="velocity-dep-1.4.jar"/>
-    <include name="xmlrpc-1.2-b1.jar"/>
+    <include name="velocity-1.5.jar"/>
 </fileset>
 
 <fileset id="presentation.jars" dir="${ro.tools}/lib">
@@ -110,7 +111,14 @@
 </fileset>
 
 <fileset id="struts.jars" dir="${tools.struts}/lib">
-    <include name="*.jar"/>
+    <include name="antlr.jar"/>
+    <include name="commons-beanutils.jar"/>
+    <include name="commons-digester.jar"/>
+    <include name="commons-fileupload.jar"/>
+    <include name="commons-validator.jar"/>
+    <include name="jakarta-org.jar"/>
+    <include name="struts.jar"/>
+    <include name="struts-el.jar"/>
 </fileset>
 
 <fileset id="servlet.jars" dir="${tools.tomcat}">
@@ -141,6 +149,13 @@
     <include name="*.jar"/>
 </fileset>
 
+<fileset id="xmlrpc.jars" dir="${ro.tools}/xmlrpc-3.0/lib">
+    <include name="ws-commons-util-1.0.1.jar"/>
+    <include name="xmlrpc-common-3.0.jar"/>
+    <include name="xmlrpc-client-3.0.jar"/>
+    <include name="xmlrpc-server-3.0.jar"/>
+</fileset>
+
 <fileset id="roller-planet.jars" dir="${ro.tools}/roller-planet">
     <include name="*.jar"/>
 </fileset>
@@ -155,6 +170,7 @@
     <fileset refid="mail.jars"/>
     <fileset refid="commons.jars"/>
     <fileset refid="roller-planet.jars" />
+    <fileset refid="xmlrpc.jars"/>
 </path>
 
 <path id="business.path">
@@ -200,11 +216,11 @@
     </fileset>
     <fileset refid="commons-httpclient.jar"/>
     <pathelement location="${ro.tools}/buildtime/ant-1.6.2/ant.jar"/>
-    <pathelement location="${ro.tools}/buildtime/strutstest-2.0.0.jar"/>
     <pathelement location="${ro.tools}/buildtime/junit-3.8.1.jar"/>
     <pathelement location="${ro.tools}/buildtime/derby.jar"/>
     <pathelement location="${ro.tools}/buildtime/derbyclient.jar"/>
     <pathelement location="${ro.tools}/buildtime/derbynet.jar"/>
+    <pathelement location="${ro.tools}/roller-planet/roller-planet-business.jar"/>
 
     <!-- plus normal jars -->
     <path refid="business.path"/>

Added: incubator/roller/trunk/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java?view=auto&rev=526464
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java (added)
+++ incubator/roller/trunk/src/org/apache/roller/planet/business/RollerRomeFeedFetcher.java Sat Apr  7 11:01:47 2007
@@ -0,0 +1,177 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  The ASF licenses this file to You
+ * under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.  For additional information regarding
+ * copyright in this work, please see the NOTICE file in the top level
+ * directory of this distribution.
+ */
+
+package org.apache.roller.planet.business;
+
+import com.sun.syndication.fetcher.impl.FeedFetcherCache;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.roller.RollerException;
+import org.apache.roller.business.PluginManager;
+import org.apache.roller.business.RollerFactory;
+import org.apache.roller.business.UserManager;
+import org.apache.roller.business.WeblogManager;
+import org.apache.roller.config.RollerRuntimeConfig;
+import org.apache.roller.planet.pojos.PlanetEntryData;
+import org.apache.roller.planet.pojos.PlanetSubscriptionData;
+import org.apache.roller.pojos.WeblogEntryData;
+import org.apache.roller.pojos.WebsiteData;
+
+/**
+ * Extends Roller Planet's feed fetcher to fetch local feeds directly from Roller.
+ */
+public class RollerRomeFeedFetcher extends RomeFeedFetcher {
+    
+    private static Log log = LogFactory.getLog(RollerRomeFeedFetcher.class); 
+    
+    
+    /** Creates a new instance of RollerRomeFeedFetcher */
+    public RollerRomeFeedFetcher() {
+    }
+    
+    // get new Entries for a specific Subscription
+    protected Set getNewEntries(PlanetSubscriptionData sub,
+                                com.sun.syndication.fetcher.FeedFetcher feedFetcher,
+                                FeedFetcherCache feedInfoCache)
+            throws RollerException {
+        
+        String localURL = RollerRuntimeConfig.getProperty("site.absoluteurl");
+        
+        // if this is not a local url then let parent deal with it
+        if (StringUtils.isEmpty(localURL) || !sub.getFeedURL().startsWith(localURL)) {            
+            log.debug("Feed is remote, letting parent handle it "+sub.getFeedURL());            
+            return super.getNewEntries(sub, feedFetcher, feedInfoCache);
+        }
+        
+        try {
+            // for local feeds, sub.author = website.handle
+            // feed is from our domain and we have a handle, lets deal with it
+            if(sub.getAuthor() != null) {
+                
+                log.debug("Getting LOCAL feed "+sub.getFeedURL());
+                
+                Set newEntries = new TreeSet();
+                
+                // get corresponding website object
+                UserManager usermgr = RollerFactory.getRoller().getUserManager();
+                WebsiteData website = usermgr.getWebsiteByHandle(sub.getAuthor());
+                if (website == null) 
+                    return newEntries;
+                
+                // figure website last update time
+                WeblogManager blogmgr = RollerFactory.getRoller().getWeblogManager();
+                PlanetManager planetManager = PlanetFactory.getPlanet().getPlanetManager();
+                
+                Date siteUpdated = website.getLastModified();
+                if (siteUpdated == null) { // Site never updated, skip it
+                    log.warn("Last-publish time null, skipping local feed ["
+                            + website.getHandle() + "]");
+                    return newEntries;
+                }
+                
+                // if website last update time > subsciption last update time
+                List entries = new ArrayList();
+                if (sub.getLastUpdated()==null || siteUpdated.after(sub.getLastUpdated())) {
+                    int entryCount = RollerRuntimeConfig.getIntProperty(
+                            "site.newsfeeds.defaultEntries");
+                    entries = blogmgr.getWeblogEntries(
+                            website,
+                            null,
+                            null,                        // startDate
+                            null,                        // endDate
+                            null,                        // catName
+                            null,                        // tags
+                            WeblogEntryData.PUBLISHED,   // status
+                            null,                        // text
+                            null,                        // sortby (null means pubTime)
+                            null,
+                            null,                        // locale
+                            0,                           // offset
+                            entryCount);                 
+                    
+                    sub.setLastUpdated(siteUpdated);
+                    planetManager.saveSubscription(sub);
+                    PlanetFactory.getPlanet().flush();
+                    
+                } else {
+                    if (log.isDebugEnabled()) {
+                        String msg = MessageFormat.format(
+                                "   Skipping ({0} / {1})", new Object[] {
+                            siteUpdated, sub.getLastUpdated()});
+                        log.debug(msg);
+                    }
+                }
+                
+                // Populate subscription object with new entries
+                PluginManager ppmgr = RollerFactory.getRoller().getPagePluginManager();
+                Map pagePlugins = ppmgr.getWeblogEntryPlugins(website);
+                Iterator entryIter = entries.iterator();
+                while (entryIter.hasNext()) {
+                    try {
+                        WeblogEntryData rollerEntry =
+                                (WeblogEntryData)entryIter.next();
+                        
+                        PlanetEntryData entry = new PlanetEntryData();
+                        entry.setSubscription(sub);
+                        
+                        String content = "";
+                        if (!StringUtils.isEmpty(rollerEntry.getText())) {
+                            content = rollerEntry.getText();
+                        } else {
+                            content = rollerEntry.getSummary();
+                        }
+                        content = ppmgr.applyWeblogEntryPlugins(pagePlugins, rollerEntry, content);
+                        
+                        entry.setAuthor(rollerEntry.getCreator().getFullName());
+                        entry.setTitle(rollerEntry.getTitle());
+                        entry.setPubTime(rollerEntry.getPubTime());
+                        entry.setText(content);
+                        entry.setPermalink(rollerEntry.getPermalink());
+                        entry.setCategoriesString(rollerEntry.getCategory().getPath());
+        
+                        planetManager.saveEntry(entry);
+                        PlanetFactory.getPlanet().flush();
+                        newEntries.add(entry);
+                        
+                    } catch (Exception e) {
+                        log.error("ERROR processing subscription entry", e);
+                    }
+                }
+                
+                return newEntries;
+            }
+        } catch (Exception e) {
+            log.warn("Problem reading local feed", e);
+        }
+        
+        log.debug("Failed to fetch locally, trying remote "+sub.getFeedURL());
+        
+        // if there was an error then try normal planet method
+        return super.getNewEntries(sub, feedFetcher, feedInfoCache);
+    }
+        
+}

Modified: incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetManagerImpl.java?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/business/hibernate/HibernateRollerPlanetManagerImpl.java Sat Apr  7 11:01:47 2007
@@ -58,15 +58,15 @@
     private static Log log = LogFactory.getLog(HibernateRollerPlanetManagerImpl.class);
     
     
-    public HibernateRollerPlanetManagerImpl(HibernatePersistenceStrategy strat) {
-        
-        super(strat);
-        
+    public HibernateRollerPlanetManagerImpl(HibernatePersistenceStrategy strat) {        
+        super(strat);        
         log.info("Instantiating Hibernate Roller Planet Manager");
     }
     
     
-    protected Set getNewEntries(PlanetSubscriptionData sub,
+    /* TODO: update local feed fetching code to use 4.0 planet interfaces
+     
+     protected Set getNewEntries(PlanetSubscriptionData sub,
                                 FeedFetcher feedFetcher,
                                 FeedFetcherCache feedInfoCache)
             throws RollerException {
@@ -78,7 +78,7 @@
             
             log.debug("Feed is remote, letting parent handle it "+sub.getFeedURL());
             
-            return super.getNewEntries(sub, feedFetcher, feedInfoCache);
+            return super.getEntries(sub);
         }
         
         try {
@@ -182,6 +182,6 @@
         
         // if there was an error then try normal planet method
         return super.getNewEntries(sub, feedFetcher, feedInfoCache);
-    }
+    }*/
     
 }

Modified: incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/tasks/SyncWebsitesTask.java Sat Apr  7 11:01:47 2007
@@ -28,12 +28,11 @@
 import org.apache.roller.RollerException;
 import org.apache.roller.business.runnable.RollerTaskWithLeasing;
 import org.apache.roller.config.RollerRuntimeConfig;
-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.PlanetEntryData;
 import org.apache.roller.business.RollerFactory;
 import org.apache.roller.business.UserManager;
+import org.apache.roller.planet.pojos.PlanetData;
 import org.apache.roller.planet.pojos.PlanetGroupData;
 import org.apache.roller.planet.pojos.PlanetSubscriptionData;
 import org.apache.roller.pojos.WebsiteData;
@@ -41,7 +40,9 @@
 
 
 /**
- * Ensure that every weblog has a subscription in Planet Roller database.
+ * This tasks is responsible for ensuring that the planet group 'all' contains
+ * a subscription for every weblogs in the Roller system. It also takes care 
+ * of deleting subsctiptions for weblogs that no longer exist.
  */
 public class SyncWebsitesTask extends RollerTaskWithLeasing {
     
@@ -139,7 +140,8 @@
             UserManager userManager = RollerFactory.getRoller().getUserManager();
             
             // first, make sure there is an "all" planet group
-            PlanetGroupData group = planet.getGroup("all");
+            PlanetData planetObject = planet.getPlanet("all");
+            PlanetGroupData group = planet.getGroup(planetObject, "all");
             if(group == null) {
                 group = new PlanetGroupData();
                 group.setHandle("all");

Modified: incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetConfigAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetConfigAction.java?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetConfigAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetConfigAction.java Sat Apr  7 11:01:47 2007
@@ -16,6 +16,8 @@
 package org.apache.roller.planet.ui.admin.struts.actions;
 
 import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -23,8 +25,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.tasks.RefreshEntriesTask;
-import org.apache.roller.planet.tasks.SyncWebsitesTask;
+import org.apache.roller.RollerException;
+import org.apache.roller.RollerPermissionsException;
 import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
@@ -33,15 +35,10 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
-import org.apache.roller.config.RollerRuntimeConfig;
 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.business.Roller;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.planet.pojos.PlanetConfigData;
-import org.apache.roller.planet.pojos.PlanetGroupData;
-import org.apache.roller.planet.ui.admin.struts.forms.PlanetConfigForm;
+import org.apache.roller.planet.business.PropertiesManager;
+import org.apache.roller.planet.pojos.PropertyData;
 import org.apache.roller.ui.core.BasePageModel;
 import org.apache.roller.ui.core.RollerRequest;
 import org.apache.roller.ui.core.RollerSession;
@@ -61,197 +58,212 @@
     private static Log logger = 
         LogFactory.getFactory().getInstance(PlanetConfigAction.class);
 
-    /** Populate config form and forward to config page */
-    public ActionForward getConfig(ActionMapping mapping,
-            ActionForm actionForm, HttpServletRequest request,
-            HttpServletResponse response) throws IOException, ServletException
-    {
+    public ActionForward unspecified(
+            ActionMapping       mapping,
+            ActionForm          actionForm,
+            HttpServletRequest  request,
+            HttpServletResponse response)
+            throws IOException, ServletException {
+        
+        // make "edit" our default action
+        return this.edit(mapping, actionForm, request, response);
+    }
+    
+    
+    public ActionForward edit(
+            ActionMapping       mapping,
+            ActionForm          actionForm,
+            HttpServletRequest  request,
+            HttpServletResponse response)
+            throws IOException, ServletException {
+        
+        logger.debug("Handling edit request");
+        
         ActionForward forward = mapping.findForward("planetConfig.page");
-        try
-        {
+        try {
+            BasePageModel pageModel = new BasePageModel(
+                    "planetConfig.title", request, response, mapping);
+            request.setAttribute("model",pageModel);                
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            if (RollerSession.getRollerSession(request).isGlobalAdminUser())
-            {
-                BasePageModel pageModel = new BasePageModel(
-                    "planetConfig.pageTitle", request, response, mapping);
-                request.setAttribute("model",pageModel);                
-                PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();
-                PlanetConfigData config = planet.getConfiguration();
-                PlanetConfigForm form = (PlanetConfigForm)actionForm;
-                if (config != null)
-                {
-                    form.copyFrom(config, request.getLocale());
-                }
-                else 
-                {
-                    form.setTitle("Planet Roller");
-                    form.setAdminEmail(RollerRuntimeConfig.getProperty("site.adminemail"));
-                    form.setSiteURL(RollerRuntimeConfig.getProperty("site.absoluteurl"));
-                    form.setCacheDir("/tmp");
-                }
-            }
-            else
-            {
+            RollerSession rollerSession = RollerSession.getRollerSession(request);
+            if (rollerSession.isGlobalAdminUser() ) {
+                
+                // just grab our properties map and put it in the request
+                Planet planet = PlanetFactory.getPlanet();
+                PropertiesManager propsManager = planet.getPropertiesManager();
+                Map props = propsManager.getProperties();
+                request.setAttribute("PlanetProps", props);
+                
+            } else {
                 forward = mapping.findForward("access-denied");
             }
-        }
-        catch (Exception e)
-        {
-            request.getSession().getServletContext().log("ERROR", e);
+        } catch (Exception e) {
+            logger.error("ERROR in action",e);
             throw new ServletException(e);
         }
         return forward;
     }
-
-    /** Save posted config form data */
-    public ActionForward saveConfig(ActionMapping mapping,
-            ActionForm actionForm, HttpServletRequest request,
-            HttpServletResponse response) throws IOException, ServletException
-    {
+    
+    
+    public ActionForward update(
+            ActionMapping       mapping,
+            ActionForm          actionForm,
+            HttpServletRequest  request,
+            HttpServletResponse response)
+            throws IOException, ServletException {
+        
+        logger.debug("Handling update request");
+        
         ActionForward forward = mapping.findForward("planetConfig.page");
-        try
-        {
+        ActionErrors errors = new ActionErrors();
+        try {
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            if (RollerSession.getRollerSession(request).isGlobalAdminUser())
-            {
-                BasePageModel pageModel = new BasePageModel(
-                    "planetConfig.pageTitle", request, response, mapping);
-                request.setAttribute("model",pageModel);                
-                PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();
-                PlanetConfigData config = planet.getConfiguration();
-                if (config == null)
-                {
-                    config = new PlanetConfigData();
-                }
-                PlanetConfigForm form = (PlanetConfigForm) actionForm;
-                ActionErrors errors = validate(form);
-                if (errors.isEmpty())
-                {
-                    form.copyTo(config, request.getLocale());
+            RollerSession rollerSession = RollerSession.getRollerSession(request);
+            BasePageModel pageModel = new BasePageModel(
+                    "planetConfig.title", request, response, mapping);
+            request.setAttribute("model",pageModel);                
+            if (rollerSession.isGlobalAdminUser()) {
+            
+                // just grab our properties map and put it in the request
+                Planet planet = PlanetFactory.getPlanet();
+                PropertiesManager propsManager = planet.getPropertiesManager();
+                Map props = propsManager.getProperties();
+                request.setAttribute("PlanetProps", props);
+                
+                // only set values for properties that are already defined
+                String propName = null;
+                PropertyData updProp = null;
+                String incomingProp = null;
+                Iterator propsIT = props.keySet().iterator();
+                while(propsIT.hasNext()) {
+                    propName = (String) propsIT.next();
+                    updProp = (PropertyData) props.get(propName);
+                    incomingProp = request.getParameter(updProp.getName());
+                    
+                    logger.debug("Checking property ["+propName+"]");
                     
-                    // the form copy is a little dumb and will set the id value
-                    // to empty string if it didn't have a value before, which means
-                    // that this object would not be considered new
-                    if(config.getId() != null && config.getId().trim().equals("")) {
-                        config.setId(null);
+                    // some special treatment for booleans
+                    // this is a bit hacky since we are assuming that any prop
+                    // with a value of "true" or "false" is meant to be a boolean
+                    // it may not always be the case, but we should be okay for now
+                    if( updProp.getValue() != null // null check needed w/Oracle
+                        && (updProp.getValue().equals("true") || updProp.getValue().equals("false"))) {
+                        
+                        if(incomingProp == null || !incomingProp.equals("on"))
+                            incomingProp = "false";
+                        else
+                            incomingProp = "true";
                     }
                     
-                    planet.saveConfiguration(config);
-                    if (planet.getGroup("external") == null) 
-                    {
-                        PlanetGroupData group = new PlanetGroupData();
-                        group.setHandle("external");
-                        group.setTitle("external");
-                        planet.saveGroup(group);
+                    // only work on props that were submitted with the request
+                    if(incomingProp != null) {
+                        logger.debug("Setting new value for ["+propName+"]");
+                        
+                        // NOTE: the old way had some locale sensitive way to do this??
+                        updProp.setValue(incomingProp.trim());
                     }
-                    PlanetFactory.getPlanet().flush();
-                    ActionMessages messages = new ActionMessages();
-                    messages.add(null, new ActionMessage("planetConfig.success.saved"));
-                    saveMessages(request, messages);
-                }                
-                else
-                {
-                    saveErrors(request, errors);
                 }
-            }
-            else
-            {
-                forward = mapping.findForward("access-denied");
-            }
-        }
-        catch (Exception e)
-        {
-            request.getSession().getServletContext().log("ERROR", e);
-            throw new ServletException(e);
-        }
-        return forward;
-    }
-
-    /** Refresh entries in backgrounded thread (for testing) */
-    public ActionForward refreshEntries(ActionMapping mapping,
-            ActionForm actionForm, HttpServletRequest request,
-            HttpServletResponse response) throws IOException, ServletException
-    {
-        ActionForward forward = mapping.findForward("planetConfig.page");
-        try
-        {
-            RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            if (RollerSession.getRollerSession(request).isGlobalAdminUser())
-            {
-                BasePageModel pageModel = new BasePageModel(
-                    "planetConfig.pageTitle", request, response, mapping);
-                request.setAttribute("model",pageModel);                
-                Roller roller = RollerFactory.getRoller();
-                RefreshEntriesTask task = new RefreshEntriesTask();
-                roller.getThreadManager().executeInBackground(task);
-                
-                ActionMessages messages = new ActionMessages();
-                messages.add(null, 
-                        new ActionMessage("planetConfig.success.refreshed"));
-                saveMessages(request, messages);
-            }
-            else
-            {
+                
+                // save it
+                propsManager.saveProperties(props);
+                planet.flush();
+                
+                ActionMessages uiMessages = new ActionMessages();
+                uiMessages.add(null, new ActionMessage("weblogEdit.changesSaved"));
+                saveMessages(request, uiMessages);
+                
+            } else {
                 forward = mapping.findForward("access-denied");
             }
+            
+        } catch (RollerPermissionsException e) {
+            errors.add(null, new ActionError("error.permissions.deniedSave"));
+            saveErrors(request, errors);
+            forward = mapping.findForward("access-denied");
+            
+        } catch (RollerException e) {
+            logger.error(e);
+            errors.add(ActionErrors.GLOBAL_ERROR, new ActionError(
+                    "error.update.rollerConfig",e.getClass().getName()));
+            saveErrors(request,errors);
         }
-        catch (Exception e)
-        {
-            request.getSession().getServletContext().log("ERROR", e);
-            throw new ServletException(e);
-        }
+        
         return forward;
     }
+    
 
-    /** Sync websites in backgrounded thread (for testing) */
-    public ActionForward syncWebsites(ActionMapping mapping,
-            ActionForm actionForm, HttpServletRequest request,
-            HttpServletResponse response) throws IOException, ServletException
-    {
-        ActionForward forward = mapping.findForward("planetConfig.page");
-        try
-        {
-            RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            if (RollerSession.getRollerSession(request).isGlobalAdminUser())
-            {
-                BasePageModel pageModel = new BasePageModel(
-                    "planetConfig.pageTitle", request, response, mapping);
-                request.setAttribute("model",pageModel);                
-                Roller roller = (Roller)RollerFactory.getRoller();
-                SyncWebsitesTask task = new SyncWebsitesTask();
-                task.init();
-                roller.getThreadManager().executeInBackground(task);
-                ActionMessages messages = new ActionMessages();
-                messages.add(null, 
-                        new ActionMessage("planetConfig.success.synced"));
-                saveMessages(request, messages);
-            }
-            else
-            {
-                forward = mapping.findForward("access-denied");
-            }
-        }
-        catch (Exception e)
-        {
-            request.getSession().getServletContext().log("ERROR", e);
-            throw new ServletException(e);
-        }
-        return forward;
-    }
+//    /** Refresh entries in backgrounded thread (for testing) */
+//    public ActionForward refreshEntries(ActionMapping mapping,
+//            ActionForm actionForm, HttpServletRequest request,
+//            HttpServletResponse response) throws IOException, ServletException
+//    {
+//        ActionForward forward = mapping.findForward("planetConfig.page");
+//        try
+//        {
+//            RollerRequest rreq = RollerRequest.getRollerRequest(request);
+//            if (RollerSession.getRollerSession(request).isGlobalAdminUser())
+//            {
+//                BasePageModel pageModel = new BasePageModel(
+//                    "planetConfig.pageTitle", request, response, mapping);
+//                request.setAttribute("model",pageModel);                
+//                Roller roller = RollerFactory.getRoller();
+//                RefreshEntriesTask task = new RefreshEntriesTask();
+//                roller.getThreadManager().executeInBackground(task);
+//                
+//                ActionMessages messages = new ActionMessages();
+//                messages.add(null, 
+//                        new ActionMessage("planetConfig.success.refreshed"));
+//                saveMessages(request, messages);
+//            }
+//            else
+//            {
+//                forward = mapping.findForward("access-denied");
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            request.getSession().getServletContext().log("ERROR", e);
+//            throw new ServletException(e);
+//        }
+//        return forward;
+//    }
+//
+//    /** Sync websites in backgrounded thread (for testing) */
+//    public ActionForward syncWebsites(ActionMapping mapping,
+//            ActionForm actionForm, HttpServletRequest request,
+//            HttpServletResponse response) throws IOException, ServletException
+//    {
+//        ActionForward forward = mapping.findForward("planetConfig.page");
+//        try
+//        {
+//            RollerRequest rreq = RollerRequest.getRollerRequest(request);
+//            if (RollerSession.getRollerSession(request).isGlobalAdminUser())
+//            {
+//                BasePageModel pageModel = new BasePageModel(
+//                    "planetConfig.pageTitle", request, response, mapping);
+//                request.setAttribute("model",pageModel);                
+//                Roller roller = (Roller)RollerFactory.getRoller();
+//                SyncWebsitesTask task = new SyncWebsitesTask();
+//                task.init();
+//                roller.getThreadManager().executeInBackground(task);
+//                ActionMessages messages = new ActionMessages();
+//                messages.add(null, 
+//                        new ActionMessage("planetConfig.success.synced"));
+//                saveMessages(request, messages);
+//            }
+//            else
+//            {
+//                forward = mapping.findForward("access-denied");
+//            }
+//        }
+//        catch (Exception e)
+//        {
+//            request.getSession().getServletContext().log("ERROR", e);
+//            throw new ServletException(e);
+//        }
+//        return forward;
+//    }
     
-    /** Validate config form, returns empty collection if all OK */
-    public ActionErrors validate(PlanetConfigForm form)
-    {
-        ActionErrors errors = new ActionErrors();
-        if (form.getProxyHost()!=null && form.getProxyHost().trim().length()>0)
-        {
-            if (form.getProxyPort()<1)
-            {
-                errors.add(null, new ActionError(
-                        "planetConfig.error.badProxyPort"));
-            }
-        }
-        return errors;
-    }
+
 }
 

Modified: incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetGroupsAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetGroupsAction.java?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetGroupsAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetGroupsAction.java Sat Apr  7 11:01:47 2007
@@ -35,11 +35,9 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
 import org.apache.roller.RollerException;
-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.business.Roller;
-import org.apache.roller.business.RollerFactory;
+import org.apache.roller.planet.pojos.PlanetData;
 import org.apache.roller.planet.pojos.PlanetGroupData;
 import org.apache.roller.planet.ui.admin.struts.forms.PlanetGroupForm;
 import org.apache.roller.ui.core.BasePageModel;
@@ -73,12 +71,13 @@
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             if (RollerSession.getRollerSession(request).isGlobalAdminUser())
             {
-                PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();
+                PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
                 PlanetGroupForm form = (PlanetGroupForm)actionForm;
                 if (request.getParameter("groupHandle") != null)
                 {
-                    String feedUrl = request.getParameter("groupHandle");
-                    PlanetGroupData group = planet.getGroup(feedUrl);
+                    String handle = request.getParameter("groupHandle");
+                    PlanetData defaultPlanet = pmgr.getPlanet("default_planet");
+                    PlanetGroupData group = pmgr.getGroup(defaultPlanet, handle);
                     form.copyFrom(group, request.getLocale());
                 }
                 else 
@@ -141,12 +140,13 @@
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
             if (RollerSession.getRollerSession(request).isGlobalAdminUser())
             {
-                PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();
+                PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
                 PlanetGroupForm form = (PlanetGroupForm)actionForm;
                 if (form.getHandle() != null)
                 {
-                    PlanetGroupData group = planet.getGroup(form.getHandle());
-                    planet.deleteGroup(group);
+                    PlanetData defaultPlanet = pmgr.getPlanet("default_planet");
+                    PlanetGroupData group = pmgr.getGroup(defaultPlanet, form.getHandle());
+                    pmgr.deleteGroup(group);
                     PlanetFactory.getPlanet().flush();
                     // TODO: why release here?
                     PlanetFactory.getPlanet().release();
@@ -188,18 +188,20 @@
             if (RollerSession.getRollerSession(request).isGlobalAdminUser())
             {
                 PlanetGroupForm form = (PlanetGroupForm)actionForm;
-                PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();
-                ActionErrors errors = validate(planet, form);
+                PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
+                PlanetData defaultPlanet = pmgr.getPlanet("default_planet");
+                ActionErrors errors = validate(pmgr, form);
                 if (errors.isEmpty())
                 {
                     PlanetGroupData group = null;
                     if (form.getId() == null || form.getId().trim().length() == 0)
                     {
                         group = new PlanetGroupData();
+                        group.setPlanet(defaultPlanet);
                     }
                     else 
                     {
-                        group = planet.getGroupById(form.getId());
+                        group = pmgr.getGroupById(form.getId());
                     }                
                     form.copyTo(group, request.getLocale());
                     
@@ -210,7 +212,7 @@
                         group.setId(null);
                     }
                     
-                    planet.saveGroup(group);  
+                    pmgr.saveGroup(group);  
                     PlanetFactory.getPlanet().flush();
 
                     ActionMessages messages = new ActionMessages();
@@ -275,33 +277,23 @@
         {
             super("planetGroups.pagetitle", request, response, mapping);
             RollerRequest rreq = RollerRequest.getRollerRequest(request);
-            PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();            
-            PlanetGroupData externalGroup = planet.getGroup("external");
-            if (externalGroup != null) 
+            PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();            
+            PlanetData defaultPlanet = pmgr.getPlanet("default_planet");
+            PlanetGroupData externalGroup = pmgr.getGroup(defaultPlanet, "external");
+            Iterator allgroups = defaultPlanet.getGroups().iterator();
+            while (allgroups.hasNext()) 
             {
-                Iterator allgroups = planet.getGroups().iterator();
-                while (allgroups.hasNext()) 
-                {
-                    PlanetGroupData agroup = (PlanetGroupData)allgroups.next();
-                    if (    !agroup.getHandle().equals("external")
-                         && !agroup.getHandle().equals("all")) 
-                      {
-                          groups.add(agroup);
-                      }
-                }
-            }
-            else 
-            {
-                unconfigured = true;
+                PlanetGroupData agroup = (PlanetGroupData)allgroups.next();
+                if (    !agroup.getHandle().equals("external")
+                     && !agroup.getHandle().equals("all")) 
+                  {
+                      groups.add(agroup);
+                  }
             }
         }
         public List getGroups()
         {
             return groups;
-        }
-        public boolean isUnconfigured()
-        {
-            return unconfigured;
         }
     }
 }

Modified: incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetSubscriptionsAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetSubscriptionsAction.java?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetSubscriptionsAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/actions/PlanetSubscriptionsAction.java Sat Apr  7 11:01:47 2007
@@ -27,6 +27,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.roller.planet.business.PropertiesManager;
 import org.apache.roller.planet.ui.admin.struts.forms.PlanetSubscriptionFormEx;
 import org.apache.struts.action.ActionError;
 import org.apache.struts.action.ActionErrors;
@@ -37,15 +38,13 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
 import org.apache.roller.RollerException;
-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.util.Technorati;
-import org.apache.roller.business.Roller;
-import org.apache.roller.business.RollerFactory;
-import org.apache.roller.planet.pojos.PlanetConfigData;
 import org.apache.roller.planet.pojos.PlanetGroupData;
 import org.apache.roller.planet.pojos.PlanetSubscriptionData;
+import org.apache.roller.planet.pojos.PropertyData;
 import org.apache.roller.ui.core.BasePageModel;
 import org.apache.roller.ui.core.RollerSession;
 
@@ -73,12 +72,12 @@
         ActionForward forward = mapping.findForward("planetSubscriptions.page");
         try {
             if (RollerSession.getRollerSession(request).isGlobalAdminUser()) {
-                PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();
+                PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
                 PlanetSubscriptionFormEx form = (PlanetSubscriptionFormEx)actionForm;
                 if (request.getParameter("feedUrl") != null) {
                     String feedUrl = request.getParameter("feedUrl");
                     PlanetSubscriptionData sub =
-                            planet.getSubscription(feedUrl);
+                            pmgr.getSubscription(feedUrl);
                     form.copyFrom(sub, request.getLocale());
                 } else {
                     form.doReset(mapping, request);
@@ -88,7 +87,8 @@
                 groupHandle = (groupHandle == null) ? form.getGroupHandle() : groupHandle;
                 groupHandle = (groupHandle == null) ? "external" : groupHandle;
                 
-                PlanetGroupData targetGroup = planet.getGroup(groupHandle);
+                PlanetData defaultPlanet = pmgr.getPlanet("default_planet");
+                PlanetGroupData targetGroup = pmgr.getGroup(defaultPlanet, groupHandle);
                 form.setGroupHandle(groupHandle);
                 request.setAttribute("model",
                         new SubscriptionsPageModel(
@@ -110,7 +110,7 @@
         ActionForward forward = mapping.findForward("planetSubscriptions.page");
         try {
             if (RollerSession.getRollerSession(request).isGlobalAdminUser()) {
-                PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();
+                PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
                 PlanetSubscriptionFormEx form = (PlanetSubscriptionFormEx)actionForm;
                 
                 form.doReset(mapping, request);
@@ -119,7 +119,8 @@
                 groupHandle = (groupHandle == null) ? form.getGroupHandle() : groupHandle;
                 groupHandle = (groupHandle == null) ? "external" : groupHandle;
                 
-                PlanetGroupData targetGroup = planet.getGroup(groupHandle);
+                PlanetData defaultPlanet = pmgr.getPlanet("default_planet");
+                PlanetGroupData targetGroup = pmgr.getGroup(defaultPlanet, groupHandle);
                 form.setGroupHandle(groupHandle);
                 request.setAttribute("model",
                         new SubscriptionsPageModel(
@@ -142,20 +143,21 @@
         try {
             //RollerRequest rreq = RollerRequest.getRollerRequest(request);
             if (RollerSession.getRollerSession(request).isGlobalAdminUser()) {
-                PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();
+                PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
                 PlanetSubscriptionFormEx form = (PlanetSubscriptionFormEx)actionForm;
                 if (form.getId() != null) {
                     PlanetSubscriptionData sub =
-                            planet.getSubscriptionById(form.getId());
+                            pmgr.getSubscriptionById(form.getId());
                     
                     String groupHandle = request.getParameter("groupHandle");
                     groupHandle = (groupHandle == null) ? form.getGroupHandle() : groupHandle;
                     groupHandle = (groupHandle == null) ? "external" : groupHandle;
                     
-                    PlanetGroupData targetGroup = planet.getGroup(groupHandle);
+                    PlanetData defaultPlanet = pmgr.getPlanet("default_planet");
+                    PlanetGroupData targetGroup = pmgr.getGroup(defaultPlanet, groupHandle);
                     
                     targetGroup.getSubscriptions().remove(sub);
-                    planet.deleteSubscription(sub);
+                    pmgr.deleteSubscription(sub);
                     PlanetFactory.getPlanet().flush();
                     // TODO: why release here?
                     PlanetFactory.getPlanet().release();
@@ -189,26 +191,27 @@
             HttpServletResponse response) throws IOException, ServletException {
         ActionForward forward = mapping.findForward("planetSubscriptions.page");
         try {
-            PlanetManager planet = PlanetFactory.getPlanet().getPlanetManager();
+            PlanetManager pmgr = PlanetFactory.getPlanet().getPlanetManager();
             PlanetSubscriptionFormEx form = (PlanetSubscriptionFormEx)actionForm;
             
             String groupHandle = request.getParameter("groupHandle");
             groupHandle = (groupHandle == null) ? form.getGroupHandle() : groupHandle;
             groupHandle = (groupHandle == null) ? "external" : groupHandle;
             
-            PlanetGroupData targetGroup = planet.getGroup(groupHandle);
+            PlanetData defaultPlanet = pmgr.getPlanet("default_planet");
+            PlanetGroupData targetGroup = pmgr.getGroup(defaultPlanet, groupHandle);
             
             if (RollerSession.getRollerSession(request).isGlobalAdminUser()) {
                 
                 ActionMessages messages = new ActionMessages();
                 PlanetSubscriptionData sub = null;
-                ActionErrors errors = validate(planet, form);
+                ActionErrors errors = validate(pmgr, form);
                 if (errors.isEmpty()) {
                     if (form.getId() == null || form.getId().trim().length() == 0) {                        
                         // Adding new subscription to group                        
                         // But, does subscription to that feed already exist?
                         if (form.getFeedURL() != null) {
-                            sub = planet.getSubscription(form.getFeedURL()); 
+                            sub = pmgr.getSubscription(form.getFeedURL()); 
                         }
                         if (sub != null) {
                             // Yes, we'll use it instead
@@ -226,17 +229,17 @@
                                 sub.setId(null);
                             }
 
-                            planet.saveSubscription(sub);
+                            pmgr.saveSubscription(sub);
                         }                        
                         targetGroup.getSubscriptions().add(sub);
                         
                     } else {
                         // User editing an existing subscription within a group
-                        sub = planet.getSubscriptionById(form.getId());
+                        sub = pmgr.getSubscriptionById(form.getId());
                         form.copyTo(sub, request.getLocale());                        
                     }                    
                     form.setGroupHandle(groupHandle);
-                    planet.saveGroup(targetGroup);
+                    pmgr.saveGroup(targetGroup);
                     PlanetFactory.getPlanet().flush();
                     
                     messages.add(null,
@@ -252,29 +255,36 @@
             request.setAttribute("model",
                     new SubscriptionsPageModel(
                     targetGroup, request, response, mapping, form));
-        } catch (RollerException e) {
+        } catch (RollerException re) {
             ActionErrors errors = new ActionErrors();
             errors.add(null, new ActionError(
-                    "planetSubscriptions.error.duringSave",e.getRootCauseMessage()));
+                "planetSubscriptions.error.duringSave", re.getRootCauseMessage()));
             saveErrors(request, errors);
+        } catch (Exception e) {
+            ActionErrors errors = new ActionErrors();
+            errors.add(null, new ActionError(
+                "planetSubscriptions.error.duringSave", e.getMessage()));
+            saveErrors(request, errors);
+            logger.error("Unexpected error saving subscription", e);
         }
         return forward;
     }
     
     /** Validate posted subscription, fill in blanks via Technorati */
     private ActionErrors validate(
-            PlanetManager planet, PlanetSubscriptionFormEx form) {
+            PlanetManager pmgr, PlanetSubscriptionFormEx form) {
         String technoratiTitle = null;
         String technoratiFeedUrl = null;
         int inboundlinks = -1;
         int inboundblogs = -1;
         if (form.getSiteURL()!=null && form.getSiteURL().trim().length() > 0) {
             try {
-                PlanetConfigData config = planet.getConfiguration();
+                PropertiesManager props = PlanetFactory.getPlanet().getPropertiesManager();
                 Technorati technorati = null;
-                if (config.getProxyHost()!=null && config.getProxyPort() > 0) {
-                    technorati = new Technorati(
-                            config.getProxyHost(), config.getProxyPort());
+                PropertyData proxyHostProp = props.getProperty("proxyHost");
+                PropertyData proxyPortProp = props.getProperty("proxyPort");
+                if (proxyHostProp != null && proxyPortProp != null) {
+                    technorati = new Technorati(proxyHostProp.getValue(), Integer.parseInt(proxyPortProp.getValue())); 
                 } else {
                     technorati = new Technorati();
                 }
@@ -347,10 +357,6 @@
         
         public List getSubscriptions() {
             return subscriptions;
-        }
-        
-        public boolean isUnconfigured() {
-            return unconfigured;
         }
     }
 }

Modified: incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/forms/PlanetSubscriptionForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/forms/PlanetSubscriptionForm.java?view=diff&rev=526464&r1=526463&r2=526464
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/forms/PlanetSubscriptionForm.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/planet/ui/admin/struts/forms/PlanetSubscriptionForm.java Sat Apr  7 11:01:47 2007
@@ -201,10 +201,7 @@
 
         dataHolder.setInboundblogs(this.inboundblogs);
 
-        dataHolder.setName(this.name);
-
-        dataHolder.setURL(this.URL);
-
+        dataHolder.setTitle(this.name);
     }
 
     /**