You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by st...@apache.org on 2015/04/17 20:29:55 UTC
svn commit: r1674375 - in /oodt/trunk: ./ cluster-tools/ resource/
resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/
resource/src/main/java/org/apache/oodt/cas/resource/examples/
resource/src/main/java/org/apache/oodt/cas/resource/monitor/ ...
Author: starchmd
Date: Fri Apr 17 18:29:54 2015
New Revision: 1674375
URL: http://svn.apache.org/r1674375
Log:
Fix for OODT-832 moving streaming items to streaming component contributed by user starchmd@umich.edu This closes #18.
Added:
oodt/trunk/streaming/
oodt/trunk/streaming/cluster-tools/
- copied from r1674372, oodt/trunk/cluster-tools/
oodt/trunk/streaming/pom.xml
oodt/trunk/streaming/resource/
oodt/trunk/streaming/resource/pom.xml
oodt/trunk/streaming/resource/src/
oodt/trunk/streaming/resource/src/main/
oodt/trunk/streaming/resource/src/main/java/
oodt/trunk/streaming/resource/src/main/java/org/
oodt/trunk/streaming/resource/src/main/java/org/apache/
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/MesosBatchManager.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/MesosBatchManager.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/MesosBatchManagerFactory.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/MesosBatchManagerFactory.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/ResourceExecutor.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/ResourceExecutor.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/examples/
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/examples/NoSparkFilePalindromeExample.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/NoSparkFilePalindromeExample.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/examples/PalindromeUtils.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/PalindromeUtils.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/examples/SparkFilePalindromeExample.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/SparkFilePalindromeExample.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/examples/StreamingPalindromeExample.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/StreamingPalindromeExample.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/monitor/
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MesosMonitor.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MesosMonitor.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MesosMonitorFactory.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MesosMonitorFactory.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/ResourceMesosScheduler.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/ResourceMesosScheduler.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/ResourceMesosSchedulerFactory.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/ResourceMesosSchedulerFactory.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SparkScheduler.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SparkScheduler.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SparkSchedulerFactory.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SparkSchedulerFactory.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/structs/
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/structs/SparkInstance.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/SparkInstance.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/structs/StreamingInstance.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/StreamingInstance.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/MesosFrameworkException.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/MesosFrameworkException.java
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/util/
oodt/trunk/streaming/resource/src/main/java/org/apache/oodt/cas/resource/util/MesosUtilities.java
- copied unchanged from r1674370, oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/MesosUtilities.java
oodt/trunk/streaming/resource/src/main/scala/
oodt/trunk/streaming/resource/src/main/scala/org/
oodt/trunk/streaming/resource/src/main/scala/org/apache/
oodt/trunk/streaming/resource/src/main/scala/org/apache/oodt/
oodt/trunk/streaming/resource/src/main/scala/org/apache/oodt/cas/
oodt/trunk/streaming/resource/src/main/scala/org/apache/oodt/cas/resource/
oodt/trunk/streaming/resource/src/main/scala/org/apache/oodt/cas/resource/examples/
oodt/trunk/streaming/resource/src/main/scala/org/apache/oodt/cas/resource/examples/ScalaHelloWorld.scala
- copied unchanged from r1674370, oodt/trunk/resource/src/main/scala/org/apache/oodt/cas/resource/examples/ScalaHelloWorld.scala
oodt/trunk/streaming/resource/src/test/
oodt/trunk/streaming/resource/src/test/java/
oodt/trunk/streaming/resource/src/test/java/org/
oodt/trunk/streaming/resource/src/test/java/org/apache/
oodt/trunk/streaming/resource/src/test/java/org/apache/oodt/
oodt/trunk/streaming/resource/src/test/java/org/apache/oodt/cas/
oodt/trunk/streaming/resource/src/test/java/org/apache/oodt/cas/resource/
oodt/trunk/streaming/resource/src/test/java/org/apache/oodt/cas/resource/util/
oodt/trunk/streaming/resource/src/test/java/org/apache/oodt/cas/resource/util/TestMesosUtilities.java
- copied unchanged from r1674370, oodt/trunk/resource/src/test/java/org/apache/oodt/cas/resource/util/TestMesosUtilities.java
Removed:
oodt/trunk/cluster-tools/
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/MesosBatchManager.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/MesosBatchManagerFactory.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/batchmgr/ResourceExecutor.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/NoSparkFilePalindromeExample.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/PalindromeUtils.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/SparkFilePalindromeExample.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/examples/StreamingPalindromeExample.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MesosMonitor.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/monitor/MesosMonitorFactory.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/ResourceMesosScheduler.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/ResourceMesosSchedulerFactory.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SparkScheduler.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/scheduler/SparkSchedulerFactory.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/SparkInstance.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/StreamingInstance.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/structs/exceptions/MesosFrameworkException.java
oodt/trunk/resource/src/main/java/org/apache/oodt/cas/resource/util/MesosUtilities.java
oodt/trunk/resource/src/main/scala/
oodt/trunk/resource/src/test/java/org/apache/oodt/cas/resource/util/TestMesosUtilities.java
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/resource/pom.xml
Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1674375&r1=1674374&r2=1674375&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Fri Apr 17 18:29:54 2015
@@ -2,6 +2,8 @@ Apache OODT Change Log
======================
Release 0.9 - Current Development
+* OODT-832 Move streaming items to seperate top-level component (starchmd)
+
* OODT-831 CAS PGE adapter framework build failed (Aditya Dhulipala via mattmann)
* OODT-830 Queue Assertion failure of XmlQueueRepository under CAS Resource Manager (Aditya Dhulipala via mattmann)
Modified: oodt/trunk/resource/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/resource/pom.xml?rev=1674375&r1=1674374&r2=1674375&view=diff
==============================================================================
--- oodt/trunk/resource/pom.xml (original)
+++ oodt/trunk/resource/pom.xml Fri Apr 17 18:29:54 2015
@@ -81,73 +81,6 @@ the License.
</build>
<dependencies>
<dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>2.10.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-core_2.10</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-streaming_2.10</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <version>2.4.0</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-guice</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>1.14</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- <version>1.14</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>1.14</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>1.14</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-guice</artifactId>
- <version>1.14</version>
- </dependency>
- <dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-metadata</artifactId>
<version>${project.parent.version}</version>
@@ -230,11 +163,5 @@ the License.
<version>3.8.2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.mesos</groupId>
- <artifactId>mesos</artifactId>
- <version>0.21.0</version>
- <classifier>shaded-protobuf</classifier>
- </dependency>
</dependencies>
</project>
Added: oodt/trunk/streaming/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/streaming/pom.xml?rev=1674375&view=auto
==============================================================================
--- oodt/trunk/streaming/pom.xml (added)
+++ oodt/trunk/streaming/pom.xml Fri Apr 17 18:29:54 2015
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements. See the NOTICE.txt 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-core</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ <relativePath>../core/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-streaming</artifactId>
+ <name>Apache OODT Streaming</name>
+ <packaging>pom</packaging>
+ <description>
+ Apache OODT Streaming components
+ </description>
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/tags/0.9-SNAPSHOT/streaming</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/tags/0.9-SNAPSHOT/streaming</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/tags/0.9-SNAPSHOT/streaming</url>
+ </scm>
+
+ <modules>
+ <module>resource</module>
+ </modules>
+</project>
Added: oodt/trunk/streaming/resource/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/streaming/resource/pom.xml?rev=1674375&view=auto
==============================================================================
--- oodt/trunk/streaming/resource/pom.xml (added)
+++ oodt/trunk/streaming/resource/pom.xml Fri Apr 17 18:29:54 2015
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
+license agreements. See the NOTICE.txt 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>oodt-streaming</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>cas-streaming-resource</artifactId>
+ <name>Catalog and Archive Resource Management Component Streaming package</name>
+ <description>This project supplies the needed additions to allow the resource manager to handle streaming data.</description>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/tags/0.9-SNAPSHOT/streaming/resource</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/tags/0.9-SNAPSHOT/streaming/resource</developerConnection>
+ <url>http://svn.apache.org/viewvc/oodt/tags/0.9-SNAPSHOT/streaming/resource</url>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <useSystemClassLoader>false</useSystemClassLoader>
+ <systemProperties>
+ <property>
+ <name>java.util.logging.config.file</name>
+ <value>${basedir}/src/test/resources/test.logging.properties</value>
+ </property>
+ </systemProperties>
+ <forkedProcessTimeoutInSeconds>0</forkedProcessTimeoutInSeconds>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.oodt</groupId>
+ <artifactId>cas-resource</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.10.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-core_2.10</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-streaming_2.10</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>2.4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-guice</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ <version>1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ <version>1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-guice</artifactId>
+ <version>1.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mesos</groupId>
+ <artifactId>mesos</artifactId>
+ <version>0.21.0</version>
+ <classifier>shaded-protobuf</classifier>
+ </dependency>
+ </dependencies>
+</project>