HBASE-6553 Remove Avro Gateway

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1374484 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2012-08-18 00:31:55 +00:00
parent 1908123fbe
commit b7f7c4ac09
3 changed files with 3 additions and 67 deletions

View File

@ -87,7 +87,6 @@ if [ $# = 0 ]; then
echo " rest run an HBase REST server" echo " rest run an HBase REST server"
echo " thrift run the HBase Thrift server" echo " thrift run the HBase Thrift server"
echo " thrift2 run the HBase Thrift2 server" echo " thrift2 run the HBase Thrift2 server"
echo " avro run an HBase Avro server"
echo "" echo ""
echo "PACKAGE MANAGEMENT" echo "PACKAGE MANAGEMENT"
echo " classpath dump hbase CLASSPATH" echo " classpath dump hbase CLASSPATH"
@ -313,11 +312,6 @@ elif [ "$COMMAND" = "rest" ] ; then
if [ "$1" != "stop" ] ; then if [ "$1" != "stop" ] ; then
HBASE_OPTS="$HBASE_OPTS $HBASE_REST_OPTS" HBASE_OPTS="$HBASE_OPTS $HBASE_REST_OPTS"
fi fi
elif [ "$COMMAND" = "avro" ] ; then
CLASS='org.apache.hadoop.hbase.avro.AvroServer'
if [ "$1" != "stop" ] ; then
HBASE_OPTS="$HBASE_OPTS $HBASE_AVRO_OPTS"
fi
elif [ "$COMMAND" = "zookeeper" ] ; then elif [ "$COMMAND" = "zookeeper" ] ; then
CLASS='org.apache.hadoop.hbase.zookeeper.HQuorumPeer' CLASS='org.apache.hadoop.hbase.zookeeper.HQuorumPeer'
if [ "$1" != "stop" ] ; then if [ "$1" != "stop" ] ; then

View File

@ -57,24 +57,6 @@
</testResource> </testResource>
</testResources> </testResources>
<plugins> <plugins>
<plugin>
<groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId>
<version>${avro.version}</version>
<executions>
<execution>
<id>generate-avro-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>schema</goal>
<goal>protocol</goal>
</goals>
</execution>
</executions>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
</configuration>
</plugin>
<!-- Run with -Dmaven.test.skip.exec=true to build -tests.jar without running <!-- Run with -Dmaven.test.skip.exec=true to build -tests.jar without running
tests (this is needed for upstream projects whose tests need this jar simply for tests (this is needed for upstream projects whose tests need this jar simply for
compilation) --> compilation) -->
@ -252,20 +234,6 @@
<ignore/> <ignore/>
</action> </action>
</pluginExecution> </pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId>
<versionRange>[1.5.3,)</versionRange>
<goals>
<goal>schema</goal>
<goal>protocol</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore/>
</action>
</pluginExecution>
</pluginExecutions> </pluginExecutions>
</lifecycleMappingMetadata> </lifecycleMappingMetadata>
</configuration> </configuration>
@ -350,26 +318,6 @@
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
<exclusions>
<exclusion>
<groupId>com.thoughtworks.paranamer</groupId>
<artifactId>paranamer</artifactId>
</exclusion>
<exclusion>
<groupId>com.thoughtworks.paranamer</groupId>
<artifactId>paranamer-ant</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-ipc</artifactId>
<version>${avro.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>

10
pom.xml
View File

@ -360,7 +360,7 @@
<!--Pass -DskipJavadoc=true or -DskipJavadoc on command-line to skip javadoc building--> <!--Pass -DskipJavadoc=true or -DskipJavadoc on command-line to skip javadoc building-->
<skip>${skipJavadoc}</skip> <skip>${skipJavadoc}</skip>
<docfilessubdirs>true</docfilessubdirs> <docfilessubdirs>true</docfilessubdirs>
<excludePackageNames>org.apache.hadoop.hbase.protobuf.generated.*:org.apache.hadoop.hbase.avro.generated.*:org.apache.hadoop.hbase.thrift.generated:org.apache.hadoop.hbase.rest.generated</excludePackageNames> <excludePackageNames>org.apache.hadoop.hbase.protobuf.generated.*:org.apache.hadoop.hbase.thrift.generated:org.apache.hadoop.hbase.rest.generated</excludePackageNames>
<debug>true</debug> <debug>true</debug>
<maxmemory>2g</maxmemory> <maxmemory>2g</maxmemory>
<verbose>true</verbose> <verbose>true</verbose>
@ -481,11 +481,6 @@
</configuration> </configuration>
</plugin> </plugin>
<!-- Build plugins --> <!-- Build plugins -->
<plugin>
<groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId>
<version>${avro.version}</version>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
@ -797,7 +792,6 @@
<!-- Dependencies --> <!-- Dependencies -->
<hadoop-two.version>2.0.0-alpha</hadoop-two.version> <hadoop-two.version>2.0.0-alpha</hadoop-two.version>
<hadoop-one.version>1.0.3</hadoop-one.version> <hadoop-one.version>1.0.3</hadoop-one.version>
<avro.version>1.5.3</avro.version>
<commons-cli.version>1.2</commons-cli.version> <commons-cli.version>1.2</commons-cli.version>
<commons-codec.version>1.4</commons-codec.version> <commons-codec.version>1.4</commons-codec.version>
<commons-httpclient.version>3.1</commons-httpclient.version> <commons-httpclient.version>3.1</commons-httpclient.version>
@ -1036,7 +1030,7 @@
<artifactId>servlet-api-2.5</artifactId> <artifactId>servlet-api-2.5</artifactId>
<version>${jetty.jspapi.version}</version> <version>${jetty.jspapi.version}</version>
</dependency> </dependency>
<!-- While jackson is also a dependency of both jersey and avro, these <!-- While jackson is also a dependency of jersey it
can bring in jars from different, incompatible versions. We force can bring in jars from different, incompatible versions. We force
the same version with these dependencies --> the same version with these dependencies -->
<dependency> <dependency>