svn commit: r465741 - in /incubator/roller/trunk/sandbox/planetroller: src/org/apache/roller/planet/ui/forms/GroupForm.java web/index.jsp

[sn...@apache.org]

Author: snoopdave
Date: Thu Oct 19 12:18:06 2006
New Revision: 465741

URL: http://svn.apache.org/viewvc?view=rev&rev=465741
Log:
Eliminating model package in planet code too

Modified:
    incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java
    incubator/roller/trunk/sandbox/planetroller/web/index.jsp

Modified: incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java?view=diff&rev=465741&r1=465740&r2=465741
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java (original)
+++ incubator/roller/trunk/sandbox/planetroller/src/org/apache/roller/planet/ui/forms/GroupForm.java Thu Oct 19 12:18:06 2006
@@ -20,8 +20,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import javax.faces.context.FacesContext;
-import javax.servlet.http.HttpServletRequest;
+import javax.faces.context.FacesContext; 
+import javax.servlet.http.HttpServletRequest; 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: incubator/roller/trunk/sandbox/planetroller/web/index.jsp
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/sandbox/planetroller/web/index.jsp?view=diff&rev=465741&r1=465740&r2=465741
==============================================================================
--- incubator/roller/trunk/sandbox/planetroller/web/index.jsp (original)
+++ incubator/roller/trunk/sandbox/planetroller/web/index.jsp Thu Oct 19 12:18:06 2006
@@ -15,9 +15,17 @@
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
 --%>
-<%@ page import="org.apache.roller.planet.model.PlanetManager" %>
-<%@ page import="org.apache.roller.model.PlanetFactory" %>
+<%@ page import="org.apache.roller.planet.business.PlanetManager" %>
+<%@ page import="org.apache.roller.planet.business.PlanetFactory" %>
+<%@ page import="org.apache.roller.planet.pojos.PlanetConfigData" %>
+<%@ page import="org.apache.roller.planet.pojos.PlanetGroupData" %>
 <%
+    String fwd = "/main.faces";
     PlanetManager pmgr= PlanetFactory.getPlanet().getPlanetManager();
+    PlanetConfigData pconfig = pmgr.getConfiguration();
+    if (pconfig != null && pconfig.getDefaultGroup() != null) {
+        PlanetGroupData group = pconfig.getDefaultGroup();
+        fwd = "/" + group.getHandle();
+    }
 %>
-<jsp:forward page="/main.faces" />
+<jsp:forward page="<%= fwd %>" />