cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/4] cxf-fediz git commit: Removing WEB-INF stuff from idp-core
Date Wed, 15 Feb 2017 17:24:59 GMT
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/137858bf/services/idp-core/src/main/webapp/WEB-INF/idp-servlet.xml
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/webapp/WEB-INF/idp-servlet.xml b/services/idp-core/src/main/webapp/WEB-INF/idp-servlet.xml
deleted file mode 100644
index e7c24ee..0000000
--- a/services/idp-core/src/main/webapp/WEB-INF/idp-servlet.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
-        http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-
-    <import resource="config/idp-core-servlet.xml" />
-
-    <!-- Define some mutable properties for the IdP -->
-    <context:property-placeholder location="classpath:realm.properties" />
-
-    <bean id="stsClientForRpAction" class="org.apache.cxf.fediz.service.idp.beans.STSClientAction">
-        <property name="wsdlLocation" value="https://localhost:0/fediz-idp-sts/${realm.STS_URI}/STSServiceTransport?wsdl"
/>
-        <property name="wsdlEndpoint" value="Transport_Port" />
-        <property name="tokenType" value="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"
/>
-    </bean>
-
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/137858bf/services/idp-core/src/main/webapp/WEB-INF/security-config.xml
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/webapp/WEB-INF/security-config.xml b/services/idp-core/src/main/webapp/WEB-INF/security-config.xml
deleted file mode 100644
index e51f906..0000000
--- a/services/idp-core/src/main/webapp/WEB-INF/security-config.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:security="http://www.springframework.org/schema/security"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="
-        http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
-        http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context-4.3.xsd
-        http://www.springframework.org/schema/security
-        http://www.springframework.org/schema/security/spring-security-3.2.xsd
-        ">
-
-    <context:property-placeholder location="classpath:realm.properties" />
-
-    <import resource="config/security-krb-config.xml" />
-    <import resource="config/security-clientcert-config.xml" />
-    <import resource="config/security-up-config.xml" />
-    <import resource="config/security-rs-config.xml" />
-    
-    <!-- DISABLE in production as it might log confidential information about the user
-->
-    <!-- <security:debug /> -->
-
-    <!-- Configure Spring Security -->
-    
-    <!-- If enabled, you can't access the Service layer within the Spring Webflow -->
-    <!-- The user has no role during the login phase of WS-Federation -->
-    <security:global-method-security pre-post-annotations="enabled" />
-
-    <!-- Redirects to a dedicated http config -->
-    <bean id="fedizEntryPoint" class="org.apache.cxf.fediz.service.idp.FedizEntryPoint">
-        <property name="realm" value="${realm-uri}" />
-        <property name="configService" ref="config" />
-    </bean>
-    
-    <!-- Main entry point for WS-Federation -->
-    <security:http pattern="/federation" use-expressions="true" entry-point-ref="fedizEntryPoint">
-        <security:custom-filter after="CHANNEL_FILTER" ref="stsUPPortFilter" />
-        <security:custom-filter after="SERVLET_API_SUPPORT_FILTER" ref="entitlementsEnricher"
/>
-    </security:http>
-    
-    <!-- Main entry point for SAML SSO -->
-    <security:http pattern="/saml" use-expressions="true" entry-point-ref="fedizEntryPoint">
-        <security:custom-filter after="CHANNEL_FILTER" ref="stsUPPortFilter" />
-        <security:custom-filter after="SERVLET_API_SUPPORT_FILTER" ref="entitlementsEnricher"
/>
-    </security:http>
-    
-    <security:authentication-manager alias="authenticationManagers">
-        <security:authentication-provider ref="stsUPAuthProvider" />
-        <security:authentication-provider ref="stsKrbAuthProvider" />
-        <security:authentication-provider ref="stsClientCertAuthProvider" />
-    </security:authentication-manager>
-	
-    <bean id="entitlementsEnricher" 
-          class="org.apache.cxf.fediz.service.idp.service.security.GrantedAuthorityEntitlements"
/>
-	
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/137858bf/services/idp-core/src/main/webapp/WEB-INF/views/genericerror.jsp
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/webapp/WEB-INF/views/genericerror.jsp b/services/idp-core/src/main/webapp/WEB-INF/views/genericerror.jsp
deleted file mode 100644
index c31c77c..0000000
--- a/services/idp-core/src/main/webapp/WEB-INF/views/genericerror.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>IDP generic error page</title>
-</head>
-<body>
-	<h1>Sorry, CXF Fediz IDP cannot satisfy your request.</h1>
-	<p>Reason : ${reason}</p>
-</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/137858bf/services/idp-core/src/main/webapp/WEB-INF/views/idplist.jsp
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/webapp/WEB-INF/views/idplist.jsp b/services/idp-core/src/main/webapp/WEB-INF/views/idplist.jsp
deleted file mode 100644
index 0a9cdb1..0000000
--- a/services/idp-core/src/main/webapp/WEB-INF/views/idplist.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<%@page import="java.util.List"%>
-<%@page import="org.apache.cxf.fediz.service.idp.domain.Idp"%>
-<%@page import="org.apache.cxf.fediz.service.idp.domain.TrustedIdp"%>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<html>
-<head>
-<title>Trusted IDP List</title>
-</head>
-<body>
-	<h1>Trusted IDP List</h1>
-	<i>Where are you from? Please, select one Identity Provider in the list which is able
to authenticate you. </i>
-	<form:form method="POST" id="idplist" name="idplist">
-		<br />
-        <% Idp idp = (Idp)request.getAttribute("idpConfig");
-        List<TrustedIdp> trustedIDPs = idp.getTrustedIdps(); %>
-      <select name="homeRealm">
-        <% if (idp.isUseCurrentIdp()) { %>
-        <option value="<%=idp.getRealm()%>" selected="selected" ><%=idp.getServiceDescription()%></option>
-        <% } 
-           for (TrustedIdp trustedIDP : trustedIDPs) { %>
-        <option value="<%=trustedIDP.getRealm()%>"><%=trustedIDP.getDescription()%></option>
-        <% } %>
-      </select>
-      <br />
-      <input type="hidden" id="execution" name="execution" value="${flowExecutionKey}"/>
-      <br />
-      <input type="submit" name="_eventId_submit" value="Select Home Realm" />
-      <input type="submit" name="_eventId_cancel" value="Cancel" />
-    </form:form>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/137858bf/services/idp-core/src/main/webapp/WEB-INF/views/index.jsp
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/webapp/WEB-INF/views/index.jsp b/services/idp-core/src/main/webapp/WEB-INF/views/index.jsp
deleted file mode 100644
index 1a1ef1d..0000000
--- a/services/idp-core/src/main/webapp/WEB-INF/views/index.jsp
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  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.
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML><HEAD><TITLE>WS Federation Tomcat Examples</TITLE>
-<META http-equiv=Content-Type content="text/html">
-</HEAD>
-<BODY>
-<P>
-<H3>Hello World</H3>
-<P></P>
-</BODY></HTML>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/137858bf/services/idp-core/src/main/webapp/WEB-INF/views/samlsigninresponseform.jsp
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/webapp/WEB-INF/views/samlsigninresponseform.jsp b/services/idp-core/src/main/webapp/WEB-INF/views/samlsigninresponseform.jsp
deleted file mode 100644
index 3e7dc36..0000000
--- a/services/idp-core/src/main/webapp/WEB-INF/views/samlsigninresponseform.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-
-<html>
-<head>
-<title>IDP SignIn Response Form</title>
-</head>
-<body>
-	<form:form method="POST" id="samlsigninresponseform" name="samlsigninresponseform" action="${samlAction}"
htmlEscape="true">
-        <input type="hidden" name="SAMLResponse" value="${samlResponse}" /><br />
-        <input type="hidden" name="RelayState" value="${relayState}" /><br />
-  		<noscript>
-		<p>Script is disabled. Click Submit to continue.</p>
-		<input type="submit" name="_eventId_submit" value="Submit" /><br />
- 		</noscript>
-	</form:form>
- 	<script language="javascript">window.setTimeout('document.forms[0].submit()',0);</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/137858bf/services/idp-core/src/main/webapp/WEB-INF/views/signinform.jsp
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/webapp/WEB-INF/views/signinform.jsp b/services/idp-core/src/main/webapp/WEB-INF/views/signinform.jsp
deleted file mode 100644
index bcd7916..0000000
--- a/services/idp-core/src/main/webapp/WEB-INF/views/signinform.jsp
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<html>
-	<head>
-		<title>IDP SignIn Request Form</title>
-		<style type="text/css">
-			.error 			{
-								color: #a94442 !important;
-								background-color: #f2dede !important;
-								border-color: #ebccd1 !important;
-							}
-			.msg 			{
-								padding: 15px;
-								border: 1px solid transparent;
-								border-radius: 4px;
-								color: #31708f;
-								background-color: #d9edf7;
-								border-color: #bce8f1;
-								margin: auto;
-								text-align: center;
-								margin-top: 5px;
-								width: 60%;
-							}
-			h1				{
-								font-size: 24px;
-								margin-top: 25px;
-							}
-			body			{
-								font-family:arial;
-							}
-			label			{
-								width: 90px;
-								display: inline-block;
-							}
-			#login_form		{
-								width: 250px;
-							}
-			#submit_button	{
-								float: right;
-								margin: 5px 12px;
-							}
-		</style>
-	</head>
-	<body onload='document.signinform.username.focus();'>
-		<img src="<c:url value='/images/apache-logo.png' />" alt="Apache Logo" style="margin:5px
auto">
-		
-		<c:if test="${param.error != null}">
-			<div class="msg error"><b>Login Failed</b><br />
-                Username and password do not match. Please try again.</div>
-		</c:if>
-		<c:if test="${param.out != null}">
-			<div class="msg info"><b>Logout successful</b></div>
-		</c:if>
-		
-		<h1>Fediz IDP Login</h1>
-		
-		<form:form method="POST" id="signinform" name="signinform" action="login.do" >
-			<div id="login_form">
-				<label for="username">UserId</label>
-				<input type="text" id="username" name="username" placeholder="username" />
-				<br />
-				<label for="password">Password</label>
-				<input type="password" id="password" name="password" placeholder="password" />
-				<br />
-				<!--input type="hidden" id="execution" name="execution" value="${flowExecutionKey}"/-->
-				<input type="submit" id="submit_button" name="authenticate" value="Authenticate" />
-			</div>
-		</form:form>
-	</body>
-</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/137858bf/services/idp-core/src/main/webapp/WEB-INF/views/signinresponseform.jsp
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/webapp/WEB-INF/views/signinresponseform.jsp b/services/idp-core/src/main/webapp/WEB-INF/views/signinresponseform.jsp
deleted file mode 100644
index 7a98789..0000000
--- a/services/idp-core/src/main/webapp/WEB-INF/views/signinresponseform.jsp
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-
-<html>
-<head>
-<title>IDP SignIn Response Form</title>
-</head>
-<body>
-	<form:form method="POST" id="signinresponseform" name="signinresponseform" action="${fedAction}"
htmlEscape="true">
-        <input type="hidden" name="wa" value="wsignin1.0" /><br />
-        <input type="hidden" name="wresult" value="${fedWResult}" /><br />
-        <% String wctx = (String)request.getAttribute("fedWCtx");
-           if (wctx != null && !wctx.isEmpty()) { %>
-        	<input type="hidden" name="wctx" value="${fedWCtx}" /><br />
-	    <% } %>
-        <input type="hidden" name="wtrealm" value="${fedWTrealm}" /><br />
-  		<noscript>
-		<p>Script is disabled. Click Submit to continue.</p>
-		<input type="submit" name="_eventId_submit" value="Submit" /><br />
- 		</noscript>
-	</form:form>
- 	<script language="javascript">window.setTimeout('document.forms[0].submit()',0);</script>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/137858bf/services/idp-core/src/main/webapp/WEB-INF/views/signoutconfirmationresponse.jsp
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/webapp/WEB-INF/views/signoutconfirmationresponse.jsp
b/services/idp-core/src/main/webapp/WEB-INF/views/signoutconfirmationresponse.jsp
deleted file mode 100644
index 3e7a547..0000000
--- a/services/idp-core/src/main/webapp/WEB-INF/views/signoutconfirmationresponse.jsp
+++ /dev/null
@@ -1,65 +0,0 @@
-<%@ page import="java.util.Map" %>
-<%@ page import="org.apache.cxf.fediz.service.idp.beans.SigninParametersCacheAction" %>
-<%@ page import="org.apache.cxf.fediz.service.idp.domain.Application" %>
-<%@ page import="org.apache.cxf.fediz.core.FederationConstants" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>IDP SignOut Confirmation Response Page</title>
-</head>
-<body>
-    <%
-        @SuppressWarnings("unchecked")
-        Map<String, Application> rcm =
-        (Map<String, Application>) request.getSession().getAttribute(SigninParametersCacheAction.ACTIVE_APPLICATIONS);
-    	String wreply = (String) request.getAttribute("wreply");
-
-        if (rcm == null) {
-    %>
-	        <p>You have already logged out</p>
-    <%
-        } else {
-    %>
-	        <h1>Logout from the following Applications?</h1>
-			<div>	   
-    <%
-            Iterator<Map.Entry<String, Application>> iterator = rcm.entrySet().iterator();
-                
-            while (iterator.hasNext()) {
-                Application next = iterator.next().getValue();
-                if (next != null) {
-    %>
-                    <%= next.getServiceDisplayName() %>
-                    <br/>
-    <%
-                }
-            }
-        }
-        
-        if (rcm != null && !rcm.isEmpty()) {
-    %>
-	    	</div>
-	    	<br/>
-	    	<br/>
-	        <form:form method="POST" id="signoutconfirmationresponseform" name="signoutconfirmationresponseform">
-	            <input type="hidden" name="wa" value="wsignout1.0" />
-	            <input type="hidden" id="execution" name="execution" value="${flowExecutionKey}"
/>
-	            <input type="submit" name="_eventId_submit" value="Logout" />
-			    <%     
-			        if (wreply != null && !wreply.isEmpty()) {
-			    %>
-			    <input type="hidden" name="wreply" value="<%= wreply%>" />        
-	            <input type="submit" name="_eventId_cancel" value="Cancel" />
-	            <%     
-			        }
-			    %>
-	        </form:form>
-    <%     
-        }
-    %>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/137858bf/services/idp-core/src/main/webapp/WEB-INF/views/signoutresponse.jsp
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/webapp/WEB-INF/views/signoutresponse.jsp b/services/idp-core/src/main/webapp/WEB-INF/views/signoutresponse.jsp
deleted file mode 100644
index 429c026..0000000
--- a/services/idp-core/src/main/webapp/WEB-INF/views/signoutresponse.jsp
+++ /dev/null
@@ -1,56 +0,0 @@
-<%@page import="org.opensaml.soap.wsfed.WSFedConstants"%>
-<%@ page import="java.util.Map" %>
-<%@ page import="org.apache.cxf.fediz.service.idp.beans.SigninParametersCacheAction" %>
-<%@ page import="org.apache.cxf.fediz.service.idp.domain.Application" %>
-<%@ page import="org.apache.cxf.fediz.core.FederationConstants" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Iterator" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>IDP SignOut Response Page</title>
-</head>
-<body>
-    <%
-        @SuppressWarnings("unchecked")
-        Map<String, Application> apps =
-                (Map<String, Application>) request.getAttribute(SigninParametersCacheAction.ACTIVE_APPLICATIONS);
-    	String wreply = (String) request.getAttribute("wreply");
-
-        if (apps == null) {
-    %>
-	        <p>You have already logged out</p>
-    <%
-        } else {
-    %>
-            <h1>CXF Fediz IDP successful logout.</h1>
-        
-            <p>
-    <%
-            Iterator<Map.Entry<String, Application>> iterator = apps.entrySet().iterator();
-            
-            while (iterator.hasNext()) {
-                Application next = iterator.next().getValue();
-                if (next != null) {
-    %>
-                    <%= next.getServiceDisplayName() %> 
-                    <img src="<%=next.getPassiveRequestorEndpoint() + "?" + FederationConstants.PARAM_ACTION

-                        + "=" + FederationConstants.ACTION_SIGNOUT_CLEANUP %>"/>
-                    <br/>
-    <%
-                }
-            }
-    %>
-	        </p>
-    <%
-        }
-        if (wreply != null && !wreply.isEmpty()) {
-    %>
-    <p><a href="<%= wreply%>">continue</a></p>
-    <%
-        }
-    %>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/137858bf/services/idp-core/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/webapp/WEB-INF/web.xml b/services/idp-core/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 807fa23..0000000
--- a/services/idp-core/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
-
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-    version="3.0" metadata-complete="true">
-
-	<description>Fediz IDP</description>
-	<display-name>Fediz IDP</display-name>
-	
-	<session-config>
-	    <cookie-config>
-            <http-only>true</http-only>
-        </cookie-config>
-		<tracking-mode>COOKIE</tracking-mode>
-	</session-config>
-
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/applicationContext.xml</param-value>
-	</context-param>
-
-	<context-param>
-		<param-name>spring.profiles.active</param-name>
-		<param-value>jpa</param-value>
-	</context-param>
-
-	<filter>
-		<filter-name>encodingFilter</filter-name>
-		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
-		<init-param>
-			<param-name>encoding</param-name>
-			<param-value>UTF-8</param-value>
-		</init-param>
-		<init-param>
-			<param-name>forceEncoding</param-name>
-			<param-value>true</param-value>
-		</init-param>
-	</filter>
-	<filter-mapping>
-		<filter-name>encodingFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<filter>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>springSecurityFilterChain</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<servlet>
-		<servlet-name>idp</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<init-param>
-			<param-name>publishContext</param-name>
-			<param-value>false</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>idp</servlet-name>
-		<url-pattern>/</url-pattern>
-		<url-pattern>/federation</url-pattern>
-		<url-pattern>/federation/up</url-pattern>
-		<url-pattern>/federation/krb</url-pattern>
-		<url-pattern>/federation/clientcert</url-pattern>
-		<url-pattern>/saml</url-pattern>
-		<url-pattern>/saml/up</url-pattern>
-		<url-pattern>/saml/krb</url-pattern>
-		<url-pattern>/saml/clientcert</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<servlet-name>metadata</servlet-name>
-		<servlet-class>org.apache.cxf.fediz.service.idp.MetadataServlet</servlet-class>
-		<init-param>
-			<param-name>realm</param-name>
-			<param-value>${realm-uri}</param-value>
-		</init-param>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>metadata</servlet-name>
-		<url-pattern>/FederationMetadata/2007-06/FederationMetadata.xml</url-pattern>
-		<url-pattern>/metadata/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<servlet-name>CXFServlet</servlet-name>
-		<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>CXFServlet</servlet-name>
-		<url-pattern>/services/*</url-pattern>
-	</servlet-mapping>
-
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-
-	<!-- Uncomment this when using JNDI DataSource -->
-	<!-- The property jpa.platform must be updated in persistence.properties even you use
JNDI Datasource -->
-	<!-- 
-    <resource-ref>
-        <res-ref-name>jdbc/fedizDataSource</res-ref-name>
-        <res-type>javax.sql.DataSource</res-type>
-        <res-auth>Container</res-auth>
-    </resource-ref>
-    -->
-
-</web-app>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/137858bf/services/idp-core/src/main/webapp/resources/images/apache-logo.png
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/webapp/resources/images/apache-logo.png b/services/idp-core/src/main/webapp/resources/images/apache-logo.png
deleted file mode 100644
index 39b040e..0000000
Binary files a/services/idp-core/src/main/webapp/resources/images/apache-logo.png and /dev/null
differ

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/137858bf/services/idp-core/src/main/webapp/resources/swagger/index.html
----------------------------------------------------------------------
diff --git a/services/idp-core/src/main/webapp/resources/swagger/index.html b/services/idp-core/src/main/webapp/resources/swagger/index.html
deleted file mode 100644
index 223cf1e..0000000
--- a/services/idp-core/src/main/webapp/resources/swagger/index.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html>
-<!--
-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.
--->
-<html>
-<head>
-  <meta charset="UTF-8">
-    <!-- <ApacheFediz -->
-    <!--<title>Swagger UI</title>-->
-    <title>Swagger UI - Apache Fediz ${project.version}</title>
-    <!-- </ApacheFediz -->
-  <link rel="icon" type="image/png" href="images/favicon-32x32.png" sizes="32x32" />
-  <link rel="icon" type="image/png" href="images/favicon-16x16.png" sizes="16x16" />
-  <link href='css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
-  <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
-  <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
-  <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
-  <link href='css/print.css' media='print' rel='stylesheet' type='text/css'/>
-  <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
-  <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
-  <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
-  <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
-  <script src='lib/handlebars-2.0.0.js' type='text/javascript'></script>
-  <script src='lib/underscore-min.js' type='text/javascript'></script>
-  <script src='lib/backbone-min.js' type='text/javascript'></script>
-  <script src='swagger-ui.js' type='text/javascript'></script>
-  <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
-  <script src='lib/jsoneditor.min.js' type='text/javascript'></script>
-  <script src='lib/marked.js' type='text/javascript'></script>
-  <script src='lib/swagger-oauth.js' type='text/javascript'></script>
-
-  <!-- Some basic translations -->
-  <!-- <script src='lang/translator.js' type='text/javascript'></script> -->
-  <!-- <script src='lang/ru.js' type='text/javascript'></script> -->
-  <!-- <script src='lang/en.js' type='text/javascript'></script> -->
-
-  <script type="text/javascript">
-    $(function () {
-        // <ApacheFediz>
-        /*var url = window.location.search.match(/url=([^&]+)/);
-      if (url && url.length > 1) {
-        url = decodeURIComponent(url[1]);
-      } else {
-        url = "http://petstore.swagger.io/v2/swagger.json";
-         }*/
-        var url = window.location.href.substring(0, window.location.href.lastIndexOf('/'))
+ "/../services/rs/swagger.json";
-        // </ApacheFediz>
-      // Pre load translate...
-      if(window.SwaggerTranslator) {
-        window.SwaggerTranslator.translate();
-      }
-      window.swaggerUi = new SwaggerUi({
-        url: url,
-        dom_id: "swagger-ui-container",
-        supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
-        onComplete: function(swaggerApi, swaggerUi){
-          if(typeof initOAuth == "function") {
-            initOAuth({
-              clientId: "your-client-id",
-              clientSecret: "your-client-secret-if-required",
-              realm: "your-realms",
-              appName: "your-app-name", 
-              scopeSeparator: ",",
-              additionalQueryStringParams: {}
-            });
-          }
-          if(window.SwaggerTranslator) {
-            window.SwaggerTranslator.translate();
-          }
-          $('pre code').each(function(i, e) {
-            hljs.highlightBlock(e)
-          });
-          addApiKeyAuthorization();
-        },
-        onFailure: function(data) {
-          log("Unable to Load SwaggerUI");
-        },
-        docExpansion: "none",
-        jsonEditor: false,
-        apisSorter: "alpha",
-        defaultModelRendering: 'schema',
-        showRequestHeaders: false
-      });
-        function addApiKeyAuthorization() {
-          // <ApacheFediz>
-          /*var key = encodeURIComponent($('#input_apiKey')[0].value);
-           if (key && key.trim() != "") {
-            var apiKeyAuth = new SwaggerClient.ApiKeyAuthorization("api_key", key, "query");
-            window.swaggerUi.api.clientAuthorizations.add("api_key", apiKeyAuth);
-            log("added key " + key);
-           }*/
-          var username = $('#input_username').val().trim();
-          var password = $('#input_password').val().trim();
-          if (username !== "" && password !== "") {
-            window.swaggerUi.api.clientAuthorizations.add(
-                    "basicAuth", new SwaggerClient.PasswordAuthorization(username, password));
-        }
-          // </ApacheFediz>
-      }
-        // <ApacheFediz>
-        //$('#input_apiKey').change(addApiKeyAuthorization);
-        $("#input_username").blur(function () {
-          addApiKeyAuthorization();
-        });
-        $("#input_password").blur(function () {
-          addApiKeyAuthorization();
-        });
-        // </ApacheFediz>
-      // if you have an apiKey you would like to pre-populate on the page for demonstration
purposes...
-      /*
-        var apiKey = "myApiKeyXXXX123456789";
-        $('#input_apiKey').val(apiKey);
-      */
-      window.swaggerUi.load();
-      function log() {
-        if ('console' in window) {
-          console.log.apply(console, arguments);
-        }
-      }
-  });
-  </script>
-</head>
-
-<body class="swagger-section">
-<div id='header'>
-  <div class="swagger-ui-wrap">
-    <a id="logo" href="http://swagger.io">swagger</a>
-    <form id='api_selector'>
-       <!-- <ApacheFediz -->
-      <!--<div class='input'><input placeholder="http://example.com/api" id="input_baseUrl"
name="baseUrl" type="text"/></div>-->
-      <!--<div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey"
type="text"/></div>-->
-      <!--<div class='input'><a id="explore" href="#" data-sw-translate>Explore</a></div>-->
-          <div class='input'><input placeholder="username" id="input_username" name="username"
type="text"/></div>
-          <div class='input'><input placeholder="password" id="input_password" name="password"
type="password"/></div>
-          <!-- </ApacheFediz -->
-    </form>
-  </div>
-</div>
-
-<div id="message-bar" class="swagger-ui-wrap" data-sw-translate>&nbsp;</div>
-<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
-</body>
-</html>
\ No newline at end of file


Mime
View raw message