Repository: knox Updated Branches: refs/heads/v1.2.0 9eee807d2 -> f955c0a91
KNOX-1651 - Cleanup *IdentityAsserterMessages interfaces Signed-off-by: Kevin Risden <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/f955c0a9 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/f955c0a9 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/f955c0a9 Branch: refs/heads/v1.2.0 Commit: f955c0a91de8f9e044aa2d4af95c56a236591f61 Parents: 9eee807 Author: Kevin Risden <[email protected]> Authored: Tue Dec 4 10:45:35 2018 -0500 Committer: Kevin Risden <[email protected]> Committed: Tue Dec 4 11:24:01 2018 -0500 ---------------------------------------------------------------------- CHANGES | 1 + .../knox/gateway/IdentityAsserterMessages.java | 5 ---- .../gateway/ConcatIdentityAsserterMessages.java | 31 -------------------- .../knox/gateway/IdentityAsserterMessages.java | 31 -------------------- 4 files changed, 1 insertion(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/f955c0a9/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 8f53383..4cd1162 100644 --- a/CHANGES +++ b/CHANGES @@ -98,6 +98,7 @@ Release Notes - Apache Knox - Version 1.2.0 * [KNOX-1616] - Fix portmapping with Jetty 9.4 * [KNOX-1639] - java.lang.IllegalStateException: No org.apache.tomcat.InstanceManager set in ServletContext * [KNOX-1645] - Improve JSESSIONID handling + * [KNOX-1651] - Cleanup IdentityAsserterMessages interfaces ** Sub-task * [KNOX-1449] - Ensure all pom.xml files have same header http://git-wip-us.apache.org/repos/asf/knox/blob/f955c0a9/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java index f72e697..0aee0da 100644 --- a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java +++ b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java @@ -20,14 +20,9 @@ package org.apache.knox.gateway; import org.apache.knox.gateway.i18n.messages.Message; import org.apache.knox.gateway.i18n.messages.MessageLevel; import org.apache.knox.gateway.i18n.messages.Messages; -import org.apache.knox.gateway.i18n.messages.StackTrace; @Messages(logger="org.apache.knox.gateway") public interface IdentityAsserterMessages { - - @Message( level = MessageLevel.WARN, text = "Skipping unencodable parameter {0}={1}, {2}: {3}" ) - void skippingUnencodableParameter( String name, String value, String encoding, @StackTrace( level = MessageLevel.DEBUG ) Exception e ); - @Message( level = MessageLevel.ERROR, text = "Required subject/identity not available. Check authentication/federation provider for proper configuration." ) void subjectNotAvailable(); } http://git-wip-us.apache.org/repos/asf/knox/blob/f955c0a9/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/ConcatIdentityAsserterMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/ConcatIdentityAsserterMessages.java b/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/ConcatIdentityAsserterMessages.java deleted file mode 100644 index bde7dd7..0000000 --- a/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/ConcatIdentityAsserterMessages.java +++ /dev/null @@ -1,31 +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. - */ -package org.apache.knox.gateway; - -import org.apache.knox.gateway.i18n.messages.Message; -import org.apache.knox.gateway.i18n.messages.MessageLevel; -import org.apache.knox.gateway.i18n.messages.Messages; -import org.apache.knox.gateway.i18n.messages.StackTrace; - -@Messages(logger="org.apache.knox.gateway") -public interface ConcatIdentityAsserterMessages { - - @Message( level = MessageLevel.WARN, text = "Skipping unencodable parameter {0}={1}, {2}: {3}" ) - void skippingUnencodableParameter( String name, String value, String encoding, @StackTrace( level = MessageLevel.DEBUG ) Exception e ); - -} http://git-wip-us.apache.org/repos/asf/knox/blob/f955c0a9/gateway-provider-identity-assertion-pseudo/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-pseudo/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java b/gateway-provider-identity-assertion-pseudo/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java deleted file mode 100644 index 451742d..0000000 --- a/gateway-provider-identity-assertion-pseudo/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java +++ /dev/null @@ -1,31 +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. - */ -package org.apache.knox.gateway; - -import org.apache.knox.gateway.i18n.messages.Message; -import org.apache.knox.gateway.i18n.messages.MessageLevel; -import org.apache.knox.gateway.i18n.messages.Messages; -import org.apache.knox.gateway.i18n.messages.StackTrace; - -@Messages(logger="org.apache.knox.gateway") -public interface IdentityAsserterMessages { - - @Message( level = MessageLevel.WARN, text = "Skipping unencodable parameter {0}={1}, {2}: {3}" ) - void skippingUnencodableParameter( String name, String value, String encoding, @StackTrace( level = MessageLevel.DEBUG ) Exception e ); - -}
