[MINOR] Clean some old package name left in code and configuration file

Looks like we still left some old package name uncleaned, so search and modify them again. Author: jerryshao <[email protected]> Closes apache#29 from jerryshao/clean-code.
quitozang · Aug 3, 2017 · d4bd76f · d4bd76f
1 parent d48c024
commit d4bd76f
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 14 deletions.
diff --git a/client-http/src/test/resources/log4j.properties b/client-http/src/test/resources/log4j.properties
@@ -33,5 +33,5 @@ log4j.appender.console.layout=org.apache.log4j.PatternLayout
 log4j.appender.console.layout.ConversionPattern=%t: %m%n
 
 # Ignore messages below warning level from Jetty, because it's a bit verbose
-log4j.logger.com.cloudera.livy.shaded=INFO
+log4j.logger.org.apache.livy.shaded=INFO
 log4j.logger.org.eclipse.jetty=WARN
diff --git a/client-http/src/test/scala/org/apache/livy/client/http/HttpClientSpec.scala b/client-http/src/test/scala/org/apache/livy/client/http/HttpClientSpec.scala
@@ -64,7 +64,7 @@ class HttpClientSpec extends FunSpecLike with BeforeAndAfterAll with LivyBaseUni
     super.beforeAll()
     server = new WebServer(new LivyConf(), "0.0.0.0", 0)
 
-    server.context.setResourceBase("src/main/com/cloudera/livy/server")
+    server.context.setResourceBase("src/main/org/apache/livy/server")
     server.context.setInitParameter(ScalatraListener.LifeCycleKey,
       classOf[HttpClientTestBootstrap].getCanonicalName)
     server.context.addEventListener(new ScalatraListener)

diff --git a/client-http/src/test/scala/org/apache/livy/client/http/LivyConnectionSpec.scala b/client-http/src/test/scala/org/apache/livy/client/http/LivyConnectionSpec.scala
@@ -64,7 +64,7 @@ class LivyConnectionSpec extends FunSpecLike with BeforeAndAfterAll with LivyBas
 
       val server = new WebServer(livyConf, "0.0.0.0", 0)
       server.context.setSecurityHandler(basicAuth(username, password, "realm"))
-      server.context.setResourceBase("src/main/com/cloudera/livy/server")
+      server.context.setResourceBase("src/main/org/apache/livy/server")
       server.context.setInitParameter(ScalatraListener.LifeCycleKey,
         classOf[HttpClientTestBootstrap].getCanonicalName)
       server.context.addEventListener(new ScalatraListener)

diff --git a/examples/src/main/scala/org/apache/livy/examples/WordCountApp.scala b/examples/src/main/scala/org/apache/livy/examples/WordCountApp.scala
@@ -181,7 +181,7 @@ object WordCountApp {
    * Example execution:
    * scala -cp /pathTo/livy-api-*version*.jar:/pathTo/livy-client-http-*version*.jar:
    * /pathTo/livy-examples-*version*.jar:/pathTo/livy-scala-api-*version*.jar
-   * com.cloudera.livy.examples.WordCountApp http://livy-host:8998 /outputFilePath
+   * org.apache.livy.examples.WordCountApp http://livy-host:8998 /outputFilePath
    * host=myhost port=8080
    */
   def main(args: Array[String]): Unit = {

diff --git a/integration-test/src/test/resources/log4j.properties b/integration-test/src/test/resources/log4j.properties
@@ -33,8 +33,8 @@ log4j.appender.console.layout=org.apache.log4j.PatternLayout
 log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss.SSS} %t: %m%n
 
 # Silence 3rd party libraries.
-log4j.logger.com.cloudera.livy.rsc=INFO
-log4j.logger.com.cloudera.livy.shaded=INFO
+log4j.logger.org.apache.livy.rsc=INFO
+log4j.logger.org.apache.livy.shaded=INFO
 log4j.logger.com.decodified=WARN
 log4j.logger.com.ning.http=WARN
 log4j.logger.org.apache.hadoop=WARN

diff --git a/pom.xml b/pom.xml
@@ -35,11 +35,6 @@
     </license>
   </licenses>
 
-  <organization>
-    <name>Cloudera Inc</name>
-    <url>http://www.cloudera.com</url>
-  </organization>
-
   <properties>
     <hadoop.version>2.7.3</hadoop.version>
     <hadoop.scope>compile</hadoop.scope>

diff --git a/scala-api/src/main/scala/org/apache/livy/scalaapi/package.scala b/scala-api/src/main/scala/org/apache/livy/scalaapi/package.scala
@@ -28,8 +28,8 @@ package object scalaapi {
    *  @constructor Creates a Scala client.
    *  @param livyJavaClient  the Java client of Livy.
    *  {{{
-   *     import com.cloudera.livy._
-   *     import com.cloudera.livy.scalaapi._
+   *     import org.apache.livy._
+   *     import org.apache.livy.scalaapi._
    *     val url = "http://example.com"
    *     val livyJavaClient = new LivyClientBuilder(false).setURI(new URI(url))).build()
    *     val livyScalaClient = livyJavaClient.asScalaClient

diff --git a/server/src/main/scala/org/apache/livy/server/ApiVersions.scala b/server/src/main/scala/org/apache/livy/server/ApiVersions.scala
@@ -19,7 +19,7 @@ package org.apache.livy.server
 
 /**
  * This enum defines Livy's API versions.
- * [[com.cloudera.livy.server.AbstractApiVersioningSupport]] uses this for API version checking.
+ * [[org.apache.livy.server.AbstractApiVersioningSupport]] uses this for API version checking.
  *
  * Version is defined as <major version>.<minor version>.
  * When making backward compatible change (adding methods/fields), bump minor version.