Skip to content

Commit 412ccc8

Browse files
committed
LIVY-375. Change Livy code package name to org.apache.livy
This PR propose to change Livy code package name to org.apache.livy. This is one part to move Livy to Apache. Author: jerryshao <[email protected]> Closes apache#12 from jerryshao/LIVY-375.
1 parent cb5b8aa commit 412ccc8

File tree

230 files changed

+687
-703
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+687
-703
lines changed

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ And add the Livy client dependency:
190190
191191
To be able to compile code that uses Spark APIs, also add the correspondent Spark dependencies.
192192

193-
To run Spark jobs within your applications, extend ``com.cloudera.livy.Job`` and implement
193+
To run Spark jobs within your applications, extend ``org.apache.livy.Job`` and implement
194194
the functionality you need. Here's an example job that calculates an approximate value for Pi:
195195

196196
.. code:: java

api/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
<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">
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
21-
<groupId>com.cloudera.livy</groupId>
21+
<groupId>org.apache.livy</groupId>
2222
<artifactId>livy-main</artifactId>
23-
<version>0.4.0-SNAPSHOT</version>
23+
<version>0.4.0-incubating-SNAPSHOT</version>
2424
</parent>
2525

26-
<groupId>com.cloudera.livy</groupId>
26+
<groupId>org.apache.livy</groupId>
2727
<artifactId>livy-api</artifactId>
28-
<version>0.4.0-SNAPSHOT</version>
28+
<version>0.4.0-incubating-SNAPSHOT</version>
2929
<packaging>jar</packaging>
3030

3131
<properties>

api/src/main/java/com/cloudera/livy/Job.java api/src/main/java/org/apache/livy/Job.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy;
18+
package org.apache.livy;
1919

2020
import java.io.Serializable;
2121

api/src/main/java/com/cloudera/livy/JobContext.java api/src/main/java/org/apache/livy/JobContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy;
18+
package org.apache.livy;
1919

2020
import java.io.File;
2121
import java.util.List;

api/src/main/java/com/cloudera/livy/JobHandle.java api/src/main/java/org/apache/livy/JobHandle.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy;
18+
package org.apache.livy;
1919

2020
import java.util.List;
2121
import java.util.concurrent.Future;

api/src/main/java/com/cloudera/livy/LivyClient.java api/src/main/java/org/apache/livy/LivyClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy;
18+
package org.apache.livy;
1919

2020
import java.io.File;
2121
import java.net.URI;

api/src/main/java/com/cloudera/livy/LivyClientBuilder.java api/src/main/java/org/apache/livy/LivyClientBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy;
18+
package org.apache.livy;
1919

2020
import java.io.IOException;
2121
import java.io.InputStreamReader;

api/src/main/java/com/cloudera/livy/LivyClientFactory.java api/src/main/java/org/apache/livy/LivyClientFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy;
18+
package org.apache.livy;
1919

2020
import java.net.URI;
2121
import java.util.Properties;
2222

23-
import com.cloudera.livy.annotations.Private;
23+
import org.apache.livy.annotations.Private;
2424

2525
/**
2626
* A factory for Livy clients. Client implementations can register themselves by using the

api/src/main/java/com/cloudera/livy/annotations/Private.java api/src/main/java/org/apache/livy/annotations/Private.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy.annotations;
18+
package org.apache.livy.annotations;
1919

2020
import java.lang.annotation.Documented;
2121
import java.lang.annotation.Retention;

api/src/test/java/com/cloudera/livy/TestClientFactory.java api/src/test/java/org/apache/livy/TestClientFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy;
18+
package org.apache.livy;
1919

2020
import java.io.File;
2121
import java.net.URI;

api/src/test/java/com/cloudera/livy/TestLivyClientBuilder.java api/src/test/java/org/apache/livy/TestLivyClientBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy;
18+
package org.apache.livy;
1919

2020
import java.net.URI;
2121
import java.util.Properties;

api/src/test/resources/META-INF/services/com.cloudera.livy.LivyClientFactory

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.apache.livy.TestClientFactory

assembly/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
<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">
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
21-
<groupId>com.cloudera.livy</groupId>
21+
<groupId>org.apache.livy</groupId>
2222
<artifactId>livy-main</artifactId>
23-
<version>0.4.0-SNAPSHOT</version>
23+
<version>0.4.0-incubating-SNAPSHOT</version>
2424
<relativePath>../pom.xml</relativePath>
2525
</parent>
2626

2727
<artifactId>livy-assembly</artifactId>
28-
<version>0.4.0-SNAPSHOT</version>
28+
<version>0.4.0-incubating-SNAPSHOT</version>
2929
<packaging>pom</packaging>
3030

3131
<properties>

bin/livy-server

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ start_livy_server() {
9292
LIVY_CLASSPATH="$LIVY_CLASSPATH:$YARN_CONF_DIR"
9393
fi
9494

95-
command="$RUNNER $LIVY_SERVER_JAVA_OPTS -cp $LIVY_CLASSPATH:$CLASSPATH com.cloudera.livy.server.LivyServer"
95+
command="$RUNNER $LIVY_SERVER_JAVA_OPTS -cp $LIVY_CLASSPATH:$CLASSPATH org.apache.livy.server.LivyServer"
9696

9797
if [ $1 = "old" ]; then
9898
exec $command

checkstyle.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<module name="ImportOrder">
103103
<property name="separated" value="true"/>
104104
<property name="ordered" value="true"/>
105-
<property name="groups" value="/^javax?\./,scala,*,com.cloudera.livy"/>
105+
<property name="groups" value="/^javax?\./,scala,*,org.apache.livy"/>
106106
</module>
107107
<module name="MethodParamPad"/>
108108
<module name="AnnotationLocation">

client-common/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818
<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">
1919
<modelVersion>4.0.0</modelVersion>
2020
<parent>
21-
<groupId>com.cloudera.livy</groupId>
21+
<groupId>org.apache.livy</groupId>
2222
<artifactId>livy-main</artifactId>
23-
<version>0.4.0-SNAPSHOT</version>
23+
<version>0.4.0-incubating-SNAPSHOT</version>
2424
</parent>
2525

26-
<groupId>com.cloudera.livy</groupId>
26+
<groupId>org.apache.livy</groupId>
2727
<artifactId>livy-client-common</artifactId>
28-
<version>0.4.0-SNAPSHOT</version>
28+
<version>0.4.0-incubating-SNAPSHOT</version>
2929
<packaging>jar</packaging>
3030

3131
<dependencies>
3232
<dependency>
33-
<groupId>com.cloudera.livy</groupId>
33+
<groupId>org.apache.livy</groupId>
3434
<artifactId>livy-api</artifactId>
3535
<version>${project.version}</version>
3636
</dependency>

client-common/src/main/java/com/cloudera/livy/client/common/AbstractJobHandle.java client-common/src/main/java/org/apache/livy/client/common/AbstractJobHandle.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy.client.common;
18+
package org.apache.livy.client.common;
1919

2020
import java.util.LinkedList;
2121
import java.util.List;
2222
import java.util.concurrent.CopyOnWriteArrayList;
2323

24-
import com.cloudera.livy.JobHandle;
25-
import com.cloudera.livy.annotations.Private;
24+
import org.apache.livy.JobHandle;
25+
import org.apache.livy.annotations.Private;
2626

2727
@Private
2828
public abstract class AbstractJobHandle<T> implements JobHandle<T> {

client-common/src/main/java/com/cloudera/livy/client/common/BufferUtils.java client-common/src/main/java/org/apache/livy/client/common/BufferUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy.client.common;
18+
package org.apache.livy.client.common;
1919

2020
import java.nio.ByteBuffer;
2121

22-
import com.cloudera.livy.annotations.Private;
22+
import org.apache.livy.annotations.Private;
2323

2424
/**
2525
* Utility methods for dealing with byte buffers and byte arrays.

client-common/src/main/java/com/cloudera/livy/client/common/ClientConf.java client-common/src/main/java/org/apache/livy/client/common/ClientConf.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy.client.common;
18+
package org.apache.livy.client.common;
1919

2020
import java.util.HashMap;
2121
import java.util.Iterator;
@@ -30,7 +30,7 @@
3030
import org.slf4j.Logger;
3131
import org.slf4j.LoggerFactory;
3232

33-
import com.cloudera.livy.annotations.Private;
33+
import org.apache.livy.annotations.Private;
3434

3535
/**
3636
* Base class with common functionality for type-safe configuration objects.

client-common/src/main/java/com/cloudera/livy/client/common/HttpMessages.java client-common/src/main/java/org/apache/livy/client/common/HttpMessages.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy.client.common;
18+
package org.apache.livy.client.common;
1919

2020
import java.util.List;
2121
import java.util.Map;
2222

23-
import com.cloudera.livy.JobHandle.State;
24-
import com.cloudera.livy.annotations.Private;
23+
import org.apache.livy.JobHandle.State;
24+
import org.apache.livy.annotations.Private;
2525

2626
/**
2727
* There are the Java representations of the JSON messages used by the client protocol.

client-common/src/main/java/com/cloudera/livy/client/common/Serializer.java client-common/src/main/java/org/apache/livy/client/common/Serializer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy.client.common;
18+
package org.apache.livy.client.common;
1919

2020
import java.io.ByteArrayOutputStream;
2121
import java.nio.ByteBuffer;
@@ -25,7 +25,7 @@
2525
import com.esotericsoftware.kryo.io.Output;
2626
import com.esotericsoftware.shaded.org.objenesis.strategy.StdInstantiatorStrategy;
2727

28-
import com.cloudera.livy.annotations.Private;
28+
import org.apache.livy.annotations.Private;
2929

3030
/**
3131
* Utility class to serialize user data using Kryo.

client-common/src/main/java/com/cloudera/livy/client/common/TestUtils.java client-common/src/main/java/org/apache/livy/client/common/TestUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy.client.common;
18+
package org.apache.livy.client.common;
1919

2020
import java.io.File;
2121
import java.io.IOException;
@@ -24,7 +24,7 @@
2424
import java.util.regex.Matcher;
2525
import java.util.regex.Pattern;
2626

27-
import com.cloudera.livy.annotations.Private;
27+
import org.apache.livy.annotations.Private;
2828

2929
/**
3030
* Utility methods used by Livy tests.

client-common/src/test/java/com/cloudera/livy/client/common/TestAbstractJobHandle.java client-common/src/test/java/org/apache/livy/client/common/TestAbstractJobHandle.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy.client.common;
18+
package org.apache.livy.client.common;
1919

2020
import java.util.concurrent.TimeUnit;
2121

@@ -24,8 +24,8 @@
2424
import static org.junit.Assert.*;
2525
import static org.mockito.Mockito.*;
2626

27-
import com.cloudera.livy.JobHandle;
28-
import com.cloudera.livy.JobHandle.State;
27+
import org.apache.livy.JobHandle;
28+
import org.apache.livy.JobHandle.State;
2929

3030
public class TestAbstractJobHandle {
3131

client-common/src/test/java/com/cloudera/livy/client/common/TestBufferUtils.java client-common/src/test/java/org/apache/livy/client/common/TestBufferUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy.client.common;
18+
package org.apache.livy.client.common;
1919

2020
import java.nio.ByteBuffer;
2121

client-common/src/test/java/com/cloudera/livy/client/common/TestClientConf.java client-common/src/test/java/org/apache/livy/client/common/TestClientConf.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy.client.common;
18+
package org.apache.livy.client.common;
1919

2020
import java.util.Collections;
2121
import java.util.HashMap;

client-common/src/test/java/com/cloudera/livy/client/common/TestHttpMessages.java client-common/src/test/java/org/apache/livy/client/common/TestHttpMessages.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy.client.common;
18+
package org.apache.livy.client.common;
1919

2020
import java.lang.reflect.Constructor;
2121
import java.lang.reflect.Field;
@@ -29,7 +29,7 @@
2929
import org.junit.Test;
3030
import static org.junit.Assert.*;
3131

32-
import com.cloudera.livy.JobHandle.State;
32+
import org.apache.livy.JobHandle.State;
3333

3434
public class TestHttpMessages {
3535

client-common/src/test/java/com/cloudera/livy/client/common/TestSerializer.java client-common/src/test/java/org/apache/livy/client/common/TestSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy.client.common;
18+
package org.apache.livy.client.common;
1919

2020
import java.io.IOException;
2121
import java.nio.ByteBuffer;

client-common/src/test/java/com/cloudera/livy/client/common/TestTestUtils.java client-common/src/test/java/org/apache/livy/client/common/TestTestUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package com.cloudera.livy.client.common;
18+
package org.apache.livy.client.common;
1919

2020
import java.nio.ByteBuffer;
2121

0 commit comments

Comments
 (0)