Permalink
Browse files

Merge remote branch 'original/master'

  • Loading branch information...
2 parents 7502fa8 + d666bd9 commit 4418660fbba2c871ed412a83464738325025b841 Roy Camp committed Jan 9, 2012
Showing with 72 additions and 47,687 deletions.
  1. +1 −0 .gitignore
  2. +0 −62 build.xml
  3. +71 −0 pom.xml
  4. +0 −325 src/java/org/apache/cassandra/thrift/AuthenticationException.java
  5. +0 −370 src/java/org/apache/cassandra/thrift/AuthenticationRequest.java
  6. +0 −325 src/java/org/apache/cassandra/thrift/AuthorizationException.java
  7. +0 −31,214 src/java/org/apache/cassandra/thrift/Cassandra.java
  8. +0 −2,492 src/java/org/apache/cassandra/thrift/CfDef.java
  9. +0 −617 src/java/org/apache/cassandra/thrift/Column.java
  10. +0 −623 src/java/org/apache/cassandra/thrift/ColumnDef.java
  11. +0 −608 src/java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
  12. +0 −430 src/java/org/apache/cassandra/thrift/ColumnParent.java
  13. +0 −536 src/java/org/apache/cassandra/thrift/ColumnPath.java
  14. +0 −47 src/java/org/apache/cassandra/thrift/Compression.java
  15. +0 −104 src/java/org/apache/cassandra/thrift/ConsistencyLevel.java
  16. +0 −27 src/java/org/apache/cassandra/thrift/Constants.java
  17. +0 −426 src/java/org/apache/cassandra/thrift/CounterColumn.java
  18. +0 −463 src/java/org/apache/cassandra/thrift/CounterSuperColumn.java
  19. +0 −557 src/java/org/apache/cassandra/thrift/CqlResult.java
  20. +0 −47 src/java/org/apache/cassandra/thrift/CqlResultType.java
  21. +0 −466 src/java/org/apache/cassandra/thrift/CqlRow.java
  22. +0 −512 src/java/org/apache/cassandra/thrift/Deletion.java
  23. +0 −558 src/java/org/apache/cassandra/thrift/IndexClause.java
  24. +0 −544 src/java/org/apache/cassandra/thrift/IndexExpression.java
  25. +0 −53 src/java/org/apache/cassandra/thrift/IndexOperator.java
  26. +0 −41 src/java/org/apache/cassandra/thrift/IndexType.java
  27. +0 −326 src/java/org/apache/cassandra/thrift/InvalidRequestException.java
  28. +0 −426 src/java/org/apache/cassandra/thrift/KeyCount.java
  29. +0 −719 src/java/org/apache/cassandra/thrift/KeyRange.java
  30. +0 −470 src/java/org/apache/cassandra/thrift/KeySlice.java
  31. +0 −869 src/java/org/apache/cassandra/thrift/KsDef.java
  32. +0 −414 src/java/org/apache/cassandra/thrift/Mutation.java
  33. +0 −227 src/java/org/apache/cassandra/thrift/NotFoundException.java
  34. +0 −227 src/java/org/apache/cassandra/thrift/SchemaDisagreementException.java
  35. +0 −459 src/java/org/apache/cassandra/thrift/SlicePredicate.java
  36. +0 −637 src/java/org/apache/cassandra/thrift/SliceRange.java
  37. +0 −469 src/java/org/apache/cassandra/thrift/SuperColumn.java
  38. +0 −227 src/java/org/apache/cassandra/thrift/TimedOutException.java
  39. +0 −543 src/java/org/apache/cassandra/thrift/TokenRange.java
  40. +0 −227 src/java/org/apache/cassandra/thrift/UnavailableException.java
View
@@ -0,0 +1 @@
+target
View
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- 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.
- -->
-
-<!--
- Before you can run these subtargets directly, you need
- to call at top-level: ant deploy-contrib compile-core-test
- -->
-<project name="flume-cassandra" default="jar">
- <property name="javac.debug" value="on"/>
- <property name="flume.base" value="../.."/>
-
- <path id="classpath">
- <!-- in case we are running in dev env -->
- <pathelement location="${flume.base}/build/classes"/>
- <fileset dir="${flume.base}/lib">
- <include name="**/slf4j-*.jar" />
- <include name="**/libthrift.jar" />
- </fileset>
- <fileset dir="./lib">
- <include name="**/jug*.jar" />
- </fileset>
- <!-- in case we are running in release env -->
- <fileset dir="${flume.base}">
- <include name="flume-*.jar" />
- </fileset>
- <pathelement location="${flume.base}/lib/"/>
- </path>
-
- <target name="jar">
- <mkdir dir="build"/>
- <mkdir dir="build/classes"/>
-
- <javac srcdir="./src/java" destdir="build/classes" debug="${javac.debug}">
- <classpath refid="classpath"/>
- </javac>
-
- <jar jarfile="cassandra_plugin.jar" basedir="build/classes"/>
- </target>
-
- <target name="clean">
- <echo message="Cleaning generated files and stuff"/>
- <delete dir="build" />
- <delete file="cassandra_plugin.jar" />
- </target>
-
-</project>
View
71 pom.xml
@@ -0,0 +1,71 @@
+<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>
+
+ <groupId>org.apache.flume</groupId>
+ <artifactId>flume-cassandra-plugin</artifactId>
+ <version>1.0.0</version>
+ <packaging>jar</packaging>
+
+ <name>Flume Cassandra Plugin</name>
+ <url>http://maven.apache.org</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <directory>target</directory>
+ <outputDirectory>target/classes</outputDirectory>
+
+ <sourceDirectory>src/java</sourceDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>cassandra-all</artifactId>
+ <version>1.0.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.safehaus.jug</groupId>
+ <artifactId>jug</artifactId>
+ <version>2.0.0</version>
+ <classifier>asl</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>com.cloudera.flume</groupId>
+ <artifactId>flume</artifactId>
+ <version>0.9.3-CDH3B4</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.3.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>cdh repository</id>
+ <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
+ </repository>
+ </repositories>
+</project>
Oops, something went wrong.

0 comments on commit 4418660

Please sign in to comment.