You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2013/09/18 19:59:27 UTC
git commit: Remove debugging now that it isn't failing anymore.
Updated Branches:
refs/heads/master e20669679 -> 249a56e89
Remove debugging now that it isn't failing anymore.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/249a56e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/249a56e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/249a56e8
Branch: refs/heads/master
Commit: 249a56e8900d6e1adffedc63434138cf67fb765f
Parents: e206696
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Wed Sep 18 13:59:21 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Wed Sep 18 13:59:21 2013 -0400
----------------------------------------------------------------------
.../org/apache/hadoop/gateway/GatewayMessages.java | 5 ++++-
.../org/apache/hadoop/gateway/GatewayResources.java | 3 +++
.../hadoop/gateway/deploy/DeploymentFactory.java | 3 +--
.../security/impl/DefaultKeystoreService.java | 13 +++++--------
.../services/security/impl/BaseKeystoreService.java | 14 ++++----------
gateway-test-utils/pom.xml | 5 +++++
.../apache/hadoop/gateway/GatewayFuncTestDriver.java | 2 +-
.../gateway/deploy/DeploymentFactoryFuncTest.java | 1 +
pom.xml | 11 ++++++-----
9 files changed, 30 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/249a56e8/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
index 8718464..76e01ef 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayMessages.java
@@ -270,6 +270,9 @@ public interface GatewayMessages {
@Message( level = MessageLevel.DEBUG, text = "Status Code Returned from Request Dispatch: {0}" )
void dispatchResponseStatusCode(int statusCode);
- @Message( level = MessageLevel.ERROR, text = "Failed to decrypt cipher text for cluster {0}: due to inability to retrieve the password" )
+ @Message( level = MessageLevel.ERROR, text = "Failed to decrypt cipher text for cluster {0}: due to inability to retrieve the password." )
void failedToDecryptCipherForClusterNullPassword(String clusterName);
+
+ @Message( level = MessageLevel.DEBUG, text = "Gateway services have not been initialized." )
+ void gatewayServicesNotInitialized();
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/249a56e8/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayResources.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayResources.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayResources.java
index 1e67c4d..bea4c46 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayResources.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayResources.java
@@ -64,4 +64,7 @@ public interface GatewayResources {
@Resource( text="Provider parameter value is required." )
String providerParameterValueIsRequiredError();
+
+ @Resource( text="Failed to create keystore directory: {0}" )
+ String failedToCreateKeyStoreDirectory( String name );
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/249a56e8/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java
index d5fc51c..01f9663 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java
@@ -175,10 +175,9 @@ public abstract class DeploymentFactory {
wad.createServlet().servletName( servletName ).servletClass( servletClass );
wad.createServletMapping().servletName( servletName ).urlPattern( "/*" );
if (gatewayServices != null) {
-System.out.println( "SERVICES ARE AVAILABLE TO DEPLOYMENT FACTORY" ); //DEBUG
gatewayServices.initializeContribution(context);
} else {
-System.out.println( "NO SERVICES AVAILABLE TO DEPLOYMENT FACTORY" ); //DEBUG
+ log.gatewayServicesNotInitialized();
}
for( String role : providers.keySet() ) {
for( ProviderDeploymentContributor contributor : providers.get( role ) ) {
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/249a56e8/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java
index a10973e..6dd10bb 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java
@@ -18,8 +18,10 @@
package org.apache.hadoop.gateway.services.security.impl;
import org.apache.hadoop.gateway.GatewayMessages;
+import org.apache.hadoop.gateway.GatewayResources;
import org.apache.hadoop.gateway.config.GatewayConfig;
import org.apache.hadoop.gateway.i18n.messages.MessagesFactory;
+import org.apache.hadoop.gateway.i18n.resources.ResourcesFactory;
import org.apache.hadoop.gateway.services.Service;
import org.apache.hadoop.gateway.services.ServiceLifecycleException;
import org.apache.hadoop.gateway.services.security.KeystoreService;
@@ -46,7 +48,8 @@ public class DefaultKeystoreService extends BaseKeystoreService implements Keyst
private static final String CREDENTIALS_SUFFIX = "-credentials.jceks";
private static final String GATEWAY_KEYSTORE = "gateway.jks";
private static GatewayMessages LOG = MessagesFactory.get( GatewayMessages.class );
-
+ private static GatewayResources RES = ResourcesFactory.get( GatewayResources.class );
+
@Override
public void init(GatewayConfig config, Map<String, String> options)
throws ServiceLifecycleException {
@@ -54,23 +57,17 @@ public class DefaultKeystoreService extends BaseKeystoreService implements Keyst
File ksd = new File(this.keyStoreDir);
if (!ksd.exists()) {
if( !ksd.mkdirs() ) {
-System.out.println( "FAILED TO CREATE KEYSTORE DIRECTORY " + ksd.getAbsolutePath() ); //DEBUG
- throw new ServiceLifecycleException( "FAILED TO CREATE KEYSTORE DIRECTORY " + ksd ); //DEBUG
+ throw new ServiceLifecycleException( RES.failedToCreateKeyStoreDirectory( ksd.getAbsolutePath() ) );
}
}
-System.out.println( "USING KEYSTORE DIRECTORY " + ksd.getAbsolutePath() ); //DEBUG
}
@Override
public void start() throws ServiceLifecycleException {
- // TODO Auto-generated method stub
-
}
@Override
public void stop() throws ServiceLifecycleException {
- // TODO Auto-generated method stub
-
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/249a56e8/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java b/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java
index 63f4951..3ea712f 100644
--- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java
+++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java
@@ -109,19 +109,19 @@ public class BaseKeystoreService {
return cert;
}
- protected FileOutputStream createKeyStoreFile( String fileName ) throws IOException { //DEBUG
+ private static FileOutputStream createKeyStoreFile( String fileName ) throws IOException {
File file = new File( fileName );
if( file.exists() ) {
if( file.isDirectory() ) {
- throw new IOException( "EXISTING FILE IS DIRECTORY " + file.getAbsolutePath() );
+ throw new IOException( file.getAbsolutePath() );
} else if( !file.canWrite() ) {
- throw new IOException( "EXISTING FILE IS UNWRITEABLE " + file.getAbsolutePath() );
+ throw new IOException( file.getAbsolutePath() );
}
} else {
File dir = file.getParentFile();
if( !dir.exists() ) {
if( !dir.mkdirs() ) {
- throw new IOException( "FAILED TO CREATE PARENT DIRECTORIES " + file.getAbsolutePath() );
+ throw new IOException( file.getAbsolutePath() );
}
}
}
@@ -130,26 +130,20 @@ public class BaseKeystoreService {
}
protected void createKeystore(String filename, String keystoreType) {
-System.out.println( "CREATING KEYSTORE " + filename + ", TYPE=" + keystoreType ); //DEBUG
try {
FileOutputStream out = createKeyStoreFile( filename );
KeyStore ks = KeyStore.getInstance(keystoreType);
ks.load( null, null );
ks.store( out, masterService.getMasterSecret() );
} catch (KeyStoreException e) {
- e.printStackTrace(); //DEBUG
LOG.failedToCreateKeystore( filename, keystoreType, e );
} catch (NoSuchAlgorithmException e) {
- e.printStackTrace(); //DEBUG
LOG.failedToCreateKeystore( filename, keystoreType, e );
} catch (CertificateException e) {
- e.printStackTrace(); //DEBUG
LOG.failedToCreateKeystore( filename, keystoreType, e );
} catch (FileNotFoundException e) {
- e.printStackTrace(); //DEBUG
LOG.failedToCreateKeystore( filename, keystoreType, e );
} catch (IOException e) {
- e.printStackTrace(); //DEBUG
LOG.failedToCreateKeystore( filename, keystoreType, e );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/249a56e8/gateway-test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test-utils/pom.xml b/gateway-test-utils/pom.xml
index 2a71c3c..12aa002 100644
--- a/gateway-test-utils/pom.xml
+++ b/gateway-test-utils/pom.xml
@@ -91,6 +91,11 @@
<artifactId>jetty-servlet</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/249a56e8/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayFuncTestDriver.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayFuncTestDriver.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayFuncTestDriver.java
index 9c05b56..f6336de 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayFuncTestDriver.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayFuncTestDriver.java
@@ -122,7 +122,7 @@ public class GatewayFuncTestDriver {
}
/**
- * Creates a GATEWAY_HOME, starts a gateway intance and deploys a test topology.
+ * Creates a GATEWAY_HOME, starts a gateway instance and deploys a test topology.
*/
public void setupGateway( GatewayTestConfig config, String cluster, XMLTag topology, boolean use ) throws IOException {
this.useGateway = use;
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/249a56e8/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
index fb58d0d..fea5456 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
@@ -70,6 +70,7 @@ public class DeploymentFactoryFuncTest {
authorizer.setEnabled( true );
topology.addProvider( authorizer );
+ DeploymentFactory.setGatewayServices( null );
WebArchive war = DeploymentFactory.createDeployment( config, topology );
//File dir = new File( System.getProperty( "user.dir" ) );
//File file = war.as( ExplodedExporter.class ).exportExploded( dir, "test-cluster.war" );
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/249a56e8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 022b2d3..4b9e8ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@
<gateway-artifact>knox-incubating</gateway-artifact>
<gateway-version>0.3.0-SNAPSHOT</gateway-version>
<gateway-group>org.apache.hadoop</gateway-group>
+ <jetty-version>8.1.12.v20130726</jetty-version>
</properties>
<licenses>
@@ -428,17 +429,17 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>8.1.7.v20120910</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>8.1.7.v20120910</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>8.1.7.v20120910</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
@@ -449,13 +450,13 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaspi</artifactId>
- <version>8.1.7.v20120910</version>
+ <version>${jetty-version}</version>
</dependency>
-->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>test-jetty-servlet</artifactId>
- <version>8.1.7.v20120910</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>