Skip to content

Commit

Permalink
LIVY-375. Change Livy code package name to org.apache.livy
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jerryshao committed Jul 5, 2017
1 parent cb5b8aa commit 412ccc8
Show file tree
Hide file tree
Showing 230 changed files with 687 additions and 703 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ And add the Livy client dependency:
To be able to compile code that uses Spark APIs, also add the correspondent Spark dependencies.

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

.. code:: java
Expand Down
8 changes: 4 additions & 4 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
<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>com.cloudera.livy</groupId>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.4.0-SNAPSHOT</version>
<version>0.4.0-incubating-SNAPSHOT</version>
</parent>

<groupId>com.cloudera.livy</groupId>
<groupId>org.apache.livy</groupId>
<artifactId>livy-api</artifactId>
<version>0.4.0-SNAPSHOT</version>
<version>0.4.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy;
package org.apache.livy;

import java.io.Serializable;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy;
package org.apache.livy;

import java.io.File;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy;
package org.apache.livy;

import java.util.List;
import java.util.concurrent.Future;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy;
package org.apache.livy;

import java.io.File;
import java.net.URI;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy;
package org.apache.livy;

import java.io.IOException;
import java.io.InputStreamReader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
* limitations under the License.
*/

package com.cloudera.livy;
package org.apache.livy;

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

import com.cloudera.livy.annotations.Private;
import org.apache.livy.annotations.Private;

/**
* A factory for Livy clients. Client implementations can register themselves by using the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy.annotations;
package org.apache.livy.annotations;

import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy;
package org.apache.livy;

import java.io.File;
import java.net.URI;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy;
package org.apache.livy;

import java.net.URI;
import java.util.Properties;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.apache.livy.TestClientFactory
6 changes: 3 additions & 3 deletions assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
<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>com.cloudera.livy</groupId>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.4.0-SNAPSHOT</version>
<version>0.4.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>livy-assembly</artifactId>
<version>0.4.0-SNAPSHOT</version>
<version>0.4.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion bin/livy-server
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ start_livy_server() {
LIVY_CLASSPATH="$LIVY_CLASSPATH:$YARN_CONF_DIR"
fi

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

if [ $1 = "old" ]; then
exec $command
Expand Down
2 changes: 1 addition & 1 deletion checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<module name="ImportOrder">
<property name="separated" value="true"/>
<property name="ordered" value="true"/>
<property name="groups" value="/^javax?\./,scala,*,com.cloudera.livy"/>
<property name="groups" value="/^javax?\./,scala,*,org.apache.livy"/>
</module>
<module name="MethodParamPad"/>
<module name="AnnotationLocation">
Expand Down
10 changes: 5 additions & 5 deletions client-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
<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>com.cloudera.livy</groupId>
<groupId>org.apache.livy</groupId>
<artifactId>livy-main</artifactId>
<version>0.4.0-SNAPSHOT</version>
<version>0.4.0-incubating-SNAPSHOT</version>
</parent>

<groupId>com.cloudera.livy</groupId>
<groupId>org.apache.livy</groupId>
<artifactId>livy-client-common</artifactId>
<version>0.4.0-SNAPSHOT</version>
<version>0.4.0-incubating-SNAPSHOT</version>
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>com.cloudera.livy</groupId>
<groupId>org.apache.livy</groupId>
<artifactId>livy-api</artifactId>
<version>${project.version}</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
* limitations under the License.
*/

package com.cloudera.livy.client.common;
package org.apache.livy.client.common;

import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;

import com.cloudera.livy.JobHandle;
import com.cloudera.livy.annotations.Private;
import org.apache.livy.JobHandle;
import org.apache.livy.annotations.Private;

@Private
public abstract class AbstractJobHandle<T> implements JobHandle<T> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
* limitations under the License.
*/

package com.cloudera.livy.client.common;
package org.apache.livy.client.common;

import java.nio.ByteBuffer;

import com.cloudera.livy.annotations.Private;
import org.apache.livy.annotations.Private;

/**
* Utility methods for dealing with byte buffers and byte arrays.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy.client.common;
package org.apache.livy.client.common;

import java.util.HashMap;
import java.util.Iterator;
Expand All @@ -30,7 +30,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.cloudera.livy.annotations.Private;
import org.apache.livy.annotations.Private;

/**
* Base class with common functionality for type-safe configuration objects.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
* limitations under the License.
*/

package com.cloudera.livy.client.common;
package org.apache.livy.client.common;

import java.util.List;
import java.util.Map;

import com.cloudera.livy.JobHandle.State;
import com.cloudera.livy.annotations.Private;
import org.apache.livy.JobHandle.State;
import org.apache.livy.annotations.Private;

/**
* There are the Java representations of the JSON messages used by the client protocol.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy.client.common;
package org.apache.livy.client.common;

import java.io.ByteArrayOutputStream;
import java.nio.ByteBuffer;
Expand All @@ -25,7 +25,7 @@
import com.esotericsoftware.kryo.io.Output;
import com.esotericsoftware.shaded.org.objenesis.strategy.StdInstantiatorStrategy;

import com.cloudera.livy.annotations.Private;
import org.apache.livy.annotations.Private;

/**
* Utility class to serialize user data using Kryo.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy.client.common;
package org.apache.livy.client.common;

import java.io.File;
import java.io.IOException;
Expand All @@ -24,7 +24,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import com.cloudera.livy.annotations.Private;
import org.apache.livy.annotations.Private;

/**
* Utility methods used by Livy tests.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy.client.common;
package org.apache.livy.client.common;

import java.util.concurrent.TimeUnit;

Expand All @@ -24,8 +24,8 @@
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;

import com.cloudera.livy.JobHandle;
import com.cloudera.livy.JobHandle.State;
import org.apache.livy.JobHandle;
import org.apache.livy.JobHandle.State;

public class TestAbstractJobHandle {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy.client.common;
package org.apache.livy.client.common;

import java.nio.ByteBuffer;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy.client.common;
package org.apache.livy.client.common;

import java.util.Collections;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy.client.common;
package org.apache.livy.client.common;

import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
Expand All @@ -29,7 +29,7 @@
import org.junit.Test;
import static org.junit.Assert.*;

import com.cloudera.livy.JobHandle.State;
import org.apache.livy.JobHandle.State;

public class TestHttpMessages {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy.client.common;
package org.apache.livy.client.common;

import java.io.IOException;
import java.nio.ByteBuffer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package com.cloudera.livy.client.common;
package org.apache.livy.client.common;

import java.nio.ByteBuffer;

Expand Down
Loading

0 comments on commit 412ccc8

Please sign in to comment.