Skip to content

Commit

Permalink
Update kafka from 0.7.0 to 0.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@yozhao
yozhao committed Apr 19, 2014
1 parent bf75b45 commit 26d523e
Show file tree
Hide file tree
Showing 22 changed files with 366 additions and 15,971 deletions.
Binary file removed lib/kafka-0.7.0.jar
View file
Binary file not shown.
9 changes: 0 additions & 9 deletions lib/kafka-readme.txt
View file

This file was deleted.

10 changes: 5 additions & 5 deletions sensei-core/src/main/java/com/senseidb/plugin/PluginHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@

class PluginHolder {
private final SenseiPluginRegistry senseiPluginRegistry;
String pluginCLass;
String pluginClass;
String pluginName;
String fullPrefix;
Object instance;
private Object factoryCreatedInstance;
Map<String, String> properties = new LinkedHashMap<String, String>();

public PluginHolder(SenseiPluginRegistry senseiPluginRegistry, String pluginCLass,
public PluginHolder(SenseiPluginRegistry senseiPluginRegistry, String pluginClass,
String pluginName, String fullPrefix) {
this.senseiPluginRegistry = senseiPluginRegistry;
this.pluginCLass = pluginCLass;
this.pluginClass = pluginClass;
this.pluginName = pluginName;
this.fullPrefix = fullPrefix;
}
Expand All @@ -36,11 +36,11 @@ public Object getInstance() {
synchronized (this) {
try {
try {
instance = Class.forName(pluginCLass).newInstance();
instance = Class.forName(pluginClass).newInstance();
} catch (Exception ex) {
// Special logic for analyzer
if (pluginName.equalsIgnoreCase("analyzer")) {
instance = Class.forName(pluginCLass).getConstructor(Version.class)
instance = Class.forName(pluginClass).getConstructor(Version.class)
.newInstance(Version.LUCENE_43);
} else {
throw ex;
Expand Down
295 changes: 145 additions & 150 deletions sensei-gateways/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,162 +1,157 @@
<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">
<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>
<parent>
<groupId>com.senseidb</groupId>
<artifactId>sensei-parent</artifactId>
<version>2.0.2-SNAPSHOT</version>
<relativePath>../sensei-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.senseidb</groupId>
<artifactId>sensei-parent</artifactId>
<version>2.0.2-SNAPSHOT</version>
<relativePath>../sensei-parent/pom.xml</relativePath>
</parent>

<artifactId>sensei-gateways</artifactId>
<packaging>jar</packaging>
<name>sensei gateways</name>
<description>a collection of sensei gateways</description>
<artifactId>sensei-gateways</artifactId>
<packaging>jar</packaging>
<name>sensei gateways</name>
<description>a collection of sensei gateways</description>

<!-- Set the compiler to java6 -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>1.9</version>
<executions>
<execution>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<prefix>git</prefix>
<dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
<verbose>true</verbose>
<dotGitDirectory>${project.basedir}/../.git</dotGitDirectory>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>src/main/resources/git.properties</generateGitPropertiesFilename>
</configuration>
</plugin>
</plugins>
</build>
<!-- Set the compiler to java6 -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>1.9</version>
<executions>
<execution>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<prefix>git</prefix>
<dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
<verbose>true</verbose>
<dotGitDirectory>${project.basedir}/../.git</dotGitDirectory>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>src/main/resources/git.properties
</generateGitPropertiesFilename>
</configuration>
</plugin>
</plugins>
</build>


<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sensei-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sensei-core</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.github.sgroschupf</groupId>
<artifactId>zkclient</artifactId>
<version>0.1</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_2.10</artifactId>
<version>0.8.1</version>
</dependency>

<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka</artifactId>
<version>0.7.0</version>
<scope>system</scope>
<systemPath>${basedir}/../lib/kafka-0.7.0.jar</systemPath>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.6</version>
</dependency>

<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.6</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20080701</version>
</dependency>

<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20080701</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.4.0</version>
</dependency>

<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.4.0</version>
</dependency>

<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.8.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.twitter.common</groupId>
<artifactId>zookeeper-testing</artifactId>
<version>0.0.30</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
<version>2.4.1</version>
</dependency>
</dependencies>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.8.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.twitter.common</groupId>
<artifactId>zookeeper-testing</artifactId>
<version>0.0.30</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
<version>2.4.1</version>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit 26d523e

Please sign in to comment.