You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2011/05/04 06:28:31 UTC
svn commit: r1099320 - in /oodt/trunk/webapp:
components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/
fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/webapp/browser/
Author: mattmann
Date: Wed May 4 04:28:30 2011
New Revision: 1099320
URL: http://svn.apache.org/viewvc?rev=1099320&view=rev
Log:
- OODT-155 - calling it base avoids downstream confusion: especially in the case of FM browser app inheritance
Added:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FMBrowserAppBase.java
- copied, changed from r1099237, oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FMBrowserApp.java
Removed:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FMBrowserApp.java
Modified:
oodt/trunk/webapp/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/webapp/browser/FMBrowserApp.java
Copied: oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FMBrowserAppBase.java (from r1099237, oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FMBrowserApp.java)
URL: http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FMBrowserAppBase.java?p2=oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FMBrowserAppBase.java&p1=oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FMBrowserApp.java&r1=1099237&r2=1099320&rev=1099320&view=diff
==============================================================================
--- oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FMBrowserApp.java (original)
+++ oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/filemgr/FMBrowserAppBase.java Wed May 4 04:28:30 2011
@@ -32,7 +32,7 @@ import org.apache.wicket.protocol.http.W
* @version $Revision$
*
*/
-public abstract class FMBrowserApp extends WebApplication {
+public abstract class FMBrowserAppBase extends WebApplication {
/*
* (non-Javadoc)
Modified: oodt/trunk/webapp/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/webapp/browser/FMBrowserApp.java
URL: http://svn.apache.org/viewvc/oodt/trunk/webapp/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/webapp/browser/FMBrowserApp.java?rev=1099320&r1=1099319&r2=1099320&view=diff
==============================================================================
--- oodt/trunk/webapp/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/webapp/browser/FMBrowserApp.java (original)
+++ oodt/trunk/webapp/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/webapp/browser/FMBrowserApp.java Wed May 4 04:28:30 2011
@@ -20,12 +20,10 @@ package org.apache.oodt.cas.filemgr.weba
//JDK imports
import java.util.logging.Logger;
+//OODT imports
+import org.apache.oodt.cas.webcomponents.filemgr.FMBrowserAppBase;
+
//Wicket imports
-import org.apache.oodt.cas.webcomponents.filemgr.FMBrowserSession;
-import org.apache.wicket.Request;
-import org.apache.wicket.Response;
-import org.apache.wicket.Session;
-import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.target.coding.MixedParamUrlCodingStrategy;
/**
@@ -34,7 +32,7 @@ import org.apache.wicket.request.target.
*
* @see org.apache.oodt.cas.filemgr.webapp.browser.Start#main(String[])
*/
-public class FMBrowserApp extends WebApplication {
+public class FMBrowserApp extends FMBrowserAppBase {
private static final Logger LOG = Logger.getLogger(FMBrowserApp.class
.getName());
@@ -66,22 +64,5 @@ public class FMBrowserApp extends WebApp
return Home.class;
}
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.wicket.protocol.http.WebApplication#newSession(org.apache.wicket
- * .Request, org.apache.wicket.Response)
- */
- @Override
- public Session newSession(Request request, Response response) {
- return new FMBrowserSession(request);
- }
-
- public String getFmUrlStr() {
- return getServletContext().getInitParameter("filemgr.url");
- }
-
}