incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cr...@apache.org
Subject [54/58] git commit: Merged in master
Date Tue, 08 Oct 2013 18:00:02 GMT
Merged in master


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/7b116c16
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/7b116c16
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/7b116c16

Branch: refs/heads/blur-console-v2
Commit: 7b116c160cb2366c4553e4164e79a9afc5339577
Parents: 39a1367 5e7edf8
Author: Chris Rohr <crohr@nearinfinity.com>
Authored: Tue Oct 1 17:04:29 2013 -0400
Committer: Chris Rohr <crohr@nearinfinity.com>
Committed: Tue Oct 1 17:04:29 2013 -0400

----------------------------------------------------------------------
 LICENSE                                         | 598 ++------------
 NOTICE                                          | 124 ---
 blur-core/pom.xml                               |   9 +-
 .../org/apache/blur/manager/IndexManager.java   | 101 +--
 .../clusterstatus/ZookeeperClusterStatus.java   |  79 +-
 .../blur/manager/writer/BlurIndexReader.java    |   1 -
 .../manager/writer/SharedMergeScheduler.java    |   8 +-
 .../manager/writer/TransactionRecorder.java     |   7 +
 .../blur/thrift/BlurControllerServer.java       |  19 +-
 .../blur/thrift/ThriftBlurControllerServer.java |  22 +-
 .../blur/thrift/ThriftBlurShardServer.java      |  97 ++-
 .../org/apache/blur/thrift/ThriftServer.java    |  51 +-
 blur-core/src/main/resources/log4j.properties   |  51 --
 .../test/java/org/apache/blur/MiniCluster.java  | 293 +++----
 .../apache/blur/manager/IndexManagerTest.java   |  63 +-
 .../ZookeeperClusterStatusTest.java             |  90 ++-
 .../blur/manager/indexserver/SafeModeTest.java  |  62 +-
 .../manager/writer/BlurIndexReaderTest.java     |   1 +
 .../manager/writer/TransactionRecorderTest.java |  39 +-
 .../org/apache/blur/thrift/BlurClusterTest.java |  76 +-
 blur-gui/pom.xml                                |   2 +-
 blur-jdbc/pom.xml                               |   2 +-
 blur-mapred/pom.xml                             |   2 +-
 .../mapreduce/lib/BlurOutputFormatTest.java     |   2 +-
 blur-query/pom.xml                              |   2 +-
 .../apache/blur/analysis/BaseFieldManager.java  |  22 +-
 .../type/DoubleFieldTypeDefinition.java         |  14 +-
 .../analysis/type/FloatFieldTypeDefinition.java |  13 +-
 .../analysis/type/IntFieldTypeDefinition.java   |  14 +-
 .../analysis/type/LongFieldTypeDefinition.java  |  14 +-
 .../type/NumericFieldTypeDefinition.java        |   3 +
 .../blur/analysis/BaseFieldManagerTest.java     |  18 +-
 .../blur/lucene/search/SuperParserTest.java     |  21 +
 blur-shell/pom.xml                              |   2 +-
 .../blur/shell/CreateSnapshotCommand.java       |  55 ++
 .../apache/blur/shell/ListSnapshotsCommand.java |  70 ++
 .../main/java/org/apache/blur/shell/Main.java   |   6 +-
 .../blur/shell/RemoveSnapshotCommand.java       |  53 ++
 .../org/apache/blur/shell/TermsDataCommand.java | 147 ++++
 blur-store/pom.xml                              |   2 +-
 .../store/refcounter/IndexInputCloser.java      |  14 +-
 .../apache/blur/lucene/warmup/IndexWarmup.java  |  63 +-
 .../store/BlockCacheDirectoryFactoryV2.java     |  70 ++
 .../blur/store/blockcache_v2/BaseCache.java     | 210 +++++
 .../apache/blur/store/blockcache_v2/Cache.java  | 138 ++++
 .../store/blockcache_v2/CacheDirectory.java     | 147 ++++
 .../store/blockcache_v2/CacheIndexInput.java    | 174 ++++
 .../store/blockcache_v2/CacheIndexOutput.java   | 138 ++++
 .../blur/store/blockcache_v2/CacheKey.java      |  89 +++
 .../blur/store/blockcache_v2/CacheValue.java    |  93 +++
 .../store/blockcache_v2/FileNameBlockSize.java  |  24 +
 .../store/blockcache_v2/FileNameFilter.java     |  24 +
 .../cachevalue/BaseCacheValue.java              |  83 ++
 .../cachevalue/ByteArrayCacheValue.java         |  55 ++
 .../cachevalue/UnsafeCacheValue.java            | 106 +++
 .../apache/blur/store/hdfs/HdfsDirectory.java   | 298 +++----
 .../apache/blur/store/hdfs/HdfsIndexInput.java  | 107 +++
 .../apache/blur/store/hdfs/MetricsGroup.java    |  35 +
 .../blur/store/hdfs/SoftlinkHdfsDirectory.java  | 201 +++++
 .../blur/store/BaseDirectoryTestSuite.java      | 375 +++++++++
 .../blur/store/CacheDirectoryTestSuite.java     |  69 ++
 .../store/CacheDirectoryTestSuiteOffHeap.java   |  33 +
 .../store/CacheDirectoryTestSuiteOnHeap.java    |  33 +
 .../apache/blur/store/HdfsDirectoryTest.java    | 206 -----
 .../blur/store/HdfsDirectoryTestSuite.java      |  41 +
 .../store/SoftlinkHdfsDirectoryTestSuite.java   |  43 +
 .../blur/store/blockcache/BlockCacheTest.java   |   4 +-
 .../store/blockcache_v2/CacheDirectoryTest.java | 164 ++++
 .../blockcache_v2/CacheIndexInputTest.java      | 208 +++++
 .../blockcache_v2/CacheIndexOutputTest.java     | 104 +++
 .../cachevalue/ByteArrayCacheValueTest.java     |  68 ++
 .../cachevalue/UnsafeCacheValueTest.java        |  68 ++
 blur-thrift/pom.xml                             |   2 +-
 .../transport/TNonblockingServerSocket.java     |  20 +-
 blur-util/pom.xml                               |  14 +-
 .../org/apache/blur/utils/BlurConstants.java    |   1 +
 .../src/main/resources/blur-default.properties  |   3 +
 .../apache/blur/zookeeper/ZkMiniCluster.java    | 192 +++++
 .../org/apache/blur/zookeeper/ZkUtilsTest.java  |  27 +-
 .../spec/helpers/license_helper_spec.rb         | 107 ---
 contrib/blur-console-old/blur-agent/pom.xml     |  12 +-
 contrib/blur-titan/pom.xml                      |  80 ++
 .../java/org/apache/blur/titan/BlurIndex.java   | 404 ++++++++++
 distribution/pom.xml                            |   2 +-
 distribution/src/assemble/bin.xml               |  15 +-
 distribution/src/assemble/src.xml               |   4 +-
 distribution/src/main/resources/LICENSE-bin.txt | 790 +++++++++++++++++++
 distribution/src/main/resources/LICENSE-src.txt | 304 -------
 .../src/main/resources/NOTICE-bin.base.txt      |   8 +
 distribution/src/main/resources/NOTICE-bin.txt  | 124 +++
 distribution/src/main/resources/NOTICE-src.txt  |   8 -
 .../src/main/resources/license-notes.txt        |   2 +-
 .../main/resources/notices/generate-notice.sh   |   2 +-
 docs/data-model.html                            |  22 +-
 pom.xml                                         |   5 +-
 95 files changed, 5793 insertions(+), 2095 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7b116c16/contrib/blur-console-old/blur-agent/pom.xml
----------------------------------------------------------------------
diff --cc contrib/blur-console-old/blur-agent/pom.xml
index e9e5c23,0000000..965655e
mode 100644,000000..100644
--- a/contrib/blur-console-old/blur-agent/pom.xml
+++ b/contrib/blur-console-old/blur-agent/pom.xml
@@@ -1,223 -1,0 +1,223 @@@
 +<?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/maven-v4_0_0.xsd">
 +	<modelVersion>4.0.0</modelVersion>
 +		<parent>
 +		<groupId>org.apache.blur</groupId>
 +		<artifactId>blur</artifactId>
- 		<version>0.2.0-incubating-SNAPSHOT</version>
++		<version>0.3.0-incubating-SNAPSHOT</version>
 +        <relativePath>../pom.xml</relativePath>
 +	</parent>
 +	<groupId>org.apache.blur</groupId>
 +	<artifactId>blur-agent</artifactId>
 +	<packaging>jar</packaging>
 +	<name>Blur Agent</name>
 +
 +	<dependencies>
 +		<!-- RUNTIME DEPENDENCIES -->
 +		<dependency>
 +			<groupId>org.springframework</groupId>
 +			<artifactId>spring-jdbc</artifactId>
 +			<version>3.0.5.RELEASE</version>
 +			<exclusions>
 +				<exclusion>
 +					<artifactId>aopalliance</artifactId>
 +					<groupId>aopalliance</groupId>
 +				</exclusion>
 +			</exclusions>
 +		</dependency>
 +		<dependency>
 +			<groupId>commons-lang</groupId>
 +			<artifactId>commons-lang</artifactId>
 +			<version>2.6</version>
 +		</dependency>
 +		<dependency>
 +			<groupId>commons-collections</groupId>
 +			<artifactId>commons-collections</artifactId>
 +			<version>3.2.1</version>
 +		</dependency>
 +		<dependency>
 +			<groupId>commons-io</groupId>
 +			<artifactId>commons-io</artifactId>
 +			<version>2.0.1</version>
 +		</dependency>
 +		<dependency>
 +			<groupId>commons-codec</groupId>
 +			<artifactId>commons-codec</artifactId>
 +			<version>1.5</version>
 +		</dependency>
 +		<dependency>
 +			<groupId>commons-dbcp</groupId>
 +			<artifactId>commons-dbcp</artifactId>
 +			<version>1.4</version>
 +		</dependency>
 +		<dependency>
 +			<groupId>mysql</groupId>
 +			<artifactId>mysql-connector-java</artifactId>
 +			<version>5.1.16</version>
 +		</dependency>
 +		<dependency>
 +			<groupId>org.apache.blur</groupId>
 +			<artifactId>blur-thrift</artifactId>
- 			<version>0.2.0-incubating-SNAPSHOT</version>
++			<version>0.3.0-incubating-SNAPSHOT</version>
 +		</dependency>
 +		<dependency>
 +			<groupId>org.apache.blur</groupId>
 +			<artifactId>blur-util</artifactId>
- 			<version>0.2.0-incubating-SNAPSHOT</version>
++			<version>0.3.0-incubating-SNAPSHOT</version>
 +		</dependency>
 +		<dependency>
 +			<groupId>org.slf4j</groupId>
 +			<artifactId>slf4j-log4j12</artifactId>
 +			<version>1.6.1</version>
 +		</dependency>
 +		<dependency>
 +			<groupId>com.googlecode.json-simple</groupId>
 +			<artifactId>json-simple</artifactId>
 +			<version>1.1</version>
 +		</dependency>
 +		<dependency>
 +			<groupId>org.codehaus.jackson</groupId>
 +			<artifactId>jackson-mapper-asl</artifactId>
 +			<version>1.8.1</version>
 +		</dependency>
 +		<dependency>
 +			<groupId>org.codehaus.jackson</groupId>
 +			<artifactId>jackson-core-asl</artifactId>
 +			<version>1.8.1</version>
 +		</dependency>
 +		<dependency>
 +			<groupId>javax.mail</groupId>
 +			<artifactId>mail</artifactId>
 +			<version>1.4</version>
 +		</dependency>
 +		
 +		<!-- COMPILE DEPENDENCIES -->
 +		<dependency>
 +			<groupId>org.slf4j</groupId>
 +			<artifactId>slf4j-api</artifactId>
 +			<version>1.6.1</version>
 +			<scope>compile</scope>
 +		</dependency>
 +		
 +		<!-- TEST DEPENDENCIES -->
 +		<dependency>
 +			<groupId>junit</groupId>
 +			<artifactId>junit</artifactId>
 +			<version>4.9</version>
 +			<scope>test</scope>
 +		</dependency>
 +		<dependency>
 +			<groupId>org.apache.blur</groupId>
 +			<artifactId>blur-core</artifactId>
- 			<version>0.2.0-incubating-SNAPSHOT</version>
++			<version>0.3.0-incubating-SNAPSHOT</version>
 +			<scope>test</scope>
 +		</dependency>
 +		<dependency>
 +			<groupId>org.apache.blur</groupId>
 +			<artifactId>blur-core</artifactId>
- 			<version>0.2.0-incubating-SNAPSHOT</version>
++			<version>0.3.0-incubating-SNAPSHOT</version>
 +			<type>test-jar</type>
 +			<scope>test</scope>
 +		</dependency>
 +		<dependency>
 +			<groupId>org.apache.hadoop</groupId>
 +			<artifactId>hadoop-test</artifactId>
 +			<version>1.2.1</version>
 +			<scope>test</scope>
 +		</dependency>
 +		<dependency>
 +			<groupId>org.apache.blur</groupId>
 +			<artifactId>blur-store</artifactId>
- 			<version>0.2.0-incubating-SNAPSHOT</version>
++			<version>0.3.0-incubating-SNAPSHOT</version>
 +			<scope>test</scope>
 +		</dependency>
 +		<dependency>
 +			<groupId>org.subethamail</groupId>
 +			<artifactId>subethasmtp</artifactId>
 +			<version>3.1.7</version>
 +			<scope>test</scope>
 +		</dependency>
 +		<dependency>
 +			<groupId>org.apache.vysper</groupId>
 +			<artifactId>vysper-core</artifactId>
 +			<version>0.7</version>
 +			<scope>test</scope>
 +		</dependency>
 +		<dependency>
 +        	<groupId>com.sun.jersey</groupId>
 +            <artifactId>jersey-core</artifactId>
 +            <version>1.14</version>
 +            <scope>test</scope>
 +       	</dependency>
 +		            
 +	</dependencies>
 +
 +	<repositories>
 +		<repository>
 +			<id>libdir</id>
 +			<url>file://${basedir}/lib</url>
 +		</repository>
 +	</repositories>
 +
 +	<build>
 +		<plugins>
 +			<plugin>
 +				<groupId>org.apache.maven.plugins</groupId>
 +				<artifactId>maven-compiler-plugin</artifactId>
 +				<version>2.0.2</version>
 +				<configuration>
 +					<source>1.6</source>
 +					<target>1.6</target>
 +				</configuration>
 +			</plugin>
 +			<plugin>
 +				<groupId>org.apache.maven.plugins</groupId>
 +				<artifactId>maven-eclipse-plugin</artifactId>
 +				<version>2.9</version>
 +				<configuration>
 +					<downloadSources>true</downloadSources>
 +					<downloadJavadocs>true</downloadJavadocs>
 +				</configuration>
 +			</plugin>
 +			<plugin>
 +				<groupId>org.apache.maven.plugins</groupId>
 +				<artifactId>maven-dependency-plugin</artifactId>
 +				<version>2.3</version>
 +				<executions>
 +					<execution>
 +						<id>copy-dependencies</id>
 +						<phase>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>
 +		</plugins>
 +	</build>
 +</project>


Mime
View raw message