You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/01/20 16:05:16 UTC
cxf git commit: Removing file
Repository: cxf
Updated Branches:
refs/heads/master 2e8219cf3 -> 0f2c20ee7
Removing file
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0f2c20ee
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0f2c20ee
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0f2c20ee
Branch: refs/heads/master
Commit: 0f2c20ee72da4c0e28fca97275b0b6b4ec9ac741
Parents: 2e8219c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Jan 20 15:05:06 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Jan 20 15:05:06 2016 +0000
----------------------------------------------------------------------
.../systest/jaxrs/security/oauth2/server.xml | 127 -------------------
1 file changed, 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0f2c20ee/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/server.xml
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/server.xml
deleted file mode 100644
index 1de107b..0000000
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/server.xml
+++ /dev/null
@@ -1,127 +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:http="http://cxf.apache.org/transports/http/configuration"
- xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:cxf="http://cxf.apache.org/core"
- xmlns:jaxrs="http://cxf.apache.org/jaxrs"
- xmlns:util="http://www.springframework.org/schema/util"
- xsi:schemaLocation="http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
- http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
- http://cxf.apache.org/transports/http-jetty/configuration http://cxf.apache.org/schemas/configuration/http-jetty.xsd
- http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
- <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <cxf:bus>
- <cxf:features>
- <cxf:logging/>
- </cxf:features>
- <cxf:properties>
- <entry key="org.apache.cxf.jaxrs.bus.providers" value-ref="busProviders"/>
- </cxf:properties>
- </cxf:bus>
- <!-- providers -->
- <util:list id="busProviders">
- <ref bean="oauthJson"/>
- </util:list>
- <httpj:engine-factory id="port-9095-tls-config">
- <httpj:engine port="${testutil.ports.jaxrs-oauth2}">
- <httpj:tlsServerParameters>
- <sec:keyManagers keyPassword="password">
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/>
- </sec:keyManagers>
- <sec:trustManagers>
- <sec:keyStore type="JKS" password="password" file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
- </sec:trustManagers>
- <sec:clientAuthentication want="true" required="true"/>
- </httpj:tlsServerParameters>
- </httpj:engine>
- </httpj:engine-factory>
- <bean id="dataProvider" class="org.apache.cxf.systest.jaxrs.security.oauth2.common.OAuthDataProviderImpl"/>
- <bean id="samlGrantHandler" class="org.apache.cxf.rs.security.oauth2.grants.saml.Saml2BearerGrantHandler">
- <property name="dataProvider" ref="dataProvider"/>
- </bean>
- <bean id="jwtGrantHandler" class="org.apache.cxf.rs.security.oauth2.grants.jwt.JwtBearerGrantHandler">
- <property name="dataProvider" ref="dataProvider"/>
- </bean>
-
- <bean id="samlAuthHandler" class="org.apache.cxf.rs.security.oauth2.auth.saml.Saml2BearerAuthHandler"/>
- <bean id="jwtAuthHandler" class="org.apache.cxf.rs.security.oauth2.grants.jwt.JwtBearerAuthHandler"/>
-
- <bean id="customGrantHandler" class="org.apache.cxf.systest.jaxrs.security.oauth2.CustomGrantHandler">
- <property name="dataProvider" ref="dataProvider"/>
- </bean>
- <bean id="oauthJson" class="org.apache.cxf.rs.security.oauth2.provider.OAuthJSONProvider"/>
- <bean id="serviceBean" class="org.apache.cxf.rs.security.oauth2.services.AccessTokenService">
- <property name="dataProvider" ref="dataProvider"/>
- <property name="grantHandlers">
- <list>
- <ref bean="samlGrantHandler"/>
- <ref bean="jwtGrantHandler"/>
- <ref bean="customGrantHandler"/>
- </list>
- </property>
- </bean>
- <jaxrs:server address="https://localhost:${testutil.ports.jaxrs-oauth2}/oauth2">
- <jaxrs:serviceBeans>
- <ref bean="serviceBean"/>
- </jaxrs:serviceBeans>
- <jaxrs:properties>
- <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/>
- <entry key="rs.security.keystore.type" value="jks" />
- <entry key="rs.security.keystore.alias" value="alice"/>
- <entry key="rs.security.keystore.password" value="password"/>
- <entry key="rs.security.keystore.file"
- value="org/apache/cxf/systest/jaxrs/security/certs/alice.jks" />
- <entry key="rs.security.signature.algorithm" value="RS256" />
- </jaxrs:properties>
- </jaxrs:server>
- <jaxrs:server address="https://localhost:${testutil.ports.jaxrs-oauth2}/oauth2-auth">
- <jaxrs:serviceBeans>
- <ref bean="serviceBean"/>
- </jaxrs:serviceBeans>
- <jaxrs:providers>
- <ref bean="samlAuthHandler"/>
- </jaxrs:providers>
- <jaxrs:properties>
- <entry key="security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/alice.properties"/>
- </jaxrs:properties>
- </jaxrs:server>
- <jaxrs:server address="https://localhost:${testutil.ports.jaxrs-oauth2}/oauth2-auth-jwt">
- <jaxrs:serviceBeans>
- <ref bean="serviceBean"/>
- </jaxrs:serviceBeans>
- <jaxrs:providers>
- <ref bean="jwtAuthHandler"/>
- </jaxrs:providers>
- <jaxrs:properties>
- <entry key="rs.security.keystore.type" value="jks" />
- <entry key="rs.security.keystore.alias" value="alice"/>
- <entry key="rs.security.keystore.password" value="password"/>
- <entry key="rs.security.keystore.file"
- value="org/apache/cxf/systest/jaxrs/security/certs/alice.jks" />
- <entry key="rs.security.signature.algorithm" value="RS256" />
- </jaxrs:properties>
- </jaxrs:server>
-</beans>