Use consistent naming pattern around the project

6 files changed, 31 insertions, 32 deletions

diff --git a/kernel.json b/kernel.json
index 5169f26..ab8bb74 100644
--- a/kernel.json
+++ b/kernel.json
@@ -2,10 +2,10 @@
   "language_info": {
     "name": "scala"
   },
-  "display_name": "Toree Client Proxy Kernel",
+  "display_name": "Toree Gateway Kernel",
   "argv": [
     "python",
-    "/opt/toree_proxy/python/toree_proxy_kernel.py",
+    "/opt/toree_gateway/python/toree_gateway_kernel.py",
     "-f",
     "{connection_file}"
   ],
diff --git a/pom.xml b/pom.xml
index 7fb8db4..aca308e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm</groupId>
   <artifactId>toree-gateway</artifactId>
-  <version>0.1</version>
+  <version>1.0</version>
 
   <name>Toree Gateway</name>
 
@@ -66,16 +66,12 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19.1</version>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.3</version>
         <configuration>
-          <argLine>-Dlog4j.configuration=file:"./src/test/resources/conf/log4j.prop"
-          </argLine>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
         <executions>
           <execution>
             <phase>compile</phase>
@@ -85,15 +81,7 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.3</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
@@ -126,6 +114,17 @@
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.19.1</version>
+        <configuration>
+          <argLine>-Dlog4j.configuration=file:"./src/test/resources/conf/log4j.prop"
+          </argLine>
+        </configuration>
+      </plugin>
+
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
diff --git a/python/setup.py b/python/setup.py
index 2ebbaa9..a46d087 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -17,15 +17,15 @@
 from setuptools import setup
 
 
-setup(name='toree_proxy_kernel',
+setup(name='toree_gateway_kernel',
     version='0.1',
-    description='Toree Client Proxy Kernel',
-    long_description='A simple echo kernel for Jupyter/IPython, based on MetaKernel',
-    py_modules=['toree_proxy_kernel'],
+    description='Toree Gateway',
+    long_description='A Gateway Kernel for Apache Toree, based on MetaKernel',
+    py_modules=['toree_gateway_kernel'],
     install_requires=['metakernel', 'py4j'],
     classifiers = [
         'Framework :: IPython',
-        'License :: OSI Approved :: BSD License',
+        'License :: OSI Approved :: Apache License 2.0',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 2',
         'Topic :: System :: Shells',
diff --git a/python/toree_kernel.py b/python/toree_gateway_kernel.py
index 4b6266e..46b264a 100644
--- a/python/toree_kernel.py
+++ b/python/toree_gateway_kernel.py
@@ -39,11 +39,11 @@ class TextOutput(object):
         return self.output
 
 class ToreeKernel(MetaKernel):
-    implementation = 'toree_kernel'
-    implementation_version = '0.1'
+    implementation = 'toree_gateway_kernel'
+    implementation_version = '1.0'
     langauge = 'scala'
     language_version = '2.11'
-    banner = "toree_kernel"
+    banner = "toree_gateway_kernel"
     language_info = {'name': 'scala',
                      'mimetype': 'application/scala',
                      'file_extension': '.scala'}
@@ -64,8 +64,8 @@ class ToreeKernel(MetaKernel):
         args = [
             "java",
             "-classpath",
-            "/opt/toree_proxy/lib/toree-gateway-0.1-jar-with-dependencies.jar",
-            "com.ibm.ToreeClient"
+            "/opt/toree_proxy/lib/toree-gateway-1.0-jar-with-dependencies.jar",
+            "com.ibm.ToreeGateway"
         ]
 
         self.gateway_proc = Popen(args, stderr=PIPE, stdout=PIPE)
diff --git a/src/main/scala/com/ibm/ToreeClient.scala b/src/main/scala/com/ibm/ToreeGateway.scala
index d1a8904..edaa1e2 100644
--- a/src/main/scala/com/ibm/ToreeClient.scala
+++ b/src/main/scala/com/ibm/ToreeGateway.scala
@@ -87,7 +87,7 @@ class ToreeGateway(client: SparkKernelClient) {
   }
 }
 
-object ToreeClient extends App {
+object ToreeGatewayClient extends App {
 
   final val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))
 
diff --git a/src/test/scala/com/ibm/ToreeClientSpec.scala b/src/test/scala/com/ibm/ToreeGatewaySpec.scala
index 859f2f7..4ea0ada 100644
--- a/src/test/scala/com/ibm/ToreeClientSpec.scala
+++ b/src/test/scala/com/ibm/ToreeGatewaySpec.scala
@@ -24,7 +24,7 @@ import org.scalatest.{FlatSpec, Ignore}
 import org.slf4j.LoggerFactory
 
 @Ignore
-class ToreeClientSpec extends FlatSpec {
+class ToreeGatewaySpec extends FlatSpec {
 
   final val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$"))