Author: mattmann
Date: Sun Aug 23 16:47:25 2015
New Revision: 1697221
URL: http://svn.apache.org/r1697221
Log:
- moved params specific to Wicket web app for Curator: OODT-842 WIP
Removed:
oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/util/SSOUtils.java
Modified:
oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java
oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java
Modified:
oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java?rev=1697221&r1=1697220&r2=1697221&view=diff
==============================================================================
---
oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java
(original)
+++
oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/metadata/CuratorConfMetKeys.java
Sun Aug 23 16:47:25 2015
@@ -35,14 +35,10 @@ public interface CuratorConfMetKeys {
final String FM_URL = "org.apache.oodt.cas.fm.url";
- final String SSO_IMPL_CLASS = "org.apache.oodt.security.sso.implClass";
-
final String DEFAULT_TRANSFER_FACTORY =
"org.apache.oodt.cas.filemgr.datatransfer.LocalDataTransferFactory";
final String CRAWLER_CONF_FILE =
"classpath:/org.apache/oodt/cas/crawl/crawler-config.xml";
- final String PROJECT_DISPLAY_NAME =
"org.apache.oodt.cas.curator.projectName";
-
final String STAGING_AREA_PATH =
"org.apache.oodt.cas.curator.stagingAreaPath";
final String MET_AREA_PATH = "org.apache.oodt.cas.curator.metAreaPath";
Modified:
oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java?rev=1697221&r1=1697220&r2=1697221&view=diff
==============================================================================
---
oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
(original)
+++
oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java
Sun Aug 23 16:47:25 2015
@@ -15,15 +15,12 @@
* limitations under the License.
*/
-
package org.apache.oodt.cas.curation.service;
//OODT imports
import org.apache.oodt.cas.curation.metadata.CuratorConfMetKeys;
-import org.apache.oodt.cas.curation.util.SSOUtils;
import org.apache.oodt.security.sso.SingleSignOn;
-
//JDK imports
import java.io.File;
import java.io.FilenameFilter;
@@ -35,20 +32,16 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
-
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.UriInfo;
-
//JAX-RS imports
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
-
//APACHE imports
import org.apache.commons.lang.StringUtils;
@@ -157,19 +150,5 @@ public class CurationService extends Htt
return newPath;
}
-
- /**
- * Configures the web context persistence layer for the CAS SSO so that all
- * services ({@link HttpServlet}s) that extend this implementation get the
- * ability to configure an SSO object for free, essentially.
- *
- * @param req
- * The HTTP request object.
- * @param res
- * The HTTP response object.
- */
- protected void configureSingleSignOn(HttpServletRequest req,
- HttpServletResponse res) {
- this.sso = SSOUtils.getWebSingleSignOn(CurationService.config, req, res);
- }
+
}
Modified:
oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java?rev=1697221&r1=1697220&r2=1697221&view=diff
==============================================================================
---
oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java
(original)
+++
oodt/trunk/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationServiceConfig.java
Sun Aug 23 16:47:25 2015
@@ -138,23 +138,6 @@ public class CurationServiceConfig imple
/**
*
- * @return The java class name (fully-qualified) of the CAS SSO security
- * implementation.
- */
- public String getSSOImplClass() {
- return this.evaluateParameter(SSO_IMPL_CLASS);
- }
-
- /**
- *
- * @return The display name of the project.
- */
- public String getProjectDisplayName() {
- return this.evaluateParameter(PROJECT_DISPLAY_NAME);
- }
-
- /**
- *
* @return The upload path for metadata extractor config files.
*/
public String getMetExtrConfUploadPath() {
