HBASE-1588 Rig our build to support our new contribs -- stargate and THBase/ITHBase -- made the package and javadoc targets work for our contribs
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@789422 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack
parent
5666134635
commit
cb9d79ed72
|
|
@ -423,8 +423,13 @@
|
|||
<link href="${javadoc.link.java}"/>
|
||||
<classpath >
|
||||
<path refid="classpath" />
|
||||
<fileset dir="src/contrib/">
|
||||
<include name="*/lib/*.jar" />
|
||||
</fileset>
|
||||
<pathelement path="${java.class.path}"/>
|
||||
</classpath>
|
||||
<packageset dir="src/contrib/transactional/src/java"/>
|
||||
<packageset dir="src/contrib/stargate/src/java"/>
|
||||
</javadoc>
|
||||
</target>
|
||||
|
||||
|
|
|
|||
|
|
@ -85,19 +85,23 @@
|
|||
</war>
|
||||
</target>
|
||||
|
||||
<target name="jar" depends="compile-jar">
|
||||
<jar jarfile="${build.dir}/${jar.file}" basedir="${build.classes}"/>
|
||||
</target>
|
||||
|
||||
<target name="package" depends="jar, war">
|
||||
<mkdir dir="${dist.dir}"/>
|
||||
<copy todir="${dist.dir}/lib" overwrite="true">
|
||||
<!--Override ../build-contrib.xml package-->
|
||||
<target name="package" depends="jar, war" unless="skip.contrib">
|
||||
<mkdir dir="${dist.dir}/contrib/${name}"/>
|
||||
<copy todir="${dist.dir}/contrib/${name}" includeEmptyDirs="false" flatten="true">
|
||||
<fileset dir="${build.dir}">
|
||||
<include name="hbase-${version}-${name}.jar" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<copy todir="${dist.dir}/contrib/${name}" includeEmptyDirs="false" flatten="true">
|
||||
<fileset dir="${build.dir}">
|
||||
<include name="hbase-${version}-${name}.war" />
|
||||
</fileset>
|
||||
</copy>
|
||||
<mkdir dir="${dist.dir}/contrib/${name}/lib"/>
|
||||
<copy todir="${dist.dir}/contrib/${name}/lib" overwrite="true">
|
||||
<fileset dir="${lib.dir}"/>
|
||||
</copy>
|
||||
<copy todir="${dist.dir}" overwrite="true"
|
||||
file="${build.dir}/${jar.file}"/>
|
||||
<copy todir="${dist.dir}" overwrite="true"
|
||||
file="${build.dir}/${war.file}"/>
|
||||
</target>
|
||||
|
||||
<target name="clean-contrib">
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ public class Cluster {
|
|||
|
||||
/**
|
||||
* Add a node to the cluster
|
||||
* @param name the service location in 'host:port' format
|
||||
* @param node the service location in 'host:port' format
|
||||
*/
|
||||
public Cluster add(String node) {
|
||||
nodes.add(node);
|
||||
|
|
@ -66,7 +66,7 @@ public class Cluster {
|
|||
|
||||
/**
|
||||
* Remove a node from the cluster
|
||||
* @param name the service location in 'host:port' format
|
||||
* @param node the service location in 'host:port' format
|
||||
*/
|
||||
public Cluster remove(String node) {
|
||||
nodes.remove(node);
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ public class ColumnSchemaModel implements Serializable {
|
|||
}
|
||||
|
||||
/**
|
||||
* @param the table name
|
||||
* @param name the table name
|
||||
*/
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ public class TableInfoModel implements Serializable, IProtobufWrapper {
|
|||
}
|
||||
|
||||
/**
|
||||
* @param the table name
|
||||
* @param name the table name
|
||||
*/
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
<?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="transactional" default="jar">
|
||||
<import file="../build-contrib.xml"/>
|
||||
</project>
|
||||
|
|
@ -63,7 +63,6 @@ public class IndexSpecification implements Writable {
|
|||
* @param indexedColumns
|
||||
* @param additionalColumns
|
||||
* @param keyGenerator
|
||||
* @param keyComparator
|
||||
*/
|
||||
public IndexSpecification(String indexId, byte[][] indexedColumns,
|
||||
byte[][] additionalColumns, IndexKeyGenerator keyGenerator) {
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ public interface TransactionalRegionInterface extends HRegionInterface {
|
|||
* Put an array of puts into the specified region
|
||||
* @param regionName
|
||||
* @param puts
|
||||
* @return
|
||||
* @return result
|
||||
* @throws IOException
|
||||
*/
|
||||
public int put(long transactionId, final byte[] regionName, final Put [] puts)
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ public class IndexMaintenanceUtils {
|
|||
* Ask if this update does apply to the index.
|
||||
*
|
||||
* @param indexSpec
|
||||
* @param b
|
||||
* @param columnValues
|
||||
* @return true if possibly apply.
|
||||
*/
|
||||
public static boolean doesApplyToIndex(final IndexSpecification indexSpec,
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ public class TransactionalRegion extends HRegion {
|
|||
* Add a write to the transaction. Does not get applied until commit process.
|
||||
*
|
||||
* @param transactionId
|
||||
* @param b
|
||||
* @param put
|
||||
* @throws IOException
|
||||
*/
|
||||
public void put(final long transactionId, final Put put) throws IOException {
|
||||
|
|
@ -313,8 +313,7 @@ public class TransactionalRegion extends HRegion {
|
|||
* FIXME, not sure about this approach
|
||||
*
|
||||
* @param transactionId
|
||||
* @param row
|
||||
* @param timestamp
|
||||
* @param delete
|
||||
* @throws IOException
|
||||
*/
|
||||
public void delete(final long transactionId, Delete delete)
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ public class TransactionalRegionServer extends HRegionServer implements
|
|||
private final CleanOldTransactionsChore cleanOldTransactionsThread;
|
||||
|
||||
/**
|
||||
* @param address
|
||||
* @param conf
|
||||
* @throws IOException
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue