knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lmc...@apache.org
Subject git commit: Renamed GatewayMessages to fix classpath issue
Date Thu, 20 Mar 2014 14:12:37 GMT
Repository: knox
Updated Branches:
  refs/heads/v0.4.0 35f1cad25 -> d96450eec


Renamed GatewayMessages to fix classpath issue


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/d96450ee
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/d96450ee
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/d96450ee

Branch: refs/heads/v0.4.0
Commit: d96450eec51f7cf1c4427ddca43dc52ae691d77f
Parents: 35f1cad
Author: Larry McCay <lmccay@hortonworks.com>
Authored: Thu Mar 20 09:48:03 2014 -0400
Committer: Larry McCay <lmccay@hortonworks.com>
Committed: Thu Mar 20 10:12:02 2014 -0400

----------------------------------------------------------------------
 .../apache/hadoop/gateway/GatewayMessages.java  | 51 --------------------
 .../apache/hadoop/gateway/GatewayResources.java | 35 --------------
 .../hadoop/gateway/SpiGatewayMessages.java      | 51 ++++++++++++++++++++
 .../hadoop/gateway/SpiGatewayResources.java     | 35 ++++++++++++++
 .../gateway/dispatch/AppCookieManager.java      |  4 +-
 .../gateway/dispatch/HttpClientDispatch.java    |  8 +--
 6 files changed, 92 insertions(+), 92 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/d96450ee/gateway-spi/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java b/gateway-spi/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
deleted file mode 100644
index d416326..0000000
--- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
+++ /dev/null
@@ -1,51 +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.hadoop.gateway;
-
-import org.apache.hadoop.gateway.i18n.messages.Message;
-import org.apache.hadoop.gateway.i18n.messages.MessageLevel;
-import org.apache.hadoop.gateway.i18n.messages.Messages;
-import org.apache.hadoop.gateway.i18n.messages.StackTrace;
-
-import java.net.URI;
-
-
-/**
- *
- */
-@Messages(logger="org.apache.hadoop.gateway")
-public interface GatewayMessages {
-
-  @Message( level = MessageLevel.DEBUG, text = "Dispatch request: {0} {1}" )
-  void dispatchRequest( String method, URI uri );
-  
-  @Message( level = MessageLevel.WARN, text = "Connection exception dispatching request:
{0} {1}" )
-  void dispatchServiceConnectionException( URI uri, @StackTrace(level=MessageLevel.WARN)
Exception e );
-
-  @Message( level = MessageLevel.DEBUG, text = "Dispatch response status: {0}" )
-  void dispatchResponseStatusCode(int statusCode);
-
-  @Message( level = MessageLevel.DEBUG, text = "Dispatch response status: {0}, Location:
{1}" )
-  void dispatchResponseCreatedStatusCode( int statusCode, String location );
-
-  @Message( level = MessageLevel.DEBUG, text = "Successful Knox->Hadoop SPNegotiation
authentication for URL: {0}" )
-  void successfulSPNegoAuthn(String uri);
-  
-  @Message( level = MessageLevel.ERROR, text = "Failed Knox->Hadoop SPNegotiation authentication
for URL: {0}" )
-  void failedSPNegoAuthn(String uri);
-}

http://git-wip-us.apache.org/repos/asf/knox/blob/d96450ee/gateway-spi/src/main/java/org/apache/hadoop/gateway/GatewayResources.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/GatewayResources.java b/gateway-spi/src/main/java/org/apache/hadoop/gateway/GatewayResources.java
deleted file mode 100644
index 3d9c514..0000000
--- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/GatewayResources.java
+++ /dev/null
@@ -1,35 +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.hadoop.gateway;
-
-import org.apache.hadoop.gateway.i18n.resources.Resource;
-import org.apache.hadoop.gateway.i18n.resources.Resources;
-
-/**
- *
- */
-@Resources
-public interface GatewayResources {
-
-  @Resource( text="Service connectivity error." )
-  String dispatchConnectionError();
-
-  @Resource( text="Response status: {0}" )
-  String responseStatus( int status );
-
-}

http://git-wip-us.apache.org/repos/asf/knox/blob/d96450ee/gateway-spi/src/main/java/org/apache/hadoop/gateway/SpiGatewayMessages.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/SpiGatewayMessages.java b/gateway-spi/src/main/java/org/apache/hadoop/gateway/SpiGatewayMessages.java
new file mode 100644
index 0000000..9b575e3
--- /dev/null
+++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/SpiGatewayMessages.java
@@ -0,0 +1,51 @@
+/**
+ * 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.hadoop.gateway;
+
+import org.apache.hadoop.gateway.i18n.messages.Message;
+import org.apache.hadoop.gateway.i18n.messages.MessageLevel;
+import org.apache.hadoop.gateway.i18n.messages.Messages;
+import org.apache.hadoop.gateway.i18n.messages.StackTrace;
+
+import java.net.URI;
+
+
+/**
+ *
+ */
+@Messages(logger="org.apache.hadoop.gateway")
+public interface SpiGatewayMessages {
+
+  @Message( level = MessageLevel.DEBUG, text = "Dispatch request: {0} {1}" )
+  void dispatchRequest( String method, URI uri );
+  
+  @Message( level = MessageLevel.WARN, text = "Connection exception dispatching request:
{0} {1}" )
+  void dispatchServiceConnectionException( URI uri, @StackTrace(level=MessageLevel.WARN)
Exception e );
+
+  @Message( level = MessageLevel.DEBUG, text = "Dispatch response status: {0}" )
+  void dispatchResponseStatusCode(int statusCode);
+
+  @Message( level = MessageLevel.DEBUG, text = "Dispatch response status: {0}, Location:
{1}" )
+  void dispatchResponseCreatedStatusCode( int statusCode, String location );
+
+  @Message( level = MessageLevel.DEBUG, text = "Successful Knox->Hadoop SPNegotiation
authentication for URL: {0}" )
+  void successfulSPNegoAuthn(String uri);
+  
+  @Message( level = MessageLevel.ERROR, text = "Failed Knox->Hadoop SPNegotiation authentication
for URL: {0}" )
+  void failedSPNegoAuthn(String uri);
+}

http://git-wip-us.apache.org/repos/asf/knox/blob/d96450ee/gateway-spi/src/main/java/org/apache/hadoop/gateway/SpiGatewayResources.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/SpiGatewayResources.java
b/gateway-spi/src/main/java/org/apache/hadoop/gateway/SpiGatewayResources.java
new file mode 100644
index 0000000..96f5463
--- /dev/null
+++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/SpiGatewayResources.java
@@ -0,0 +1,35 @@
+/**
+ * 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.hadoop.gateway;
+
+import org.apache.hadoop.gateway.i18n.resources.Resource;
+import org.apache.hadoop.gateway.i18n.resources.Resources;
+
+/**
+ *
+ */
+@Resources
+public interface SpiGatewayResources {
+
+  @Resource( text="Service connectivity error." )
+  String dispatchConnectionError();
+
+  @Resource( text="Response status: {0}" )
+  String responseStatus( int status );
+
+}

http://git-wip-us.apache.org/repos/asf/knox/blob/d96450ee/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/AppCookieManager.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/AppCookieManager.java
b/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/AppCookieManager.java
index a316f3c..f8b687c 100644
--- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/AppCookieManager.java
+++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/AppCookieManager.java
@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.net.URI;
 import java.security.Principal;
 
-import org.apache.hadoop.gateway.GatewayMessages;
+import org.apache.hadoop.gateway.SpiGatewayMessages;
 import org.apache.hadoop.gateway.audit.api.Action;
 import org.apache.hadoop.gateway.audit.api.ActionOutcome;
 import org.apache.hadoop.gateway.audit.api.AuditServiceFactory;
@@ -57,7 +57,7 @@ public class AppCookieManager {
   private static final String HADOOP_AUTH_EQ = "hadoop.auth=";
   private static final String SET_COOKIE = "Set-Cookie";
 
-  private static GatewayMessages LOG = MessagesFactory.get(GatewayMessages.class);
+  private static SpiGatewayMessages LOG = MessagesFactory.get(SpiGatewayMessages.class);
   private static Auditor auditor = AuditServiceFactory.getAuditService().getAuditor( AuditConstants.DEFAULT_AUDITOR_NAME,
           AuditConstants.KNOX_SERVICE_NAME, AuditConstants.KNOX_COMPONENT_NAME );
   private static final EmptyJaasCredentials EMPTY_JAAS_CREDENTIALS = new EmptyJaasCredentials();

http://git-wip-us.apache.org/repos/asf/knox/blob/d96450ee/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/HttpClientDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/HttpClientDispatch.java
b/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/HttpClientDispatch.java
index ee56d28..a85d880 100644
--- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/HttpClientDispatch.java
+++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/HttpClientDispatch.java
@@ -27,8 +27,8 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.hadoop.gateway.GatewayMessages;
-import org.apache.hadoop.gateway.GatewayResources;
+import org.apache.hadoop.gateway.SpiGatewayMessages;
+import org.apache.hadoop.gateway.SpiGatewayResources;
 import org.apache.hadoop.gateway.audit.api.Action;
 import org.apache.hadoop.gateway.audit.api.ActionOutcome;
 import org.apache.hadoop.gateway.audit.api.AuditServiceFactory;
@@ -70,8 +70,8 @@ public class HttpClientDispatch extends AbstractGatewayDispatch {
   protected static final String WWW_AUTHENTICATE = "WWW-Authenticate";
   protected static final String NEGOTIATE = "Negotiate";
 
-  protected static GatewayMessages LOG = MessagesFactory.get( GatewayMessages.class );
-  protected static GatewayResources RES = ResourcesFactory.get( GatewayResources.class );
+  protected static SpiGatewayMessages LOG = MessagesFactory.get( SpiGatewayMessages.class
);
+  protected static SpiGatewayResources RES = ResourcesFactory.get( SpiGatewayResources.class
);
   protected static Auditor auditor = AuditServiceFactory.getAuditService().getAuditor( AuditConstants.DEFAULT_AUDITOR_NAME,
           AuditConstants.KNOX_SERVICE_NAME, AuditConstants.KNOX_COMPONENT_NAME );
   private static final int DEFAULT_REPLAY_BUFFER_SIZE =  4 * 1024; // 4K


Mime
View raw message