Author: mattmann
Date: Sun Aug 23 19:27:19 2015
New Revision: 1697238
URL: http://svn.apache.org/r1697238
Log:
- more OODT-842 WIP
- add LoginPage (need to implement method for login/logout action)
- refactor connection to OODT SSO
- refactor webapp to make parent/child relationship (preparing for skinning)
- down to last few JSPs to remove, and last work here to wrap this up.
TODO:
- add EDRN skin as an example
- add LMMP skin as an example
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.html
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.java
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.html
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.java
Removed:
oodt/trunk/curator/webapp/src/main/webapp/error.jsp
oodt/trunk/curator/webapp/src/main/webapp/home.jsp
oodt/trunk/curator/webapp/src/main/webapp/index.jsp
oodt/trunk/curator/webapp/src/main/webapp/login.jsp
oodt/trunk/curator/webapp/src/main/webapp/tools/
oodt/trunk/curator/webapp/src/main/webapp/views/
Modified:
oodt/trunk/curator/webapp/pom.xml
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java
oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml
oodt/trunk/curator/webapp/src/main/webapp/WEB-INF/web.xml
oodt/trunk/curator/webapp/src/main/webapp/logout.jsp
oodt/trunk/curator/webapp/src/main/webapp/sso_login.jsp
Modified: oodt/trunk/curator/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/pom.xml?rev=1697238&r1=1697237&r2=1697238&view=diff
==============================================================================
--- oodt/trunk/curator/webapp/pom.xml (original)
+++ oodt/trunk/curator/webapp/pom.xml Sun Aug 23 19:27:19 2015
@@ -159,7 +159,12 @@ the License.
<groupId>org.apache.oodt</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-sso</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
</dependencies>
</project>
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java?rev=1697238&r1=1697237&r2=1697238&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
(original)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
Sun Aug 23 19:27:19 2015
@@ -21,51 +21,74 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.oodt.cas.curation.login.LoginPage;
import org.apache.oodt.cas.webcomponents.curation.workbench.Workbench;
import org.apache.wicket.Page;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.target.coding.MixedParamUrlCodingStrategy;
import org.apache.wicket.util.file.File;
public class CurationApp extends WebApplication {
-
- private static final Logger LOG =
Logger.getLogger(CurationApp.class.getName());
- /* (non-Javadoc)
+ private static final Logger LOG = Logger.getLogger(CurationApp.class
+ .getName());
+
+ public static final String PROJECT_DISPLAY_NAME =
"org.apache.oodt.cas.curator.projectName";
+
+ public static final String SSO_IMPL_CLASS =
"org.apache.oodt.security.sso.implClass";
+
+ public static final String CURATOR_HOMEPAGE = "curator.homepage";
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.wicket.protocol.http.WebApplication#init()
*/
@Override
protected void init() {
super.init();
Set<String> resources = Workbench.getImageFiles();
- if (resources != null){
- for (String resource: resources){
+ if (resources != null) {
+ for (String resource : resources) {
String resName = new File(resource).getName();
- String resPath = "/images/"+resName;
- LOG.log(Level.INFO, "Mounting: ["+resPath+"]");
- mountSharedResource(resPath,
- new ResourceReference(Workbench.class,
- resName).getSharedResourceKey());
+ String resPath = "/images/" + resName;
+ LOG.log(Level.INFO, "Mounting: [" + resPath + "]");
+ mountSharedResource(resPath, new ResourceReference(Workbench.class,
+ resName).getSharedResourceKey());
}
}
+
+ mountSharedResource("/images/blackfade-syncd.jpg", new ResourceReference(
+ HomePage.class, "blackfade-syncd.jpg").getSharedResourceKey());
- mountSharedResource("/images/blackfade-syncd.jpg",
- new ResourceReference(HomePage.class, "blackfade-syncd.jpg")
- .getSharedResourceKey());
+ MixedParamUrlCodingStrategy loginPageMount = new
MixedParamUrlCodingStrategy(
+ "auth", LoginPage.class, new String[] { "action"});
+ mount(loginPageMount);
}
@Override
- public Class<? extends Page> getHomePage() {
- try {
- return (Class<? extends Page>)
Class.forName(getHomePageClass());
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- return HomePage.class;
- }
- }
-
- public String getHomePageClass() {
- return getServletContext().getInitParameter("curator.homepage");
- }
+ public Class<? extends Page> getHomePage() {
+ try {
+ return (Class<? extends Page>) Class.forName(getHomePageClass());
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ return HomePage.class;
+ }
+ }
+
+ public String getHomePageClass() {
+ return getServletContext().getInitParameter(CURATOR_HOMEPAGE);
+ }
+
+ public String getSSOClass() {
+ return getServletContext().getInitParameter(
+ SSO_IMPL_CLASS);
+ }
+
+ public String getProjectName() {
+ return getServletContext().getInitParameter(
+ PROJECT_DISPLAY_NAME);
+ }
}
\ No newline at end of file
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html?rev=1697238&r1=1697237&r2=1697238&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
(original)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
Sun Aug 23 19:27:19 2015
@@ -32,10 +32,12 @@
<div id="cas-header">
<div id="cas-logo-left"><!-- cas logo lhs --></div>
<div id="cas-logo-right"><!-- cas logo rhs --></div>
- <h2 class="app-title">Project Name CAS Curation</h2>
+ <h2 class="app-title" wicket:id="project_name">Project Name CAS
Curation</h2>
<div class="userdetails">
- Logged in as mattmann
- </div>
+ <span wicket:id="loggedin_label">Logged in as mattmann</span>
+ <a href="#" wicket:id="login_link">Log In</a>
+ <a href="#" wicket:id="logout_link">Log Out</a>
+ </div>
</div>
</div>
@@ -51,9 +53,7 @@
<!-- begin main content -->
<div style="position:relative;min-height:300px;">
- <div id="curator_workbench" wicket:id="curator_workbench">
- </div>
-
+<wicket:child/>
<!-- so that it previews right -->
<wicket:remove>
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java?rev=1697238&r1=1697237&r2=1697238&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java
(original)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.java
Sun Aug 23 19:27:19 2015
@@ -17,15 +17,78 @@
package org.apache.oodt.cas.curation;
+import org.apache.oodt.cas.curation.login.LoginPage;
import org.apache.oodt.cas.webcomponents.curation.workbench.Workbench;
+import org.apache.oodt.security.sso.AbstractWebBasedSingleSignOn;
+import org.apache.oodt.security.sso.SingleSignOnFactory;
+import org.apache.wicket.Application;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.RequestCycle;
import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.protocol.http.WebRequest;
+import org.apache.wicket.protocol.http.WebResponse;
public class HomePage extends WebPage {
public HomePage() {
super();
- add(new Workbench("curator_workbench"));
+ CurationApp app = ((CurationApp) Application.get());
+ AbstractWebBasedSingleSignOn sso = SingleSignOnFactory
+ .getWebBasedSingleSignOn(app.getSSOClass());
+ sso.setReq(((WebRequest) RequestCycle.get().getRequest())
+ .getHttpServletRequest());
+ sso.setRes(((WebResponse) RequestCycle.get().getResponse())
+ .getHttpServletResponse());
+ String loggedInLabel = null;
+ String logoutLabel = "Log Out";
+
+ if (sso.isLoggedIn()) {
+ loggedInLabel = "Logged in as " + sso.getCurrentUsername() + ".";
+ add(new Label("loggedin_label", loggedInLabel));
+ add(new Label("logout_label", logoutLabel).setVisible(false));
+ add(new Link<String>("login_link"){
+ @Override
+ public void onClick() {
+ PageParameters params = new PageParameters();
+ params.add("action", "login");
+ setResponsePage(LoginPage.class, params);
+ }
+ }.setVisible(false));
+ add(new Link<String>("logout_link"){
+ @Override
+ public void onClick() {
+ PageParameters params = new PageParameters();
+ params.add("action", "logout");
+ setResponsePage(LoginPage.class, params);
+ }
+ });
+ } else {
+ loggedInLabel = "Not logged in.";
+ add(new Label("loggedin_label", loggedInLabel));
+ add(new Label("logout_label", logoutLabel).setVisible(false));
+ add(new Link<String>("login_link"){
+ @Override
+ public void onClick() {
+ PageParameters params = new PageParameters();
+ params.add("action", "login");
+ setResponsePage(LoginPage.class, params);
+ }
+ });
+ add(new Link<String>("logout_link"){
+ @Override
+ public void onClick() {
+ PageParameters params = new PageParameters();
+ params.add("action", "logout");
+ setResponsePage(LoginPage.class, params);
+ }
+ }.setVisible(false));
+ }
+
+ String projectName = app.getProjectName() + " CAS Curation";
+ add(new Label("project_name", projectName));
}
-
+
}
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css?rev=1697238&view=auto
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css
(added)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.css
Sun Aug 23 19:27:19 2015
@@ -0,0 +1,35 @@
+
+#login{
+ text-align: center;
+ display: block;
+}
+
+#login_form{
+ display: inline-block;
+ text-align: center;
+ margin: 0 auto;
+}
+
+#invalid_creds{
+ align:center;
+ margin:0px;
+ margin-bottom:5px;
+ width:230px;
+ font-size:90%;
+}
+
+#connect_error{
+ align:center;
+ margin:0px;
+ margin-bottom:5px;
+ width:230px;
+ font-size:90%;
+}
+
+#section_title{
+ width: auto;
+ font-size: 22px;
+ font-weight: bold;
+ margin-top: 24px;
+ text-align: center;
+}
\ No newline at end of file
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.html?rev=1697238&view=auto
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.html
(added)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.html
Sun Aug 23 19:27:19 2015
@@ -0,0 +1,95 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+-->
+
+<wicket:extend>
+<wicket:remove>
+ <link type="text/css" rel="stylesheet" href="../HomePage.css"/>
+ <link type="text/css" rel="stylesheet"
href="../../../../../../../../../../../webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.css"/>
+</wicket:remove>
+
+<wicket:link>
+<link type="text/css" rel="stylesheet" href="LoginPage.css"/>
+</wicket:link>
+
+<wicket:remove>
+<div id="page">
+ <div id="cas-header">
+ <div id="cas-logo-left"><!-- cas logo lhs --></div>
+ <div id="cas-logo-right"><!-- cas logo rhs --></div>
+ <h2 class="app-title">Project Name CAS Curation</h2>
+ <div class="userdetails">
+ <span >Logged in as mattmann</span>
+ <a href="#">Log In</a>
+ <a href="#">Log Out</a>
+ </div>
+ </div>
+ </div>
+
+ <div class="menu">
+ <!-- Breadcrumbs Area -->
+ <div id="breadcrumbs">
+ <div style="margin-left: 10px;padding-left: 10px;">
+ <a href="#" style="color:black;">Home</a> > Main
+ </div>
+ </div>
+ </div>
+
+<!-- begin main content -->
+</wicket:remove>
+
+<div style="position:relative;min-height:300px;">
+<h1 class="sectionTitle" id="section_title">Please Log In to the <span
wicket:id="login_project_name">Project Name CAS Curation Interface</span></h1>
+<br/><br/>
+
+<div id="login">
+<form id="login_form" method="post">
+ <div id="invalid_creds" class="error">Invalid Credentials...<br/>Please try
again.</div>
+ <div id="connect_error" class="error">Unable to contact LDAP authentication
server...<br/>Please try again later.</div>
+
+ <table>
+ <tbody><tr>
+ <td>Username</td>
+ <td><input id="login_username" value="" size="20" maxlength="255"
type="text"></td>
+ </tr>
+ <tr>
+ <td>Password</td>
+ <td><input id="password" value="" size="20" maxlength="255"
type="password"></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><input id="login_submit" value="Log In" type="submit"></td>
+ </tr>
+ </tbody></table>
+</form>
+</div>
+
+<script type="text/javascript">
+ document.getElementById('login_username').focus();
+</script>
+</div>
+
+<wicket:remove>
+<!-- end main content -->
+<div id="footer">
+ Apache Software Foundation.<br/>
+ <a href="http://apache.org/";>apache.org</a><br/>
+ Built On Apache <a href="http://oodt.apache.org";>OODT</a>
+</div>
+
+</wicket:remove>
+
+</wicket:extend>
\ No newline at end of file
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.java?rev=1697238&view=auto
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.java
(added)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/login/LoginPage.java
Sun Aug 23 19:27:19 2015
@@ -0,0 +1,38 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ */
+
+package org.apache.oodt.cas.curation.login;
+
+import org.apache.oodt.cas.curation.CurationApp;
+import org.apache.oodt.cas.curation.HomePage;
+import org.apache.wicket.Application;
+import org.apache.wicket.markup.html.basic.Label;
+
+public class LoginPage extends HomePage {
+
+ public LoginPage() {
+ super();
+ CurationApp app = (CurationApp)Application.get();
+ String appNameString = app.getProjectName()+" CAS Curation Interface";
+ add(new Label("login_project_name", appNameString));
+
+ }
+
+
+
+
+}
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.html?rev=1697238&view=auto
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.html
(added)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.html
Sun Aug 23 19:27:19 2015
@@ -0,0 +1,24 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+-->
+
+
+<wicket:extend>
+
+ <div id="curator_workbench" wicket:id="curator_workbench">
+ </div>
+
+</wicket:extend>
\ No newline at end of file
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.java?rev=1697238&view=auto
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.java
(added)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/workbench/WorkbenchPage.java
Sun Aug 23 19:27:19 2015
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * 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.
+ */
+
+package org.apache.oodt.cas.curation.workbench;
+
+import org.apache.oodt.cas.curation.HomePage;
+import org.apache.oodt.cas.webcomponents.curation.workbench.Workbench;
+
+public class WorkbenchPage extends HomePage {
+
+ public WorkbenchPage() {
+ super();
+ add(new Workbench(
+ "curator_workbench"));
+
+ }
+
+}
Modified: oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml?rev=1697238&r1=1697237&r2=1697238&view=diff
==============================================================================
--- oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml (original)
+++ oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml Sun Aug 23
19:27:19 2015
@@ -23,7 +23,7 @@ the License.
<Parameter name="org.apache.oodt.security.sso.implClass"
value="org.apache.oodt.security.sso.DummyImpl"/>
- <Parameter name="curator.homepage"
value="org.apache.oodt.cas.curation.HomePage"/>
+ <Parameter name="curator.homepage"
value="org.apache.oodt.cas.curation.workbench.WorkbenchPage"/>
<!-- needed by Curation Services -->
Modified: oodt/trunk/curator/webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/webapp/WEB-INF/web.xml?rev=1697238&r1=1697237&r2=1697238&view=diff
==============================================================================
--- oodt/trunk/curator/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ oodt/trunk/curator/webapp/src/main/webapp/WEB-INF/web.xml Sun Aug 23
19:27:19 2015
@@ -27,7 +27,7 @@ the License.
</init-param>
<init-param>
<param-name>curator.homepage</param-name>
- <param-value>org.apache.oodt.cas.curation.HomePage</param-value>
+
<param-value>org.apache.oodt.cas.curation.workbench.WorkbenchPage</param-value>
</init-param>
</filter>
Modified: oodt/trunk/curator/webapp/src/main/webapp/logout.jsp
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/webapp/logout.jsp?rev=1697238&r1=1697237&r2=1697238&view=diff
==============================================================================
--- oodt/trunk/curator/webapp/src/main/webapp/logout.jsp (original)
+++ oodt/trunk/curator/webapp/src/main/webapp/logout.jsp Sun Aug 23 19:27:19
2015
@@ -1,4 +1,3 @@
-<%@page import="org.apache.oodt.cas.curation.util.SSOUtils"%>
<%@page import="org.apache.oodt.security.sso.SingleSignOn"%>
<%
// Licensed to the Apache Software Foundation (ASF) under one or more
contributor
@@ -17,7 +16,7 @@
// the License.
// use new single sign on API
-SingleSignOn auth = SSOUtils.getWebSingleSignOn(application, request,response);
+SingleSignOn auth = null;//SSOUtils.getWebSingleSignOn(application,
request,response);
String refererUrl = request.getParameter("from");
auth.logout();
Modified: oodt/trunk/curator/webapp/src/main/webapp/sso_login.jsp
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/webapp/sso_login.jsp?rev=1697238&r1=1697237&r2=1697238&view=diff
==============================================================================
--- oodt/trunk/curator/webapp/src/main/webapp/sso_login.jsp (original)
+++ oodt/trunk/curator/webapp/src/main/webapp/sso_login.jsp Sun Aug 23 19:27:19
2015
@@ -1,4 +1,3 @@
-<%@page import="org.apache.oodt.cas.curation.util.SSOUtils"%>
<%@page import="org.apache.oodt.security.sso.SingleSignOn"%>
<%
// Licensed to the Apache Software Foundation (ASF) under one or more
contributor
@@ -17,7 +16,7 @@
// the License.
// use new single sign on API
-SingleSignOn auth = SSOUtils.getWebSingleSignOn(application, request,response);
+SingleSignOn auth = null;//SSOUtils.getWebSingleSignOn(application,
request,response);
String ldapUser = request.getParameter("username");
String ldapPass = request.getParameter("password");
String refererUrl = request.getParameter("from");
