KNOX-1081 - Manually remove the picketlink folder because of merge issue
Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/78d35f16 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/78d35f16 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/78d35f16 Branch: refs/heads/master Commit: 78d35f16f84f91985bbbd7582d79f648e4ef76e9 Parents: 8affbc0 Author: Sandeep More <m...@apache.org> Authored: Mon Oct 16 10:55:24 2017 -0400 Committer: Sandeep More <m...@apache.org> Committed: Mon Oct 16 10:55:24 2017 -0400 ---------------------------------------------------------------------- .../gateway/picketlink/PicketlinkMessages.java | 0 .../picketlink/deploy/PicketlinkConf.java | 0 .../PicketlinkFederationProviderContributor.java | 0 .../filter/CaptureOriginalURLFilter.java | 0 .../filter/PicketlinkIdentityAdapter.java | 0 ....gateway.deploy.ProviderDeploymentContributor | 19 ------------------- .../knox/gateway/picketlink/PicketlinkTest.java | 0 7 files changed, 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/78d35f16/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/PicketlinkMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/PicketlinkMessages.java b/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/PicketlinkMessages.java deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/knox/blob/78d35f16/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/deploy/PicketlinkConf.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/deploy/PicketlinkConf.java b/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/deploy/PicketlinkConf.java deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/knox/blob/78d35f16/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/deploy/PicketlinkFederationProviderContributor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/deploy/PicketlinkFederationProviderContributor.java b/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/deploy/PicketlinkFederationProviderContributor.java deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/knox/blob/78d35f16/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/filter/CaptureOriginalURLFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/filter/CaptureOriginalURLFilter.java b/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/filter/CaptureOriginalURLFilter.java deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/knox/blob/78d35f16/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/filter/PicketlinkIdentityAdapter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/filter/PicketlinkIdentityAdapter.java b/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/filter/PicketlinkIdentityAdapter.java deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/knox/blob/78d35f16/gateway-provider-security-picketlink/src/main/resources/META-INF/services/org.apache.knox.gateway.deploy.ProviderDeploymentContributor ---------------------------------------------------------------------- diff --git a/gateway-provider-security-picketlink/src/main/resources/META-INF/services/org.apache.knox.gateway.deploy.ProviderDeploymentContributor b/gateway-provider-security-picketlink/src/main/resources/META-INF/services/org.apache.knox.gateway.deploy.ProviderDeploymentContributor deleted file mode 100644 index 2d6b75c..0000000 --- a/gateway-provider-security-picketlink/src/main/resources/META-INF/services/org.apache.knox.gateway.deploy.ProviderDeploymentContributor +++ /dev/null @@ -1,19 +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. -########################################################################## - -org.apache.knox.gateway.picketlink.deploy.PicketlinkFederationProviderContributor http://git-wip-us.apache.org/repos/asf/knox/blob/78d35f16/gateway-provider-security-picketlink/src/test/java/org/apache/knox/gateway/picketlink/PicketlinkTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-picketlink/src/test/java/org/apache/knox/gateway/picketlink/PicketlinkTest.java b/gateway-provider-security-picketlink/src/test/java/org/apache/knox/gateway/picketlink/PicketlinkTest.java deleted file mode 100644 index e69de29..0000000