Эх сурвалжийг харах

[spark] Split sparker into independent jars

Erick Tryzelaar 11 жил өмнө
parent
commit
35664a7

+ 10 - 52
apps/spark/java/pom.xml

@@ -27,13 +27,13 @@
         <version>3.7.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>com.cloudera.sparker</groupId>
-    <artifactId>spark-server</artifactId>
-    <packaging>jar</packaging>
+    <groupId>com.cloudera.hue.sparker</groupId>
+    <artifactId>sparker-main</artifactId>
+    <packaging>pom</packaging>
     <version>3.7.0-SNAPSHOT</version>
 
-    <name>Spark Server</name>
-    <description>Spark Server</description>
+    <name>Spark Main</name>
+    <description>Spark Main</description>
 
     <licenses>
         <license>
@@ -55,9 +55,13 @@
         <slf4j.version>${cdh.slf4j.version}</slf4j.version>
         <jetty.version>8.1.14.v20131031</jetty.version>
         -->
-        <spark.version></spark.version>
     </properties>
 
+    <modules>
+        <module>sparker-server</module>
+        <module>sparker-repl</module>
+    </modules>
+
     <repositories>
         <repository>
             <id>cdh.repo</id>
@@ -87,52 +91,6 @@
         </repository>
     </repositories>
 
-    <dependencies>
-        <!--
-        <dependency>
-            <groupId>org.apache.spark</groupId>
-            <artifactId>spark-core_2.10</artifactId>
-            <version>${spark.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.spark</groupId>
-            <artifactId>spark-bagel_2.10</artifactId>
-            <version>${spark.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.spark</groupId>
-            <artifactId>spark-mllib_2.10</artifactId>
-            <version>${spark.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.spark</groupId>
-            <artifactId>spark-streaming_2.10</artifactId>
-            <version>${spark.version}</version>
-        </dependency>
-        -->
-
-        <dependency>
-            <groupId>org.apache.spark</groupId>
-            <artifactId>spark-repl_2.10</artifactId>
-            <version>1.1.0-cdh5.2.0-SNAPSHOT</version>
-
-
-                <!--
-                ${spark.version}</version>
-                -->
-
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
     <build>
         <pluginManagement>
             <plugins>

+ 30 - 0
apps/spark/java/sparker-repl/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.hue.sparker</groupId>
+        <artifactId>sparker-main</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>3.7.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>sparker-repl</artifactId>
+    <packaging>jar</packaging>
+
+    <properties>
+        <spark.version>1.1.0-cdh5.2.0-SNAPSHOT</spark.version>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.spark</groupId>
+            <artifactId>spark-repl_2.10</artifactId>
+            <version>${spark.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

+ 1 - 1
apps/spark/java/src/main/java/com/cloudera/sparker/SparkerInterpreter.java → apps/spark/java/sparker-repl/src/main/java/com/cloudera/hue/sparker/SparkerInterpreter.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.cloudera.sparker;
+package com.cloudera.hue.sparker;
 
 import org.apache.spark.repl.Main;
 import org.apache.spark.repl.SparkILoop;

+ 93 - 0
apps/spark/java/sparker-server/pom.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<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.hue.sparker</groupId>
+        <artifactId>sparker-main</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>3.7.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>sparker-server</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Spark Server</name>
+    <description>Spark Server</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>9.1.0.v20131115</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>9.1.0.v20131115</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.3</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>com.cloudera.hue.sparker.SparkerMain</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+
+        </plugins>
+
+    </build>
+
+</project>

+ 1 - 1
apps/spark/java/src/main/java/com/cloudera/sparker/Session.java → apps/spark/java/sparker-server/src/main/java/com/cloudera/hue/sparker/Session.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.cloudera.sparker;
+package com.cloudera.hue.sparker;
 
 import java.io.IOException;
 import java.util.List;

+ 1 - 1
apps/spark/java/src/main/java/com/cloudera/sparker/SessionManager.java → apps/spark/java/sparker-server/src/main/java/com/cloudera/hue/sparker/SessionManager.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.cloudera.sparker;
+package com.cloudera.hue.sparker;
 
 import java.io.IOException;
 import java.util.Enumeration;

+ 1 - 1
apps/spark/java/src/main/java/com/cloudera/sparker/SparkerMain.java → apps/spark/java/sparker-server/src/main/java/com/cloudera/hue/sparker/SparkerMain.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.cloudera.sparker;
+package com.cloudera.hue.sparker;
 
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;

+ 1 - 1
apps/spark/java/src/main/java/com/cloudera/sparker/SparkerServlet.java → apps/spark/java/sparker-server/src/main/java/com/cloudera/hue/sparker/SparkerServlet.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.cloudera.sparker;
+package com.cloudera.hue.sparker;
 
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.ObjectWriter;

+ 1 - 1
apps/spark/java/src/main/java/com/cloudera/sparker/SparkerSession.java → apps/spark/java/sparker-server/src/main/java/com/cloudera/hue/sparker/SparkerSession.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.cloudera.sparker;
+package com.cloudera.hue.sparker;
 
 import com.google.common.collect.Lists;