knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmin...@apache.org
Subject knox git commit: [KNOX-652] - Remove hsso-release module from build
Date Thu, 21 Jan 2016 20:11:49 GMT
Repository: knox
Updated Branches:
  refs/heads/master f95528434 -> 48b92898c


[KNOX-652] - Remove hsso-release module from build


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

Branch: refs/heads/master
Commit: 48b92898c0e59f4f943a97742facf67fa081d3d9
Parents: f955284
Author: Kevin Minder <kevin.minder@hortonworks.com>
Authored: Thu Jan 21 15:11:11 2016 -0500
Committer: Kevin Minder <kevin.minder@hortonworks.com>
Committed: Thu Jan 21 15:11:11 2016 -0500

----------------------------------------------------------------------
 CHANGES                                         |   2 +-
 gateway-release/src/assembly.xml                |   2 -
 .../gateway/services/HssoGatewayServices.java   | 180 -------------
 hsso-release/home/bin/knox.sh                   | 265 -------------------
 hsso-release/home/conf/README                   |   1 -
 hsso-release/home/conf/gateway-site.xml         |  39 ---
 hsso-release/home/conf/log4j.properties         |  29 --
 hsso-release/home/conf/users.ldif               |  36 ---
 hsso-release/home/deployments/BASIC.xml         |  56 ----
 hsso-release/home/deployments/README            |   1 -
 hsso-release/home/deployments/sample.xml        |  54 ----
 hsso-release/home/deployments/token.xml         |  37 ---
 hsso-release/home/ext/README                    |   1 -
 hsso-release/home/lib/README                    |   1 -
 hsso-release/home/templates/topology.xml        |  82 ------
 hsso-release/home/templates/users.ldif          |  36 ---
 .../home/templates/workflow-configuration.xml   |  47 ----
 .../home/templates/workflow-definition.xml      |  36 ---
 hsso-release/pom.xml                            | 185 -------------
 hsso-release/src/assembly.xml                   |  98 -------
 ...ache.hadoop.gateway.services.GatewayServices |  20 --
 pom.xml                                         |   8 +-
 22 files changed, 2 insertions(+), 1214 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 7cfc6db..c6aa3c1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
 ------------------------------------------------------------------------------
-Release Notes - Apache Knox - Version 0.7.0
+Release Notes - Apache Knox - Version 0.8.0
 ------------------------------------------------------------------------------
 ** New Feature
 ** Improvement

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/gateway-release/src/assembly.xml
----------------------------------------------------------------------
diff --git a/gateway-release/src/assembly.xml b/gateway-release/src/assembly.xml
index a1fafa3..e196c7b 100644
--- a/gateway-release/src/assembly.xml
+++ b/gateway-release/src/assembly.xml
@@ -75,7 +75,6 @@
             <scope>runtime</scope>
             <excludes>
                 <exclude>${gateway-group}:gateway-*</exclude>
-                <!-- exclude>${gateway-group}:hsso-*</exclude -->
                 <exclude>${gateway-group}:hadoop-examples</exclude>
             </excludes>
         </dependencySet>
@@ -83,7 +82,6 @@
             <outputDirectory>lib</outputDirectory>
             <includes>
                 <include>${gateway-group}:gateway-*</include>
-                <!-- include>${gateway-group}:hsso-*</include -->
                 <!-- include>${gateway-group}:gateway-release-*</include -->
             </includes>
             <excludes>

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/gateway-server/src/main/java/org/apache/hadoop/gateway/services/HssoGatewayServices.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/HssoGatewayServices.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/HssoGatewayServices.java
deleted file mode 100644
index e006dae..0000000
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/HssoGatewayServices.java
+++ /dev/null
@@ -1,180 +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.services;
-
-import org.apache.hadoop.gateway.GatewayMessages;
-import org.apache.hadoop.gateway.config.GatewayConfig;
-import org.apache.hadoop.gateway.deploy.DeploymentContext;
-import org.apache.hadoop.gateway.descriptor.FilterParamDescriptor;
-import org.apache.hadoop.gateway.descriptor.ResourceDescriptor;
-import org.apache.hadoop.gateway.i18n.messages.MessagesFactory;
-import org.apache.hadoop.gateway.services.hostmap.impl.DefaultHostMapperService;
-import org.apache.hadoop.gateway.services.registry.impl.DefaultServiceRegistryService;
-import org.apache.hadoop.gateway.services.security.KeystoreServiceException;
-import org.apache.hadoop.gateway.services.security.SSLService;
-import org.apache.hadoop.gateway.services.security.impl.DefaultAliasService;
-import org.apache.hadoop.gateway.services.security.impl.DefaultCryptoService;
-import org.apache.hadoop.gateway.services.security.impl.DefaultKeystoreService;
-import org.apache.hadoop.gateway.services.security.impl.DefaultMasterService;
-import org.apache.hadoop.gateway.services.security.impl.JettySSLService;
-import org.apache.hadoop.gateway.services.token.impl.DefaultTokenAuthorityService;
-import org.apache.hadoop.gateway.topology.Provider;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class HssoGatewayServices implements GatewayServices {
-
-  private static GatewayMessages log = MessagesFactory.get( GatewayMessages.class );
-
-  private Map<String,Service> services = new HashMap<String, Service>();
-  private DefaultMasterService ms = null;
-  private DefaultKeystoreService ks = null;
-
-  public HssoGatewayServices() {
-    super();
-  }
-
-  public void init(GatewayConfig config, Map<String,String> options) throws ServiceLifecycleException {
-    ms = new DefaultMasterService();
-    ms.init(config, options);
-
-    ks = new DefaultKeystoreService();
-    ks.setMasterService(ms);
-    ks.init(config, options);
-    
-    DefaultAliasService alias = new DefaultAliasService();
-    alias.setKeystoreService(ks);
-    alias.init(config, options);
-    services.put(ALIAS_SERVICE, alias);
-
-    DefaultCryptoService crypto = new DefaultCryptoService();
-    crypto.setKeystoreService(ks);
-    crypto.setAliasService(alias);
-    crypto.init(config, options);
-    services.put(CRYPTO_SERVICE, crypto);
-    
-    DefaultTokenAuthorityService ts = new DefaultTokenAuthorityService();
-    ts.setAliasService(alias);
-    ts.setKeystoreService(ks);
-    ts.init(config, options);
-    // prolly should not allow the token service to be looked up?
-    services.put(TOKEN_SERVICE, ts);
-    
-    DefaultServiceRegistryService sr = new DefaultServiceRegistryService();
-    sr.setCryptoService(crypto);
-    sr.init(config, options);
-    services.put(SERVICE_REGISTRY_SERVICE, sr);
-    
-    JettySSLService ssl = new JettySSLService();
-    ssl.setAliasService(alias);
-    ssl.setKeystoreService(ks);
-    ssl.setMasterService(ms);
-    ssl.init(config, options);
-    services.put(SSL_SERVICE, ssl);
-    
-    DefaultHostMapperService hm = new DefaultHostMapperService();
-    hm.init( config, options );
-    services.put( HOST_MAPPING_SERVICE, hm );
-  }
-  
-  public void start() throws ServiceLifecycleException {
-    ms.start();
-
-    ks.start();
-
-    DefaultAliasService alias = (DefaultAliasService) services.get(ALIAS_SERVICE);
-    alias.start();
-
-    SSLService ssl = (SSLService) services.get(SSL_SERVICE);
-    ssl.start();
-  }
-
-  public void stop() throws ServiceLifecycleException {
-    ms.stop();
-
-    ks.stop();
-
-    DefaultAliasService alias = (DefaultAliasService) services.get(ALIAS_SERVICE);
-    alias.stop();
-
-    SSLService ssl = (SSLService) services.get(SSL_SERVICE);
-    ssl.stop();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.apache.hadoop.gateway.GatewayServices#getServiceNames()
-   */
-  @Override
-  public Collection<String> getServiceNames() {
-    return services.keySet();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.apache.hadoop.gateway.GatewayServices#getService(java.lang.String)
-   */
-  @Override
-  public <T> T getService(String serviceName) {
-    return (T)services.get( serviceName );
-  }
-
-  @Override
-  public String getRole() {
-    return "Services";
-  }
-
-  @Override
-  public String getName() {
-    return "GatewayServices";
-  }
-
-  @Override
-  public void initializeContribution(DeploymentContext context) {
-    // setup credential store as appropriate
-    String clusterName = context.getTopology().getName();
-    try {
-      if (!ks.isCredentialStoreForClusterAvailable(clusterName)) {
-        log.creatingCredentialStoreForCluster(clusterName);
-        ks.createCredentialStoreForCluster(clusterName);
-      }
-      else {
-        log.credentialStoreForClusterFoundNotCreating(clusterName);
-      }
-    } catch (KeystoreServiceException e) {
-      throw new RuntimeException("Credential store was found but was unable to be loaded - the provided (or persisted) master secret may not match the password for the credential store.", e);
-    }
-  }
-
-  @Override
-  public void contributeProvider(DeploymentContext context, Provider provider) {
-  }
-
-  @Override
-  public void contributeFilter(DeploymentContext context, Provider provider,
-      org.apache.hadoop.gateway.topology.Service service,
-      ResourceDescriptor resource, List<FilterParamDescriptor> params) {
-  }
-
-  @Override
-  public void finalizeContribution(DeploymentContext context) {
-    // Tell the provider the location of the descriptor.
-    context.getWebAppDescriptor().createListener().listenerClass( GatewayServicesContextListener.class.getName() );
-  }
-}

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/bin/knox.sh
----------------------------------------------------------------------
diff --git a/hsso-release/home/bin/knox.sh b/hsso-release/home/bin/knox.sh
deleted file mode 100644
index 0c97e74..0000000
--- a/hsso-release/home/bin/knox.sh
+++ /dev/null
@@ -1,265 +0,0 @@
-#!/bin/sh
-
-#
-#  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.
-#
-
-#Knox PID
-PID=0
-
-#start, stop, status, clean or setup
-KNOX_LAUNCH_COMMAND=$1
-
-#User Name for setup parameter
-KNOX_LAUNCH_USER=$2
-
-#start/stop script location
-KNOX_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-#App name
-KNOX_NAME=knox
-
-#The Knox's jar name
-KNOX_JAR="$KNOX_SCRIPT_DIR/server.jar"
-
-#Name of PID file
-PID_DIR="/var/run/$KNOX_NAME"
-PID_FILE="$PID_DIR/$KNOX_NAME.pid"
-
-#Name of LOG/OUT/ERR file
-LOG_DIR="/var/log/$KNOX_NAME"
-OUT_FILE="$LOG_DIR/$KNOX_NAME.out"
-ERR_FILE="$LOG_DIR/$KNOX_NAME.err"
-
-#The max time to wait
-MAX_WAIT_TIME=10
-
-function main {
-   case "$1" in
-      start)  
-         knoxStart
-         ;;
-      stop)   
-         knoxStop
-         ;;
-      status) 
-         knoxStatus
-         ;;
-      clean) 
-         knoxClean
-         ;;
-      setup) 
-         setupEnv $KNOX_LAUNCH_USER
-         ;;
-      help)
-         printHelp
-         ;;
-      *)
-         printf "Usage: $0 {start|stop|status|clean|setup [USER_NAME]}\n"
-         ;;
-   esac
-}
-
-function knoxStart {
-   createLogFiles
-
-   getPID
-   if [ $? -eq 0 ]; then
-     printf "Knox is already running with PID=$PID.\n"
-     return 0
-   fi
-  
-   printf "Starting Knox "
-   
-   rm -f $PID_FILE
-
-   nohup java -jar $KNOX_JAR >>$OUT_FILE 2>>$ERR_FILE & printf $!>$PID_FILE || return 1
-   
-   getPID
-   knoxIsRunning $PID
-   if [ $? -ne 1 ]; then
-      printf "failed.\n"
-      return 1
-   fi
-
-   printf "succeed with PID=$PID.\n"
-   return 0
-}
-
-function knoxStop {
-   getPID
-   knoxIsRunning $PID
-   if [ $? -eq 0 ]; then
-     printf "Knox is not running.\n"
-     return 0
-   fi
-  
-   printf "Stopping Knox [$PID] "
-   knoxKill $PID >>$OUT_FILE 2>>$ERR_FILE 
-
-   if [ $? -ne 0 ]; then 
-     printf "failed. \n"
-     return 1
-   else
-     rm -f $PID_FILE
-     printf "succeed.\n"
-     return 0
-   fi
-}
-
-function knoxStatus {
-   printf "Knox "
-   getPID
-   if [ $? -eq 1 ]; then
-     printf "is not running. No pid file found.\n"
-     return 0
-   fi
-
-   knoxIsRunning $PID
-   if [ $? -eq 1 ]; then
-     printf "is running with PID=$PID.\n"
-     return 1
-   else
-     printf "is not running.\n"
-     return 0
-   fi
-}
-
-# Removed the Knox PID file if Knox is not run
-function knoxClean {
-   getPID
-   knoxIsRunning $PID
-   if [ $? -eq 0 ]; then 
-     deleteLogFiles
-     return 0
-   else
-     printf "Can't clean files the Knox is run with PID=$PID.\n" 
-     return 1    
-   fi
-}
-
-# Returns 0 if the Knox is running and sets the $PID variable.
-function getPID {
-   if [ ! -f $PID_FILE ]; then
-     PID=0
-     return 1
-   fi
-   
-   PID="$(<$PID_FILE)"
-   return 0
-}
-
-function knoxIsRunning {
-   if [ $1 -eq 0 ]; then return 0; fi
-
-   ps -p $1 > /dev/null
-
-   if [ $? -eq 1 ]; then
-     return 0
-   else
-     return 1
-   fi
-}
-
-function knoxKill {
-   local localPID=$1
-   kill $localPID || return 1
-   for ((i=0; i<MAX_WAIT_TIME*10; i++)); do
-      knoxIsRunning $localPID
-      if [ $? -eq 0 ]; then return 0; fi
-      sleep 0.1
-   done   
-
-   kill -s KILL $localPID || return 1
-   for ((i=0; i<MAX_WAIT_TIME*10; i++)); do
-      knoxIsRunning $localPID
-      if [ $? -eq 0 ]; then return 0; fi
-      sleep 0.1
-   done
-
-   return 1
-}
-
-function createLogFiles {
-   if [ ! -f "$OUT_FILE" ]; then touch $OUT_FILE; fi
-   if [ ! -f "$ERR_FILE" ]; then touch $ERR_FILE; fi   
-}
-
-function deleteLogFiles {
-     rm -f $PID_FILE
-     printf "Removed the Knox PID file: $PID_FILE.\n"
-     
-     rm -f $OUT_FILE
-     printf "Removed the Knox OUT file: $OUT_FILE.\n"
-     
-     rm -f $ERR_FILE
-     printf "Removed the Knox ERR file: $ERR_FILE.\n"  
-}
-
-function setDirPermission {
-   local dirName=$1
-   local userName=$2
-
-   if [ ! -d "$dirName" ]; then mkdir -p $dirName; fi
-   if [ $? -ne 0 ]; then
-      printf "Can't access or create \"$dirName\" folder.\n"
-      return 1
-   fi
-
-   chown -f $userName $dirName
-   if [ $? -ne 0 ]; then
-      printf "Can't change owner of \"$dirName\" folder to \"$userName\" user.\n" 
-      return 1
-   fi
-
-   chmod o=rwx $dirName 
-   if [ $? -ne 0 ]; then
-      printf "Can't grant rwx permission to \"$userName\" user on \"$dirName\"\n" 
-      return 1
-   fi
-
-   return 0
-}
-
-function setupEnv {
-   local userName=$1
-   
-   if [ -z $userName ]; then 
-      printf "Empty user name is not allowed. Parameters: setup [USER_NAME]\n"
-      return 1
-   fi
-
-   id -u $1 >/dev/null 2>&1
-   if [ $? -eq 1 ]; then
-      printf "\"$userName\" is not valid user name. Parameters: setup [USER_NAME]\n"
-      return 1
-   fi
-
-   setDirPermission $PID_DIR $userName
-   setDirPermission $LOG_DIR $userName
-
-   java -jar $KNOX_JAR -persist-master -nostart
-
-   return 0
-}
-
-function printHelp {
-   java -jar $KNOX_JAR -help
-   return 0
-}
-
-#Starting main
-main $KNOX_LAUNCH_COMMAND

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/conf/README
----------------------------------------------------------------------
diff --git a/hsso-release/home/conf/README b/hsso-release/home/conf/README
deleted file mode 100644
index 68359c7..0000000
--- a/hsso-release/home/conf/README
+++ /dev/null
@@ -1 +0,0 @@
-THIS IS THE DIRECTORY WHERE YOU PLACE COPY OR SAVE THE gateway-site.xml and users.ldif FILE
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/conf/gateway-site.xml
----------------------------------------------------------------------
diff --git a/hsso-release/home/conf/gateway-site.xml b/hsso-release/home/conf/gateway-site.xml
deleted file mode 100644
index 76eaedc..0000000
--- a/hsso-release/home/conf/gateway-site.xml
+++ /dev/null
@@ -1,39 +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.
--->
-<configuration>
-
-    <property>
-        <name>gateway.port</name>
-        <value>8443</value>
-        <description>The HTTP port for the Gateway.</description>
-    </property>
-
-    <property>
-        <name>gateway.path</name>
-        <value>gateway</value>
-        <description>The default context path for the gateway.</description>
-    </property>
-
-    <property>
-        <name>gateway.gateway.conf.dir</name>
-        <value>deployments</value>
-        <description>The directory within GATEWAY_HOME that contains gateway topology files and deployments.</description>
-    </property>
-
-</configuration>

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/hsso-release/home/conf/log4j.properties b/hsso-release/home/conf/log4j.properties
deleted file mode 100644
index ccde8c4..0000000
--- a/hsso-release/home/conf/log4j.properties
+++ /dev/null
@@ -1,29 +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.
-
-log4j.rootLogger=ERROR, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
-
-log4j.logger.org.apache.hadoop.gateway=INFO
-
-#log4j.logger.org.eclipse.jetty=ERROR
-#log4j.logger.org.apache.shiro=DEBUG
-#log4j.logger.org.apache.http=DEBUG
-#log4j.logger.org.apache.http.client=DEBUG
-#log4j.logger.org.apache.http.wire=DEBUG
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/conf/users.ldif
----------------------------------------------------------------------
diff --git a/hsso-release/home/conf/users.ldif b/hsso-release/home/conf/users.ldif
deleted file mode 100644
index 55c311e..0000000
--- a/hsso-release/home/conf/users.ldif
+++ /dev/null
@@ -1,36 +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.
-
-version: 1
-
-# entry for a sample people container
-# please replace with site specific values
-dn: ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:organizationalUnit
-ou: people
-
-# entry for a sample end user
-# please replace with site specific values
-dn: uid=guest,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: Guest
-sn: User
-uid: gest
-userPassword:guest-password

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/deployments/BASIC.xml
----------------------------------------------------------------------
diff --git a/hsso-release/home/deployments/BASIC.xml b/hsso-release/home/deployments/BASIC.xml
deleted file mode 100644
index 6d50700..0000000
--- a/hsso-release/home/deployments/BASIC.xml
+++ /dev/null
@@ -1,56 +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.
--->
-<topology>
-
-    <gateway>
-        <provider>
-            <role>authentication</role>
-            <enabled>true</enabled>
-            <param>
-                <name>main.ldapRealm</name>
-                <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm</value>
-            </param>
-            <param>
-                <name>main.ldapRealm.userDnTemplate</name>
-                <value>uid={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
-            </param>
-            <param>
-                <name>main.ldapRealm.contextFactory.url</name>
-                <value>ldap://localhost:33389</value>
-            </param>
-            <param>
-                <name>main.ldapRealm.contextFactory.authenticationMechanism</name>
-                <value>simple</value>
-            </param>
-            <param>
-                <name>urls./**</name>
-                <value>authcBasic</value>
-            </param>
-        </provider>
-		<provider>
-			<role>identity-assertion</role>
-			<enabled>true</enabled>
-			<name>JWTAuthCodeAsserter</name>
-		</provider>
-    </gateway>
-
-    <service>
-        <role>AS</role>
-        <url>https://127.0.0.1:8443/hadoop/BASIC/authserver/api/v1/authenticate</url>
-    </service>
-</topology>

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/deployments/README
----------------------------------------------------------------------
diff --git a/hsso-release/home/deployments/README b/hsso-release/home/deployments/README
deleted file mode 100644
index 6588a11..0000000
--- a/hsso-release/home/deployments/README
+++ /dev/null
@@ -1 +0,0 @@
-THIS IS THE DIRECTORY WHERE YOU COPY OR SAVE CLUSTER TOPOLOGY DEPLOYMENT DESCRIPTOR FILES
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/deployments/sample.xml
----------------------------------------------------------------------
diff --git a/hsso-release/home/deployments/sample.xml b/hsso-release/home/deployments/sample.xml
deleted file mode 100644
index 474a45c..0000000
--- a/hsso-release/home/deployments/sample.xml
+++ /dev/null
@@ -1,54 +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.
--->
-<topology>
-
-    <gateway>
-        <provider>
-            <role>federation</role>
-            <enabled>true</enabled>
-            <name>AccessTokenProvider</name>
-        </provider>
-        <provider>
-            <role>identity-assertion</role>
-            <enabled>true</enabled>
-            <name>Default</name>
-        </provider>
-    </gateway>
-
-    <service>
-        <role>WEBHDFS</role>
-        <url>http://localhost:50070/webhdfs</url>
-    </service>
-    <service>
-        <role>WEBHCAT</role>
-        <url>http://localhost:50111/templeton</url>
-    </service>
-    <service>
-        <role>OOZIE</role>
-        <url>http://localhost:11000/oozie</url>
-    </service>
-    <service>
-        <role>WEBHBASE</role>
-        <url>http://localhost:60080</url>
-    </service>
-    <service>
-        <role>HIVE</role>
-        <url>http://localhost:10000</url>
-    </service>
-
-</topology>

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/deployments/token.xml
----------------------------------------------------------------------
diff --git a/hsso-release/home/deployments/token.xml b/hsso-release/home/deployments/token.xml
deleted file mode 100644
index 5d972a5..0000000
--- a/hsso-release/home/deployments/token.xml
+++ /dev/null
@@ -1,37 +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.
--->
-<topology>
-
-    <gateway>
-        <provider>
-            <role>federation</role>
-            <enabled>true</enabled>
-			<name>JWTProvider</name>
-        </provider>
-		<provider>
-			<role>identity-assertion</role>
-			<enabled>true</enabled>
-			<name>JWTAccessTokenAsserter</name>
-		</provider>
-    </gateway>
-
-    <service>
-        <role>TGS</role>
-        <url>https://127.0.0.1:8443/hadoop/token/tgs/api/v1/accesstoken?service-name=</url>
-    </service>
-</topology>

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/ext/README
----------------------------------------------------------------------
diff --git a/hsso-release/home/ext/README b/hsso-release/home/ext/README
deleted file mode 100644
index 9eb0ca5..0000000
--- a/hsso-release/home/ext/README
+++ /dev/null
@@ -1 +0,0 @@
-THIS DIRECTORY IS WHERE JARS AND CLASSES CONTAINING CUSTOM EXTENSIONS CAN BE PLACED
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/lib/README
----------------------------------------------------------------------
diff --git a/hsso-release/home/lib/README b/hsso-release/home/lib/README
deleted file mode 100644
index 39cee63..0000000
--- a/hsso-release/home/lib/README
+++ /dev/null
@@ -1 +0,0 @@
-THIS DIRECTORY IS RESERVED FOR USE BY FUTURE SYSTEM JARS AND CLASSES
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/templates/topology.xml
----------------------------------------------------------------------
diff --git a/hsso-release/home/templates/topology.xml b/hsso-release/home/templates/topology.xml
deleted file mode 100644
index 06f3ae6..0000000
--- a/hsso-release/home/templates/topology.xml
+++ /dev/null
@@ -1,82 +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.
--->
-<topology>
-
-    <gateway>
-        <provider>
-            <role>authentication</role>
-            <enabled>true</enabled>
-            <name>ShiroProvider</name>
-            <param>
-                <name>main.ldapRealm</name>
-                <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm</value>
-            </param>
-            <param>
-                <name>main.ldapContextFactory</name>
-                <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory</value>
-            </param>
-            <param>
-                <name>main.ldapRealm.contextFactory</name>
-                <value>$ldapContextFactory</value>
-            </param>
-            <param>
-                <name>main.ldapRealm.userDnTemplate</name>
-                <value>uid={0},ou=people,dc=hadoop,dc=apache,dc=org</value>
-            </param>
-            <param>
-                <name>main.ldapRealm.contextFactory.url</name>
-                <value>ldap://localhost:33389</value>
-            </param>
-            <param>
-                <name>main.ldapRealm.contextFactory.authenticationMechanism</name>
-                <value>simple</value>
-            </param>
-            <param>
-                <name>urls./**</name>
-                <value>authcBasic</value>
-            </param>
-        </provider>
-        <provider>
-        	<role>identity-assertion</role>
-        	<enabled>true</enabled>
-        	<name>Default</name>
-        </provider>
-    </gateway>
-
-    <service>
-        <role>WEBHDFS</role>
-        <url>http://localhost:50070/webhdfs</url>
-    </service>
-    <service>
-        <role>WEBHCAT</role>
-        <url>http://localhost:50111/templeton</url>
-    </service>
-    <service>
-        <role>OOZIE</role>
-        <url>http://localhost:11000/oozie</url>
-    </service>
-    <service>
-        <role>WEBHBASE</role>
-        <url>http://localhost:60080</url>
-    </service>
-    <service>
-        <role>HIVE</role>
-        <url>http://localhost:10000</url>
-    </service>
-
-</topology>

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/templates/users.ldif
----------------------------------------------------------------------
diff --git a/hsso-release/home/templates/users.ldif b/hsso-release/home/templates/users.ldif
deleted file mode 100644
index fdd0296..0000000
--- a/hsso-release/home/templates/users.ldif
+++ /dev/null
@@ -1,36 +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.
-
-version: 1
-
-# entry for a sample people container
-# please replace with site specific values
-dn: ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:organizationalUnit
-ou: people
-
-# entry for a sample end user
-# please replace with site specific values
-dn: uid=guest,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: Guest
-sn: User
-uid: guest
-userPassword:guest-password
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/templates/workflow-configuration.xml
----------------------------------------------------------------------
diff --git a/hsso-release/home/templates/workflow-configuration.xml b/hsso-release/home/templates/workflow-configuration.xml
deleted file mode 100644
index 66bee24..0000000
--- a/hsso-release/home/templates/workflow-configuration.xml
+++ /dev/null
@@ -1,47 +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.
--->
-<configuration>
-    <property>
-        <name>jobTracker</name>
-        <value>REPLACE.JOBTRACKER.RPCHOSTPORT</value>
-        <!-- Example: <value>localhost:50300</value> -->
-    </property>
-    <property>
-        <name>nameNode</name>
-        <value>hdfs://REPLACE.NAMENODE.RPCHOSTPORT</value>
-        <!-- Example: <value>hdfs://localhost:8020</value> -->
-    </property>
-    <property>
-        <name>oozie.wf.application.path</name>
-        <value>hdfs://REPLACE.NAMENODE.RPCHOSTPORT/tmp/test</value>
-        <!-- Example: <value>hdfs://localhost:8020/tmp/test</value> -->
-    </property>
-    <property>
-        <name>user.name</name>
-        <value>mapred</value>
-    </property>
-    <property>
-        <name>inputDir</name>
-        <value>/tmp/test/input</value>
-    </property>
-    <property>
-        <name>outputDir</name>
-        <value>/tmp/test/output</value>
-    </property>
-</configuration>

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/home/templates/workflow-definition.xml
----------------------------------------------------------------------
diff --git a/hsso-release/home/templates/workflow-definition.xml b/hsso-release/home/templates/workflow-definition.xml
deleted file mode 100644
index a608d6b..0000000
--- a/hsso-release/home/templates/workflow-definition.xml
+++ /dev/null
@@ -1,36 +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.
--->
-<workflow-app xmlns="uri:oozie:workflow:0.2" name="wordcount-workflow">
-    <start to="root"/>
-    <action name="root">
-        <java>
-            <job-tracker>${jobTracker}</job-tracker>
-            <name-node>${nameNode}</name-node>
-            <main-class>org.apache.hadoop.examples.WordCount</main-class>
-            <arg>${inputDir}</arg>
-            <arg>${outputDir}</arg>
-        </java>
-        <ok to="end"/>
-        <error to="fail"/>
-    </action>
-    <kill name="fail">
-        <message>Java failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
-    </kill>
-    <end name="end"/>
-</workflow-app>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/pom.xml
----------------------------------------------------------------------
diff --git a/hsso-release/pom.xml b/hsso-release/pom.xml
deleted file mode 100644
index 7f93201..0000000
--- a/hsso-release/pom.xml
+++ /dev/null
@@ -1,185 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.knox</groupId>
-        <artifactId>gateway</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>hsso-release</artifactId>
-
-    <name>hsso-release</name>
-    <description>The gateway binary release packaging.</description>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <inherited>false</inherited>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.4</version>
-                        <executions>
-                            <execution>
-                                <id>binary</id>
-                                <phase>package</phase>
-                                <goals><goal>single</goal></goals>
-                                <configuration>
-                                    <finalName>hsso-${gateway-version}</finalName>
-                                    <outputDirectory>../target/${gateway-version}</outputDirectory>
-                                    <appendAssemblyId>false</appendAssemblyId>
-                                    <descriptors>
-                                        <descriptor>src/assembly.xml</descriptor>
-                                    </descriptors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals><goal>run</goal></goals>
-                                <configuration>
-                                    <tasks>
-                                        <checksum algorithm="MD5" fileext=".md5">
-                                            <fileset dir="../target/${gateway-version}">
-                                                <include name="*.zip" />
-                                                <include name="*.tar.gz" />
-                                            </fileset>
-                                        </checksum>
-                                        <checksum algorithm="SHA1" fileext=".sha">
-                                            <fileset dir="../target/${gateway-version}">
-                                                <include name="*.zip" />
-                                                <include name="*.tar.gz" />
-                                            </fileset>
-                                        </checksum>
-                                    </tasks>
-                                </configuration>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.ant</groupId>
-                                <artifactId>ant-nodeps</artifactId>
-                                <version>1.8.1</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-server-launcher</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-service-as</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-service-webhdfs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-service-definitions</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-service-tgs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-provider-rewrite</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-provider-rewrite-step-secure-query</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-provider-rewrite-step-encrypt-uri</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-provider-rewrite-func-hostmap-static</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-provider-rewrite-func-service-registry</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-provider-security-shiro</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-provider-security-jwt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-provider-identity-assertion-pseudo</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-shell</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-shell-launcher</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-demo-ldap</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${gateway-group}</groupId>
-            <artifactId>gateway-demo-ldap-launcher</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/src/assembly.xml
----------------------------------------------------------------------
diff --git a/hsso-release/src/assembly.xml b/hsso-release/src/assembly.xml
deleted file mode 100644
index 54ed892..0000000
--- a/hsso-release/src/assembly.xml
+++ /dev/null
@@ -1,98 +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.
--->
-<assembly>
-    <id>bin</id>
-    <formats>
-        <format>zip</format>
-        <format>tar.gz</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory>home</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>**</include>
-            </includes>
-            <excludes>
-                <exclude>**/.idea/**</exclude>
-                <exclude>**/*.iml</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-            </excludes>
-        </fileSet>
-		<fileSet>
-		    <directory>..</directory>
-		    <outputDirectory></outputDirectory>
-		    <includes>
-		        <include>CHANGES</include>
-		        <include>DISCLAIMER</include>
-		        <include>ISSUES</include>
-		        <include>LICENSE</include>
-		        <include>NOTICE</include>
-		        <include>README</include>
-		    </includes>
-		</fileSet>
-    </fileSets>
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>dep</outputDirectory>
-            <!--
-            <useTransitiveFiltering>true</useTransitiveFiltering>
-            -->
-            <scope>runtime</scope>
-            <excludes>
-                <exclude>${gateway-group}:gateway-*</exclude>
-                <exclude>${gateway-group}:hsso-*</exclude>
-            </excludes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>${gateway-group}:gateway-*</include>
-                <include>${gateway-group}:hsso-*</include>
-            </includes>
-            <excludes>
-                <exclude>${gateway-group}:gateway-util-launcher</exclude>
-                <exclude>${gateway-group}:gateway-server-launcher</exclude>
-                <exclude>${gateway-group}:gateway-shell-launcher</exclude>
-                <exclude>${gateway-group}:gateway-demo-ldap-launcher</exclude>
-            </excludes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>bin</outputDirectory>
-            <outputFileNameMapping>hsso.jar</outputFileNameMapping>
-            <includes>
-                <include>${gateway-group}:gateway-server-launcher</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>bin</outputDirectory>
-            <outputFileNameMapping>shell.jar</outputFileNameMapping>
-            <includes>
-                <include>${gateway-group}:gateway-shell-launcher</include>
-            </includes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>bin</outputDirectory>
-            <outputFileNameMapping>ldap.jar</outputFileNameMapping>
-            <includes>
-                <include>${gateway-group}:gateway-demo-ldap-launcher</include>
-            </includes>
-        </dependencySet>
-    </dependencySets>
-</assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/hsso-release/src/main/resources/META-INF/services/org.apache.hadoop.gateway.services.GatewayServices
----------------------------------------------------------------------
diff --git a/hsso-release/src/main/resources/META-INF/services/org.apache.hadoop.gateway.services.GatewayServices b/hsso-release/src/main/resources/META-INF/services/org.apache.hadoop.gateway.services.GatewayServices
deleted file mode 100644
index 0476c41..0000000
--- a/hsso-release/src/main/resources/META-INF/services/org.apache.hadoop.gateway.services.GatewayServices
+++ /dev/null
@@ -1,20 +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.hadoop.gateway.services.HssoGatewayServices

http://git-wip-us.apache.org/repos/asf/knox/blob/48b92898/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 14e3079..bce1431 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,6 @@
         <module>hadoop-examples</module>
         <module>gateway-release</module>
         <module>gateway-test</module>
-        <module>hsso-release</module>
         <module>gateway-service-vault</module>
         <module>gateway-service-test</module>
         <module>gateway-test-release</module>
@@ -175,7 +174,7 @@
                 </plugins>
             </build>
             <properties>
-                <failsafe.group>org.apache.hadoop.test.category.VerifyTest, org.apache.hadoop.test.category.ReleaseTest</failsafe.group>
+                <failsafe.group>org.apache.hadoop.test.category.VerifyTest,org.apache.hadoop.test.category.ReleaseTest</failsafe.group>
             </properties>
         </profile>
         <profile>
@@ -615,11 +614,6 @@
                 <artifactId>gateway-release</artifactId>
                 <version>${gateway-version}</version>
             </dependency>
-            <dependency>
-                <groupId>${gateway-group}</groupId>
-                <artifactId>hsso-release</artifactId>
-                <version>${gateway-version}</version>
-            </dependency>
 
         <dependency>
             <groupId>org.picketlink</groupId>


Mime
View raw message