From 3e06d2849e5fb53d7ebbb8a88e9af9cd126214d9 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 31 Aug 2010 19:37:23 +0000
Subject: [PATCH] Moved Freemarker SiteAdminController

---
 webapp/config/web.xml                               |  2 +-
 .../SiteAdminController.java}                       | 13 ++++---------
 .../freemarker/body/siteAdmin/siteAdmin-main.ftl    |  1 -
 3 files changed, 5 insertions(+), 11 deletions(-)
 rename webapp/src/edu/cornell/mannlib/vitro/webapp/controller/{edit/FreemarkerSiteAdminController.java => freemarker/SiteAdminController.java} (91%)

diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index 4ec23ddca..4d07084fc 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -342,7 +342,7 @@
 
   <servlet>
     <servlet-name>SiteAdminController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.FreemarkerSiteAdminController</servlet-class>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.SiteAdminController</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>SiteAdminController</servlet-name>
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FreemarkerSiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
similarity index 91%
rename from webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FreemarkerSiteAdminController.java
rename to webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
index 1f8eaf1a7..e40d5f1da 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FreemarkerSiteAdminController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
@@ -1,6 +1,6 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller.edit;
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -15,21 +15,16 @@ import edu.cornell.mannlib.vedit.beans.LoginFormBean;
 import edu.cornell.mannlib.vedit.util.FormUtils;
 import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
 import edu.cornell.mannlib.vitro.webapp.controller.login.LoginTemplateHelper;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener;
 import freemarker.template.Configuration;
 
-public class FreemarkerSiteAdminController extends FreemarkerHttpServlet {
+public class SiteAdminController extends FreemarkerHttpServlet {
 	
-	private static final Log log = LogFactory.getLog(FreemarkerSiteAdminController.class);
+    private static final long serialVersionUID = 1L;
+    private static final Log log = LogFactory.getLog(SiteAdminController.class);
 
-
-    
 	public String getTitle(String siteName) {
         return siteName + " Site Administration";
 	}
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl
index 95bada22c..f696e83c4 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl
@@ -7,7 +7,6 @@
 </div>
 
 <div id="adminDashboard">
-
     <#include "login-main.ftl">
     <#include "siteAdmin-dataInput.ftl">
     <#include "siteAdmin-siteConfiguration.ftl">