You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sentry.apache.org by co...@apache.org on 2017/10/19 11:20:39 UTC

[1/5] sentry git commit: Some minor refactoring

Repository: sentry
Updated Branches:
  refs/heads/akolb-cli 6000ca997 -> 922b31696


Some minor refactoring


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

Branch: refs/heads/akolb-cli
Commit: d9dbe56ca257f89652ffa430bfc4c594f35e3557
Parents: 6000ca9
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Oct 19 11:43:48 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Oct 19 11:43:48 2017 +0100

----------------------------------------------------------------------
 .../java/org/apache/sentry/shell/GroupShell.java   | 16 ++++++++--------
 .../java/org/apache/sentry/shell/PrivsShell.java   |  8 ++++----
 .../java/org/apache/sentry/shell/RolesShell.java   | 15 +++++++--------
 .../java/org/apache/sentry/shell/SentryCli.java    |  1 -
 .../java/org/apache/sentry/shell/ShellUtil.java    | 17 ++++++++---------
 5 files changed, 27 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sentry/blob/d9dbe56c/sentry-tools/src/main/java/org/apache/sentry/shell/GroupShell.java
----------------------------------------------------------------------
diff --git a/sentry-tools/src/main/java/org/apache/sentry/shell/GroupShell.java b/sentry-tools/src/main/java/org/apache/sentry/shell/GroupShell.java
index 3fc7a31..7510114 100644
--- a/sentry-tools/src/main/java/org/apache/sentry/shell/GroupShell.java
+++ b/sentry-tools/src/main/java/org/apache/sentry/shell/GroupShell.java
@@ -29,6 +29,14 @@ import java.util.List;
  * Sentry group manipulation for CLI
  */
 public class GroupShell implements ShellDependent {
+
+    private final ShellUtil tools;
+    Shell shell;
+
+    public GroupShell(SentryPolicyServiceClient sentryClient, String authUser) {
+        this.tools = new ShellUtil(sentryClient, authUser);
+    }
+
     @Command
     public List<String> list() {
         return tools.listGroups();
@@ -50,14 +58,6 @@ public class GroupShell implements ShellDependent {
         tools.revokeGroupsFromRole(roleName, groups);
     }
 
-    private final ShellUtil tools;
-    Shell shell;
-
-
-    public GroupShell(SentryPolicyServiceClient sentryClient, String authUser) {
-        this.tools = new ShellUtil(sentryClient, authUser);
-    }
-
     @Override
     public void cliSetShell(Shell theShell) {
         this.shell = theShell;

http://git-wip-us.apache.org/repos/asf/sentry/blob/d9dbe56c/sentry-tools/src/main/java/org/apache/sentry/shell/PrivsShell.java
----------------------------------------------------------------------
diff --git a/sentry-tools/src/main/java/org/apache/sentry/shell/PrivsShell.java b/sentry-tools/src/main/java/org/apache/sentry/shell/PrivsShell.java
index 9d8b9d9..b7db42e 100644
--- a/sentry-tools/src/main/java/org/apache/sentry/shell/PrivsShell.java
+++ b/sentry-tools/src/main/java/org/apache/sentry/shell/PrivsShell.java
@@ -30,6 +30,10 @@ public class PrivsShell implements ShellDependent {
     private final ShellUtil tools;
     Shell shell;
 
+    public PrivsShell(SentryPolicyServiceClient sentryClient, String authUser) {
+        this.tools = new ShellUtil(sentryClient, authUser);
+    }
+
     @Command(description = "Grant privilege to role")
     public void grant(
             @Param(name = "roleName")
@@ -62,10 +66,6 @@ public class PrivsShell implements ShellDependent {
         tools.revokePrivilegeFromRole(roleName, privilege);
     }
 
-    public PrivsShell(SentryPolicyServiceClient sentryClient, String authUser) {
-        this.tools = new ShellUtil(sentryClient, authUser);
-    }
-
     @Override
     public void cliSetShell(Shell theShell) {
         this.shell = theShell;

http://git-wip-us.apache.org/repos/asf/sentry/blob/d9dbe56c/sentry-tools/src/main/java/org/apache/sentry/shell/RolesShell.java
----------------------------------------------------------------------
diff --git a/sentry-tools/src/main/java/org/apache/sentry/shell/RolesShell.java b/sentry-tools/src/main/java/org/apache/sentry/shell/RolesShell.java
index 9ac6637..856f422 100644
--- a/sentry-tools/src/main/java/org/apache/sentry/shell/RolesShell.java
+++ b/sentry-tools/src/main/java/org/apache/sentry/shell/RolesShell.java
@@ -30,6 +30,13 @@ import java.util.List;
  * Sentry roles manipulation for CLI.
  */
 public class RolesShell implements ShellDependent {
+    private final ShellUtil tools;
+    Shell shell;
+
+    public RolesShell(SentryPolicyServiceClient sentryClient, String authUser) {
+        this.tools = new ShellUtil(sentryClient, authUser);
+    }
+
     @Command(description = "List sentry roles. shows all available roles.")
     public List<String> list() {
         return tools.listRoles();
@@ -56,17 +63,9 @@ public class RolesShell implements ShellDependent {
         tools.removeRoles(roles);
     }
 
-
     @Override
     public void cliSetShell(Shell theShell) {
         this.shell = theShell;
     }
 
-    private final ShellUtil tools;
-    Shell shell;
-
-    public RolesShell(SentryPolicyServiceClient sentryClient, String authUser) {
-        this.tools = new ShellUtil(sentryClient, authUser);
-    }
-
 }

http://git-wip-us.apache.org/repos/asf/sentry/blob/d9dbe56c/sentry-tools/src/main/java/org/apache/sentry/shell/SentryCli.java
----------------------------------------------------------------------
diff --git a/sentry-tools/src/main/java/org/apache/sentry/shell/SentryCli.java b/sentry-tools/src/main/java/org/apache/sentry/shell/SentryCli.java
index 180d240..823d80c 100644
--- a/sentry-tools/src/main/java/org/apache/sentry/shell/SentryCli.java
+++ b/sentry-tools/src/main/java/org/apache/sentry/shell/SentryCli.java
@@ -51,7 +51,6 @@ public class SentryCli {
     private static final String localhost = "localhost";
     private static final String defaultPort = "8038";
 
-
     private static final String configOpt = "config";
     private static final String userOpt = "user";
     private static final String hostOpt = "host";

http://git-wip-us.apache.org/repos/asf/sentry/blob/d9dbe56c/sentry-tools/src/main/java/org/apache/sentry/shell/ShellUtil.java
----------------------------------------------------------------------
diff --git a/sentry-tools/src/main/java/org/apache/sentry/shell/ShellUtil.java b/sentry-tools/src/main/java/org/apache/sentry/shell/ShellUtil.java
index 007975c..5df21ae 100644
--- a/sentry-tools/src/main/java/org/apache/sentry/shell/ShellUtil.java
+++ b/sentry-tools/src/main/java/org/apache/sentry/shell/ShellUtil.java
@@ -34,8 +34,15 @@ import static org.apache.sentry.service.thrift.SentryServiceUtil.convertToTSentr
  */
 class ShellUtil {
 
+    private final SentryPolicyServiceClient sentryClient;
+    private final String authUser;
+
+    ShellUtil(SentryPolicyServiceClient sentryClient, String authUser) {
+        this.sentryClient = sentryClient;
+        this.authUser = authUser;
+    }
+
     List<String> listRoles() {
-        List<String> roles = null;
         try {
             return getRoles();
         } catch (SentryUserException e) {
@@ -324,12 +331,4 @@ class ShellUtil {
         return roleNames;
     }
 
-    ShellUtil(SentryPolicyServiceClient sentryClient, String authUser) {
-        this.sentryClient = sentryClient;
-        this.authUser = authUser;
-    }
-
-    private final SentryPolicyServiceClient sentryClient;
-    private final String authUser;
-
 }


[2/5] sentry git commit: Adding Script to run the CLI + adding sentry-tools to build cycle

Posted by co...@apache.org.
Adding Script to run the CLI + adding sentry-tools to build cycle


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

Branch: refs/heads/akolb-cli
Commit: 10dec6b605678faef8a491191fa4a7ef788ddeb1
Parents: d9dbe56
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Oct 19 11:48:26 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Oct 19 11:48:26 2017 +0100

----------------------------------------------------------------------
 bin/sentryCli        | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 pom.xml              |  1 +
 sentry-tools/pom.xml |  2 +-
 3 files changed, 61 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sentry/blob/10dec6b6/bin/sentryCli
----------------------------------------------------------------------
diff --git a/bin/sentryCli b/bin/sentryCli
new file mode 100755
index 0000000..02e9edd
--- /dev/null
+++ b/bin/sentryCli
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+# 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.
+
+bin=`dirname "$0"`
+myhome=`cd "$bin/.."; pwd`
+
+if [[ -z $SENTRY_HOME ]] ; then
+  export SENTRY_HOME=$myhome
+fi
+
+# check for hadoop in the path
+HADOOP_IN_PATH=`which hadoop 2>/dev/null`
+if [ -f ${HADOOP_IN_PATH} ]; then
+  HADOOP_DIR=`dirname "$HADOOP_IN_PATH"`/..
+fi
+# HADOOP_HOME env variable overrides hadoop in the path
+HADOOP_HOME=${HADOOP_HOME:-${HADOOP_PREFIX:-$HADOOP_DIR}}
+if [ "$HADOOP_HOME" == "" ]; then
+  echo "Cannot find hadoop installation: \$HADOOP_HOME or \$HADOOP_PREFIX must be set or hadoop must be in the path";
+  exit 4;
+fi
+
+HADOOP=$HADOOP_HOME/bin/hadoop
+if [ ! -f ${HADOOP} ]; then
+  echo "Cannot find hadoop installation: \$HADOOP_HOME or \$HADOOP_PREFIX must be set or hadoop must be in the path";
+  exit 4;
+fi
+
+export _CMD_JAR=${SENTRY_SHELL_JAR:-sentry-provider-db-*.jar}
+for f in ${SENTRY_HOME}/lib/*.jar; do
+  HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:${f}
+done
+export HADOOP_CLASSPATH
+
+for f in ${SENTRY_HOME}/lib/server/*.jar; do
+  HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:${f}
+done
+for f in ${SENTRY_HOME}/lib/plugins/*.jar; do
+  HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:${f}
+done
+
+args=()
+shell=org.apache.sentry.shell.SentryCli
+
+exec $HADOOP jar ${SENTRY_HOME}/lib/${_CMD_JAR} $shell

http://git-wip-us.apache.org/repos/asf/sentry/blob/10dec6b6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1c05556..02cf8f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -627,6 +627,7 @@ limitations under the License.
     <module>sentry-tests</module>
     <module>sentry-hdfs</module>
     <module>sentry-solr</module>
+    <module>sentry-tools</module>
     <module>sentry-dist</module>
   </modules>
 

http://git-wip-us.apache.org/repos/asf/sentry/blob/10dec6b6/sentry-tools/pom.xml
----------------------------------------------------------------------
diff --git a/sentry-tools/pom.xml b/sentry-tools/pom.xml
index ed0fb92..5d4cb2a 100644
--- a/sentry-tools/pom.xml
+++ b/sentry-tools/pom.xml
@@ -60,4 +60,4 @@ limitations under the License.
     </build>
 
 
-</project>
\ No newline at end of file
+</project>


[5/5] sentry git commit: Switching remove role (rm) to drop role (dr) for consistency with the shell scripts

Posted by co...@apache.org.
Switching remove role (rm) to drop role (dr) for consistency with the shell scripts


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

Branch: refs/heads/akolb-cli
Commit: 922b3169615a0e42f6469135d6f95bcec17f01b7
Parents: c649777
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Oct 19 12:15:44 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Oct 19 12:15:44 2017 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/sentry/shell/RolesShell.java    | 6 +++---
 .../src/main/java/org/apache/sentry/shell/ShellUtil.java     | 4 ++--
 .../src/main/java/org/apache/sentry/shell/TopLevelShell.java | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sentry/blob/922b3169/sentry-tools/src/main/java/org/apache/sentry/shell/RolesShell.java
----------------------------------------------------------------------
diff --git a/sentry-tools/src/main/java/org/apache/sentry/shell/RolesShell.java b/sentry-tools/src/main/java/org/apache/sentry/shell/RolesShell.java
index 856f422..ab4589d 100644
--- a/sentry-tools/src/main/java/org/apache/sentry/shell/RolesShell.java
+++ b/sentry-tools/src/main/java/org/apache/sentry/shell/RolesShell.java
@@ -56,11 +56,11 @@ public class RolesShell implements ShellDependent {
         tools.createRoles(roles);
     }
 
-    @Command(description = "remove Sentry role(s).")
-    public void remove(
+    @Command(description = "drop Sentry role(s).")
+    public void drop(
             @Param(name = "roleName ...", description = "role names to remove")
             String ...roles) {
-        tools.removeRoles(roles);
+        tools.dropRoles(roles);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/sentry/blob/922b3169/sentry-tools/src/main/java/org/apache/sentry/shell/ShellUtil.java
----------------------------------------------------------------------
diff --git a/sentry-tools/src/main/java/org/apache/sentry/shell/ShellUtil.java b/sentry-tools/src/main/java/org/apache/sentry/shell/ShellUtil.java
index 5df21ae..4904fac 100644
--- a/sentry-tools/src/main/java/org/apache/sentry/shell/ShellUtil.java
+++ b/sentry-tools/src/main/java/org/apache/sentry/shell/ShellUtil.java
@@ -82,12 +82,12 @@ class ShellUtil {
         }
     }
 
-    void removeRoles(String ...roles) {
+    void dropRoles(String ...roles) {
         for (String role: roles) {
             try {
                 sentryClient.dropRole(authUser, role);
             } catch (SentryUserException e) {
-                System.out.printf("failed to remove role %s: %s\n",
+                System.out.printf("failed to drop role %s: %s\n",
                         role, e.toString());
             }
         }

http://git-wip-us.apache.org/repos/asf/sentry/blob/922b3169/sentry-tools/src/main/java/org/apache/sentry/shell/TopLevelShell.java
----------------------------------------------------------------------
diff --git a/sentry-tools/src/main/java/org/apache/sentry/shell/TopLevelShell.java b/sentry-tools/src/main/java/org/apache/sentry/shell/TopLevelShell.java
index ef5313a..738a992 100644
--- a/sentry-tools/src/main/java/org/apache/sentry/shell/TopLevelShell.java
+++ b/sentry-tools/src/main/java/org/apache/sentry/shell/TopLevelShell.java
@@ -108,11 +108,11 @@ public class TopLevelShell implements ShellDependent, Runnable {
         tools.createRoles(roles);
     }
 
-    @Command(abbrev = "rm", description = "remove Sentry role(s).")
-    public void removeRole(
-            @Param(name = "roleName ...", description = "role names to remove")
+    @Command(abbrev = "dr", description = "drop Sentry role(s).")
+    public void dropRole(
+            @Param(name = "roleName ...", description = "role names to drop")
                     String ...roles) {
-        tools.removeRoles(roles);
+        tools.dropRoles(roles);
     }
 
     @Command(description = "list Sentry privileges")


[4/5] sentry git commit: Adding sentry-tools jar to the dist

Posted by co...@apache.org.
Adding sentry-tools jar to the dist


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

Branch: refs/heads/akolb-cli
Commit: c649777d670133d011439f97114552354227f86a
Parents: 3c8c72c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Oct 19 11:51:43 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Oct 19 11:51:43 2017 +0100

----------------------------------------------------------------------
 pom.xml             | 5 +++++
 sentry-dist/pom.xml | 4 ++++
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sentry/blob/c649777d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 02cf8f7..2d42a99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -487,6 +487,11 @@ limitations under the License.
       </dependency>
       <dependency>
         <groupId>org.apache.sentry</groupId>
+        <artifactId>sentry-tools</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.sentry</groupId>
         <artifactId>sentry-dist</artifactId>
         <version>${project.version}</version>
       </dependency>

http://git-wip-us.apache.org/repos/asf/sentry/blob/c649777d/sentry-dist/pom.xml
----------------------------------------------------------------------
diff --git a/sentry-dist/pom.xml b/sentry-dist/pom.xml
index 2d7f57e..3bc8207 100644
--- a/sentry-dist/pom.xml
+++ b/sentry-dist/pom.xml
@@ -98,6 +98,10 @@ limitations under the License.
       <groupId>org.apache.sentry</groupId>
       <artifactId>sentry-hdfs-dist</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.sentry</groupId>
+      <artifactId>sentry-tools</artifactId>
+    </dependency>
   </dependencies>
   <profiles>
     <profile>


[3/5] sentry git commit: Adding License for cliche

Posted by co...@apache.org.
Adding License for cliche


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

Branch: refs/heads/akolb-cli
Commit: 3c8c72ca25627b20771f04fbba441550122d71a3
Parents: 10dec6b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Oct 19 11:49:36 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Oct 19 11:49:36 2017 +0100

----------------------------------------------------------------------
 LICENSE.txt | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sentry/blob/3c8c72ca/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index e6be787..b794ae6 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -267,3 +267,28 @@ Redistribution and use in source and binary forms, with or without modification,
 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+For budhash/cliche:
+
+The MIT License
+
+Copyright (c) Budhaditya 2015
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+