http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordSpout.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordSpout.java b/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordSpout.java index 799438c..c5fc490 100644 --- a/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordSpout.java +++ b/external/storm-hbase/src/test/java/org/apache/storm/hbase/topology/WordSpout.java @@ -17,12 +17,12 @@ */ package org.apache.storm.hbase.topology; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.IRichSpout; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.IRichSpout; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; import java.util.Map; import java.util.Random;
http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/test/java/org/apache/storm/hbase/trident/PrintFunction.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/test/java/org/apache/storm/hbase/trident/PrintFunction.java b/external/storm-hbase/src/test/java/org/apache/storm/hbase/trident/PrintFunction.java index 91e0a7a..cdc7690 100644 --- a/external/storm-hbase/src/test/java/org/apache/storm/hbase/trident/PrintFunction.java +++ b/external/storm-hbase/src/test/java/org/apache/storm/hbase/trident/PrintFunction.java @@ -19,9 +19,9 @@ package org.apache.storm.hbase.trident; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.trident.operation.BaseFunction; -import storm.trident.operation.TridentCollector; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.operation.BaseFunction; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.tuple.TridentTuple; import java.util.Random; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hbase/src/test/java/org/apache/storm/hbase/trident/WordCountTrident.java ---------------------------------------------------------------------- diff --git a/external/storm-hbase/src/test/java/org/apache/storm/hbase/trident/WordCountTrident.java b/external/storm-hbase/src/test/java/org/apache/storm/hbase/trident/WordCountTrident.java index 69d067d..b2f0ce8 100644 --- a/external/storm-hbase/src/test/java/org/apache/storm/hbase/trident/WordCountTrident.java +++ b/external/storm-hbase/src/test/java/org/apache/storm/hbase/trident/WordCountTrident.java @@ -17,12 +17,12 @@ */ package org.apache.storm.hbase.trident; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.StormSubmitter; -import backtype.storm.generated.StormTopology; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.StormSubmitter; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; import org.apache.hadoop.hbase.client.Durability; import org.apache.storm.hbase.bolt.mapper.HBaseProjectionCriteria; import org.apache.storm.hbase.bolt.mapper.HBaseValueMapper; @@ -33,11 +33,11 @@ import org.apache.storm.hbase.trident.state.HBaseQuery; import org.apache.storm.hbase.trident.state.HBaseState; import org.apache.storm.hbase.trident.state.HBaseStateFactory; import org.apache.storm.hbase.trident.state.HBaseUpdater; -import storm.trident.Stream; -import storm.trident.TridentState; -import storm.trident.TridentTopology; -import storm.trident.state.StateFactory; -import storm.trident.testing.FixedBatchSpout; +import org.apache.storm.trident.Stream; +import org.apache.storm.trident.TridentState; +import org.apache.storm.trident.TridentTopology; +import org.apache.storm.trident.state.StateFactory; +import org.apache.storm.trident.testing.FixedBatchSpout; public class WordCountTrident { public static StormTopology buildTopology(String hbaseRoot){ http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java index fbc277e..dadabe8 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStore.java @@ -17,19 +17,19 @@ */ package org.apache.storm.hdfs.blobstore; -import backtype.storm.Config; -import backtype.storm.blobstore.AtomicOutputStream; -import backtype.storm.blobstore.BlobStore; -import backtype.storm.blobstore.BlobStoreAclHandler; -import backtype.storm.blobstore.BlobStoreFile; -import backtype.storm.blobstore.InputStreamWithMeta; -import backtype.storm.generated.AuthorizationException; -import backtype.storm.generated.KeyNotFoundException; -import backtype.storm.generated.KeyAlreadyExistsException; -import backtype.storm.generated.ReadableBlobMeta; -import backtype.storm.generated.SettableBlobMeta; -import backtype.storm.nimbus.NimbusInfo; -import backtype.storm.utils.Utils; +import org.apache.storm.Config; +import org.apache.storm.blobstore.AtomicOutputStream; +import org.apache.storm.blobstore.BlobStore; +import org.apache.storm.blobstore.BlobStoreAclHandler; +import org.apache.storm.blobstore.BlobStoreFile; +import org.apache.storm.blobstore.InputStreamWithMeta; +import org.apache.storm.generated.AuthorizationException; +import org.apache.storm.generated.KeyNotFoundException; +import org.apache.storm.generated.KeyAlreadyExistsException; +import org.apache.storm.generated.ReadableBlobMeta; +import org.apache.storm.generated.SettableBlobMeta; +import org.apache.storm.nimbus.NimbusInfo; +import org.apache.storm.utils.Utils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.security.UserGroupInformation; @@ -46,9 +46,9 @@ import java.security.PrivilegedAction; import java.util.Iterator; import java.util.Map; -import static backtype.storm.blobstore.BlobStoreAclHandler.ADMIN; -import static backtype.storm.blobstore.BlobStoreAclHandler.READ; -import static backtype.storm.blobstore.BlobStoreAclHandler.WRITE; +import static org.apache.storm.blobstore.BlobStoreAclHandler.ADMIN; +import static org.apache.storm.blobstore.BlobStoreAclHandler.READ; +import static org.apache.storm.blobstore.BlobStoreAclHandler.WRITE; /** * Provides a HDFS file system backed blob store implementation. http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreFile.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreFile.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreFile.java index 93b56c1..0192d94 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreFile.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreFile.java @@ -17,8 +17,8 @@ */ package org.apache.storm.hdfs.blobstore; -import backtype.storm.blobstore.BlobStoreFile; -import backtype.storm.generated.SettableBlobMeta; +import org.apache.storm.blobstore.BlobStoreFile; +import org.apache.storm.generated.SettableBlobMeta; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileContext; import org.apache.hadoop.fs.FileSystem; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImpl.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImpl.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImpl.java index e434752..a4c88ce 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImpl.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImpl.java @@ -17,9 +17,9 @@ */ package org.apache.storm.hdfs.blobstore; -import backtype.storm.Config; -import backtype.storm.blobstore.BlobStoreFile; -import backtype.storm.utils.Utils; +import org.apache.storm.Config; +import org.apache.storm.blobstore.BlobStoreFile; +import org.apache.storm.utils.Utils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsClientBlobStore.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsClientBlobStore.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsClientBlobStore.java index 18c97da..1fc80d0 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsClientBlobStore.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/blobstore/HdfsClientBlobStore.java @@ -17,15 +17,15 @@ */ package org.apache.storm.hdfs.blobstore; -import backtype.storm.blobstore.AtomicOutputStream; -import backtype.storm.blobstore.ClientBlobStore; -import backtype.storm.blobstore.InputStreamWithMeta; -import backtype.storm.generated.AuthorizationException; -import backtype.storm.generated.ReadableBlobMeta; -import backtype.storm.generated.SettableBlobMeta; -import backtype.storm.generated.KeyAlreadyExistsException; -import backtype.storm.generated.KeyNotFoundException; -import backtype.storm.utils.NimbusClient; +import org.apache.storm.blobstore.AtomicOutputStream; +import org.apache.storm.blobstore.ClientBlobStore; +import org.apache.storm.blobstore.InputStreamWithMeta; +import org.apache.storm.generated.AuthorizationException; +import org.apache.storm.generated.ReadableBlobMeta; +import org.apache.storm.generated.SettableBlobMeta; +import org.apache.storm.generated.KeyAlreadyExistsException; +import org.apache.storm.generated.KeyNotFoundException; +import org.apache.storm.utils.NimbusClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java index d2e65de..dbe986e 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AbstractHdfsBolt.java @@ -17,14 +17,14 @@ */ package org.apache.storm.hdfs.bolt; -import backtype.storm.Config; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.tuple.Tuple; -import backtype.storm.utils.TupleUtils; -import backtype.storm.utils.Utils; +import org.apache.storm.Config; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.utils.TupleUtils; +import org.apache.storm.utils.Utils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java index d2bfba8..c817c98 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBolt.java @@ -17,11 +17,11 @@ */ package org.apache.storm.hdfs.bolt; -import backtype.storm.Config; -import backtype.storm.Constants; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Tuple; +import org.apache.storm.Config; +import org.apache.storm.Constants; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Tuple; import org.apache.avro.Schema; import org.apache.avro.file.DataFileWriter; import org.apache.avro.io.DatumWriter; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java index 101aa57..b351adc 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/HdfsBolt.java @@ -17,9 +17,9 @@ */ package org.apache.storm.hdfs.bolt; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Tuple; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java index fcd0d29..2a266c1 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/SequenceFileBolt.java @@ -17,9 +17,9 @@ */ package org.apache.storm.hdfs.bolt; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Tuple; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.SequenceFile; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultFileNameFormat.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultFileNameFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultFileNameFormat.java index e046f90..3bc9904 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultFileNameFormat.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultFileNameFormat.java @@ -17,7 +17,7 @@ */ package org.apache.storm.hdfs.bolt.format; -import backtype.storm.task.TopologyContext; +import org.apache.storm.task.TopologyContext; import java.util.Map; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultSequenceFormat.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultSequenceFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultSequenceFormat.java index 115b1ee..ab07d43 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultSequenceFormat.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DefaultSequenceFormat.java @@ -17,7 +17,7 @@ */ package org.apache.storm.hdfs.bolt.format; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DelimitedRecordFormat.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DelimitedRecordFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DelimitedRecordFormat.java index 2bd3abb..0c6e3f0 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DelimitedRecordFormat.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/DelimitedRecordFormat.java @@ -17,8 +17,8 @@ */ package org.apache.storm.hdfs.bolt.format; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; /** * RecordFormat implementation that uses field and record delimiters. http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/FileNameFormat.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/FileNameFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/FileNameFormat.java index 8344d78..90e99cb 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/FileNameFormat.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/FileNameFormat.java @@ -17,7 +17,7 @@ */ package org.apache.storm.hdfs.bolt.format; -import backtype.storm.task.TopologyContext; +import org.apache.storm.task.TopologyContext; import java.io.Serializable; import java.util.Map; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/RecordFormat.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/RecordFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/RecordFormat.java index 3a26a61..fe48f05 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/RecordFormat.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/RecordFormat.java @@ -18,7 +18,7 @@ package org.apache.storm.hdfs.bolt.format; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/SequenceFormat.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/SequenceFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/SequenceFormat.java index cdadcc1..fcb7f45 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/SequenceFormat.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/format/SequenceFormat.java @@ -17,7 +17,7 @@ */ package org.apache.storm.hdfs.bolt.format; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/FileRotationPolicy.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/FileRotationPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/FileRotationPolicy.java index 658579e..90ef772 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/FileRotationPolicy.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/FileRotationPolicy.java @@ -18,7 +18,7 @@ package org.apache.storm.hdfs.bolt.rotation; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/FileSizeRotationPolicy.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/FileSizeRotationPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/FileSizeRotationPolicy.java index 70d170f..f0df921 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/FileSizeRotationPolicy.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/FileSizeRotationPolicy.java @@ -18,7 +18,7 @@ package org.apache.storm.hdfs.bolt.rotation; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/NoRotationPolicy.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/NoRotationPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/NoRotationPolicy.java index 884872e..14fa496 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/NoRotationPolicy.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/NoRotationPolicy.java @@ -17,7 +17,7 @@ */ package org.apache.storm.hdfs.bolt.rotation; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; /** * File rotation policy that will never rotate... http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/TimedRotationPolicy.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/TimedRotationPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/TimedRotationPolicy.java index 6c21f0d..84762a0 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/TimedRotationPolicy.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/rotation/TimedRotationPolicy.java @@ -17,7 +17,7 @@ */ package org.apache.storm.hdfs.bolt.rotation; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; public class TimedRotationPolicy implements FileRotationPolicy { http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/sync/CountSyncPolicy.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/sync/CountSyncPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/sync/CountSyncPolicy.java index 2a69e4f..9f31d58 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/sync/CountSyncPolicy.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/sync/CountSyncPolicy.java @@ -18,7 +18,7 @@ package org.apache.storm.hdfs.bolt.sync; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; /** * SyncPolicy implementation that will trigger a http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/sync/SyncPolicy.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/sync/SyncPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/sync/SyncPolicy.java index 205f13f..19c0e25 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/sync/SyncPolicy.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/bolt/sync/SyncPolicy.java @@ -17,7 +17,7 @@ */ package org.apache.storm.hdfs.bolt.sync; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/AutoHDFS.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/AutoHDFS.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/AutoHDFS.java index faa21ac..ff3f9cc 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/AutoHDFS.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/AutoHDFS.java @@ -18,10 +18,10 @@ package org.apache.storm.hdfs.common.security; -import backtype.storm.Config; -import backtype.storm.security.INimbusCredentialPlugin; -import backtype.storm.security.auth.IAutoCredentials; -import backtype.storm.security.auth.ICredentialsRenewer; +import org.apache.storm.Config; +import org.apache.storm.security.INimbusCredentialPlugin; +import org.apache.storm.security.auth.IAutoCredentials; +import org.apache.storm.security.auth.ICredentialsRenewer; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.security.Credentials; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/HdfsSecurityUtil.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/HdfsSecurityUtil.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/HdfsSecurityUtil.java index 86e7e3d..993214a 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/HdfsSecurityUtil.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/common/security/HdfsSecurityUtil.java @@ -17,7 +17,7 @@ */ package org.apache.storm.hdfs.common.security; -import backtype.storm.security.auth.kerberos.AutoTGT; +import org.apache.storm.security.auth.kerberos.AutoTGT; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.SecurityUtil; @@ -29,7 +29,7 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import static backtype.storm.Config.TOPOLOGY_AUTO_CREDENTIALS; +import static org.apache.storm.Config.TOPOLOGY_AUTO_CREDENTIALS; /** * This class provides util methods for storm-hdfs connector communicating http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsState.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsState.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsState.java index 4448868..6c4acca 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsState.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsState.java @@ -17,9 +17,9 @@ */ package org.apache.storm.hdfs.trident; -import backtype.storm.Config; -import backtype.storm.task.IMetricsContext; -import backtype.storm.topology.FailedException; +import org.apache.storm.Config; +import org.apache.storm.task.IMetricsContext; +import org.apache.storm.topology.FailedException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FSDataOutputStream; @@ -39,9 +39,9 @@ import org.apache.storm.hdfs.trident.rotation.FileSizeRotationPolicy; import org.apache.storm.hdfs.trident.rotation.TimedRotationPolicy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.trident.operation.TridentCollector; -import storm.trident.state.State; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.state.State; +import org.apache.storm.trident.tuple.TridentTuple; import java.io.BufferedReader; import java.io.BufferedWriter; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsStateFactory.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsStateFactory.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsStateFactory.java index 3bc5c9e..3f4400b 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsStateFactory.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsStateFactory.java @@ -17,11 +17,11 @@ */ package org.apache.storm.hdfs.trident; -import backtype.storm.task.IMetricsContext; +import org.apache.storm.task.IMetricsContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.trident.state.State; -import storm.trident.state.StateFactory; +import org.apache.storm.trident.state.State; +import org.apache.storm.trident.state.StateFactory; import java.util.Map; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsUpdater.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsUpdater.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsUpdater.java index 1255d05..c603334 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsUpdater.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/HdfsUpdater.java @@ -17,9 +17,9 @@ */ package org.apache.storm.hdfs.trident; -import storm.trident.operation.TridentCollector; -import storm.trident.state.BaseStateUpdater; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.state.BaseStateUpdater; +import org.apache.storm.trident.tuple.TridentTuple; import java.util.List; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DefaultSequenceFormat.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DefaultSequenceFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DefaultSequenceFormat.java index 7490e34..1336144 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DefaultSequenceFormat.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DefaultSequenceFormat.java @@ -20,7 +20,7 @@ package org.apache.storm.hdfs.trident.format; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.tuple.TridentTuple; /** * Basic <code>SequenceFormat</code> implementation that uses http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DelimitedRecordFormat.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DelimitedRecordFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DelimitedRecordFormat.java index 577d385..a08664d 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DelimitedRecordFormat.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/DelimitedRecordFormat.java @@ -17,8 +17,8 @@ */ package org.apache.storm.hdfs.trident.format; -import backtype.storm.tuple.Fields; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.tuple.Fields; +import org.apache.storm.trident.tuple.TridentTuple; /** * RecordFormat implementation that uses field and record delimiters. http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/RecordFormat.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/RecordFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/RecordFormat.java index 2af29a8..76179d9 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/RecordFormat.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/RecordFormat.java @@ -18,7 +18,7 @@ package org.apache.storm.hdfs.trident.format; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.tuple.TridentTuple; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/SequenceFormat.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/SequenceFormat.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/SequenceFormat.java index a23d23f..b4d6c5c 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/SequenceFormat.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/format/SequenceFormat.java @@ -18,7 +18,7 @@ package org.apache.storm.hdfs.trident.format; import org.apache.hadoop.io.Writable; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.tuple.TridentTuple; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/FileRotationPolicy.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/FileRotationPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/FileRotationPolicy.java index f429221..c69f312 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/FileRotationPolicy.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/FileRotationPolicy.java @@ -17,7 +17,7 @@ */ package org.apache.storm.hdfs.trident.rotation; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.tuple.TridentTuple; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/FileSizeRotationPolicy.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/FileSizeRotationPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/FileSizeRotationPolicy.java index fad6455..70865b2 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/FileSizeRotationPolicy.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/FileSizeRotationPolicy.java @@ -20,7 +20,7 @@ package org.apache.storm.hdfs.trident.rotation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.tuple.TridentTuple; /** * File rotation policy that will rotate files when a certain http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/NoRotationPolicy.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/NoRotationPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/NoRotationPolicy.java index 8117f95..4c65acd 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/NoRotationPolicy.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/NoRotationPolicy.java @@ -17,7 +17,7 @@ */ package org.apache.storm.hdfs.trident.rotation; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.tuple.TridentTuple; /** * File rotation policy that will never rotate... http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/TimedRotationPolicy.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/TimedRotationPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/TimedRotationPolicy.java index f8cfe44..7278c9a 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/TimedRotationPolicy.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/rotation/TimedRotationPolicy.java @@ -17,7 +17,7 @@ */ package org.apache.storm.hdfs.trident.rotation; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.tuple.TridentTuple; import java.util.Timer; import java.util.TimerTask; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/sync/CountSyncPolicy.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/sync/CountSyncPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/sync/CountSyncPolicy.java index 3100fd1..3b4e32e 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/sync/CountSyncPolicy.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/sync/CountSyncPolicy.java @@ -18,7 +18,7 @@ package org.apache.storm.hdfs.trident.sync; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.tuple.TridentTuple; /** * SyncPolicy implementation that will trigger a http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/sync/SyncPolicy.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/sync/SyncPolicy.java b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/sync/SyncPolicy.java index db70369..d87da9c 100644 --- a/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/sync/SyncPolicy.java +++ b/external/storm-hdfs/src/main/java/org/apache/storm/hdfs/trident/sync/SyncPolicy.java @@ -17,7 +17,7 @@ */ package org.apache.storm.hdfs.trident.sync; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.tuple.TridentTuple; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/BlobStoreTest.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/BlobStoreTest.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/BlobStoreTest.java index 2a0a15a..6e03bcf 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/BlobStoreTest.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/BlobStoreTest.java @@ -17,21 +17,21 @@ */ package org.apache.storm.hdfs.blobstore; -import backtype.storm.Config; -import backtype.storm.blobstore.AtomicOutputStream; -import backtype.storm.blobstore.BlobStore; -import backtype.storm.blobstore.BlobStoreAclHandler; -import backtype.storm.generated.AccessControl; -import backtype.storm.generated.AuthorizationException; -import backtype.storm.generated.KeyAlreadyExistsException; -import backtype.storm.generated.KeyNotFoundException; -import backtype.storm.generated.ReadableBlobMeta; -import backtype.storm.generated.SettableBlobMeta; -import backtype.storm.generated.AccessControlType; - -import backtype.storm.security.auth.NimbusPrincipal; -import backtype.storm.security.auth.SingleUserPrincipal; -import backtype.storm.utils.Utils; +import org.apache.storm.Config; +import org.apache.storm.blobstore.AtomicOutputStream; +import org.apache.storm.blobstore.BlobStore; +import org.apache.storm.blobstore.BlobStoreAclHandler; +import org.apache.storm.generated.AccessControl; +import org.apache.storm.generated.AuthorizationException; +import org.apache.storm.generated.KeyAlreadyExistsException; +import org.apache.storm.generated.KeyNotFoundException; +import org.apache.storm.generated.ReadableBlobMeta; +import org.apache.storm.generated.SettableBlobMeta; +import org.apache.storm.generated.AccessControlType; + +import org.apache.storm.security.auth.NimbusPrincipal; +import org.apache.storm.security.auth.SingleUserPrincipal; +import org.apache.storm.utils.Utils; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdfs.MiniDFSCluster; @@ -172,7 +172,7 @@ public class BlobStoreTest { } Map conf = new HashMap(); conf.put(Config.BLOBSTORE_DIR, dirName); - conf.put(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN,"backtype.storm.security.auth.DefaultPrincipalToLocal"); + conf.put(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN,"org.apache.storm.security.auth.DefaultPrincipalToLocal"); conf.put(Config.STORM_BLOBSTORE_REPLICATION_FACTOR, 3); HdfsBlobStore store = new HdfsBlobStore(); store.prepareInternal(conf, null, dfscluster.getConfiguration(0)); http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImplTest.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImplTest.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImplTest.java index e7bcfc0..c49c44b 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImplTest.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/blobstore/HdfsBlobStoreImplTest.java @@ -17,8 +17,8 @@ */ package org.apache.storm.hdfs.blobstore; -import backtype.storm.blobstore.BlobStoreFile; -import backtype.storm.generated.SettableBlobMeta; +import org.apache.storm.blobstore.BlobStoreFile; +import org.apache.storm.generated.SettableBlobMeta; import org.apache.commons.io.IOUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; @@ -229,4 +229,4 @@ public class HdfsBlobStoreImplTest { ios.close(); assertEquals(testString.getBytes(Charset.forName("UTF-8")).length, pfile.getFileLength()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBoltTest.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBoltTest.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBoltTest.java index 37ba27a..8ff05bc 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBoltTest.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/AvroGenericRecordBoltTest.java @@ -17,15 +17,15 @@ */ package org.apache.storm.hdfs.bolt; -import backtype.storm.Config; -import backtype.storm.task.GeneralTopologyContext; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.TupleImpl; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +import org.apache.storm.task.GeneralTopologyContext; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.TupleImpl; +import org.apache.storm.tuple.Values; import org.apache.avro.Schema; import org.apache.avro.generic.GenericData; import org.apache.avro.generic.GenericDatumReader; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java index 32f1f2d..7409cc4 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/HdfsFileTopology.java @@ -17,19 +17,19 @@ */ package org.apache.storm.hdfs.bolt; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.StormSubmitter; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.StormSubmitter; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import org.apache.storm.hdfs.bolt.format.DefaultFileNameFormat; import org.apache.storm.hdfs.bolt.format.DelimitedRecordFormat; import org.apache.storm.hdfs.bolt.format.FileNameFormat; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java index 2351cd3..1c10f10 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/SequenceFileTopology.java @@ -17,19 +17,19 @@ */ package org.apache.storm.hdfs.bolt; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.StormSubmitter; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.StormSubmitter; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import org.apache.storm.hdfs.bolt.format.*; import org.apache.storm.hdfs.bolt.rotation.FileRotationPolicy; import org.apache.storm.hdfs.bolt.rotation.FileSizeRotationPolicy; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestHdfsBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestHdfsBolt.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestHdfsBolt.java index 2f2014c..ecbad8a 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestHdfsBolt.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestHdfsBolt.java @@ -17,16 +17,16 @@ */ package org.apache.storm.hdfs.bolt; -import backtype.storm.Config; -import backtype.storm.task.GeneralTopologyContext; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.TupleImpl; -import backtype.storm.tuple.Values; -import backtype.storm.utils.MockTupleHelpers; +import org.apache.storm.Config; +import org.apache.storm.task.GeneralTopologyContext; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.TupleImpl; +import org.apache.storm.tuple.Values; +import org.apache.storm.utils.MockTupleHelpers; import org.apache.storm.hdfs.bolt.format.DefaultFileNameFormat; import org.apache.storm.hdfs.bolt.format.DelimitedRecordFormat; import org.apache.storm.hdfs.bolt.format.FileNameFormat; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestSequenceFileBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestSequenceFileBolt.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestSequenceFileBolt.java index 5c760ef..870d4ca 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestSequenceFileBolt.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/bolt/TestSequenceFileBolt.java @@ -17,16 +17,16 @@ */ package org.apache.storm.hdfs.bolt; -import backtype.storm.Config; -import backtype.storm.Constants; -import backtype.storm.task.GeneralTopologyContext; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.TupleImpl; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +import org.apache.storm.Constants; +import org.apache.storm.task.GeneralTopologyContext; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.TupleImpl; +import org.apache.storm.tuple.Values; import org.apache.storm.hdfs.bolt.format.DefaultFileNameFormat; import org.apache.storm.hdfs.bolt.format.FileNameFormat; import org.apache.storm.hdfs.bolt.format.SequenceFormat; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java index 1c9a336..76cc2aa 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/FixedBatchSpout.java @@ -17,11 +17,11 @@ */ package org.apache.storm.hdfs.trident; -import backtype.storm.Config; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Fields; -import storm.trident.operation.TridentCollector; -import storm.trident.spout.IBatchSpout; +import org.apache.storm.Config; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Fields; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.spout.IBatchSpout; import java.util.ArrayList; import java.util.HashMap; @@ -94,4 +94,4 @@ public class FixedBatchSpout implements IBatchSpout { public Fields getOutputFields() { return fields; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/HdfsStateTest.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/HdfsStateTest.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/HdfsStateTest.java index 51869d2..4480441 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/HdfsStateTest.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/HdfsStateTest.java @@ -17,8 +17,8 @@ */ package org.apache.storm.hdfs.trident; -import backtype.storm.Config; -import backtype.storm.tuple.Fields; +import org.apache.storm.Config; +import org.apache.storm.tuple.Fields; import org.apache.commons.io.FileUtils; import org.apache.storm.hdfs.trident.format.DelimitedRecordFormat; import org.apache.storm.hdfs.trident.format.FileNameFormat; @@ -28,7 +28,7 @@ import org.apache.storm.hdfs.trident.rotation.FileSizeRotationPolicy; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.tuple.TridentTuple; import java.io.File; import java.io.IOException; @@ -220,4 +220,4 @@ public class HdfsStateTest { Assert.assertNotEquals(preReplayCount, lines.size()); Assert.assertEquals(expectedTupleCount, lines.size()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentFileTopology.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentFileTopology.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentFileTopology.java index b0a22df..b66eced 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentFileTopology.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentFileTopology.java @@ -17,23 +17,23 @@ */ package org.apache.storm.hdfs.trident; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.StormSubmitter; -import backtype.storm.generated.StormTopology; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.StormSubmitter; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; import org.apache.storm.hdfs.common.rotation.MoveFileAction; import org.apache.storm.hdfs.trident.format.*; import org.apache.storm.hdfs.trident.rotation.FileRotationPolicy; import org.apache.storm.hdfs.trident.rotation.FileSizeRotationPolicy; -import storm.trident.Stream; -import storm.trident.TridentState; -import storm.trident.TridentTopology; -import storm.trident.operation.BaseFunction; -import storm.trident.operation.TridentCollector; -import storm.trident.state.StateFactory; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.Stream; +import org.apache.storm.trident.TridentState; +import org.apache.storm.trident.TridentTopology; +import org.apache.storm.trident.operation.BaseFunction; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.state.StateFactory; +import org.apache.storm.trident.tuple.TridentTuple; public class TridentFileTopology { http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentSequenceTopology.java ---------------------------------------------------------------------- diff --git a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentSequenceTopology.java b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentSequenceTopology.java index 711811e..48f1950 100644 --- a/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentSequenceTopology.java +++ b/external/storm-hdfs/src/test/java/org/apache/storm/hdfs/trident/TridentSequenceTopology.java @@ -17,23 +17,23 @@ */ package org.apache.storm.hdfs.trident; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.StormSubmitter; -import backtype.storm.generated.StormTopology; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.StormSubmitter; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; import org.apache.storm.hdfs.common.rotation.MoveFileAction; import org.apache.storm.hdfs.trident.format.*; import org.apache.storm.hdfs.trident.rotation.FileRotationPolicy; import org.apache.storm.hdfs.trident.rotation.FileSizeRotationPolicy; -import storm.trident.Stream; -import storm.trident.TridentState; -import storm.trident.TridentTopology; -import storm.trident.operation.BaseFunction; -import storm.trident.operation.TridentCollector; -import storm.trident.state.StateFactory; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.Stream; +import org.apache.storm.trident.TridentState; +import org.apache.storm.trident.TridentTopology; +import org.apache.storm.trident.operation.BaseFunction; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.state.StateFactory; +import org.apache.storm.trident.tuple.TridentTuple; public class TridentSequenceTopology { http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java index 35407e3..8b3362b 100644 --- a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java +++ b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/HiveBolt.java @@ -18,13 +18,13 @@ package org.apache.storm.hive.bolt; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.tuple.Tuple; -import backtype.storm.topology.base.BaseRichBolt; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.utils.TupleUtils; -import backtype.storm.Config; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.topology.base.BaseRichBolt; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.utils.TupleUtils; +import org.apache.storm.Config; import org.apache.storm.hive.common.HiveWriter; import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.hive.hcatalog.streaming.*; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/DelimitedRecordHiveMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/DelimitedRecordHiveMapper.java b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/DelimitedRecordHiveMapper.java index d516795..958080f 100644 --- a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/DelimitedRecordHiveMapper.java +++ b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/DelimitedRecordHiveMapper.java @@ -18,9 +18,9 @@ package org.apache.storm.hive.bolt.mapper; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.trident.tuple.TridentTuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hive.hcatalog.streaming.DelimitedInputWriter; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/HiveMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/HiveMapper.java b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/HiveMapper.java index a3b5531..db45af2 100644 --- a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/HiveMapper.java +++ b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/HiveMapper.java @@ -18,8 +18,8 @@ package org.apache.storm.hive.bolt.mapper; -import backtype.storm.tuple.Tuple; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.trident.tuple.TridentTuple; import java.util.List; import org.apache.hive.hcatalog.streaming.HiveEndPoint; import org.apache.hive.hcatalog.streaming.RecordWriter; @@ -30,7 +30,7 @@ import java.io.Serializable; import java.io.IOException; /** - * Maps a <code>backtype.storm.tuple.Tupe</code> object + * Maps a <code>org.apache.storm.tuple.Tupe</code> object * to a row in an Hive table. */ public interface HiveMapper extends Serializable { http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/JsonRecordHiveMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/JsonRecordHiveMapper.java b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/JsonRecordHiveMapper.java index ce3e475..a391fc6 100644 --- a/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/JsonRecordHiveMapper.java +++ b/external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/JsonRecordHiveMapper.java @@ -18,9 +18,9 @@ package org.apache.storm.hive.bolt.mapper; -import backtype.storm.tuple.Fields; -import storm.trident.tuple.TridentTuple; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Fields; +import org.apache.storm.trident.tuple.TridentTuple; +import org.apache.storm.tuple.Tuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hive/src/main/java/org/apache/storm/hive/common/HiveWriter.java ---------------------------------------------------------------------- diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/common/HiveWriter.java b/external/storm-hive/src/main/java/org/apache/storm/hive/common/HiveWriter.java index 7fc33f2..233fec0 100644 --- a/external/storm-hive/src/main/java/org/apache/storm/hive/common/HiveWriter.java +++ b/external/storm-hive/src/main/java/org/apache/storm/hive/common/HiveWriter.java @@ -31,7 +31,7 @@ import java.util.concurrent.TimeoutException; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hive.hcatalog.streaming.*; import org.apache.storm.hive.bolt.mapper.HiveMapper; -import backtype.storm.tuple.Tuple; +import org.apache.storm.tuple.Tuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java ---------------------------------------------------------------------- diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java index 6050aa8..dd296e4 100644 --- a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java +++ b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveState.java @@ -17,11 +17,11 @@ */ package org.apache.storm.hive.trident; -import storm.trident.operation.TridentCollector; -import storm.trident.state.State; -import storm.trident.tuple.TridentTuple; -import backtype.storm.task.IMetricsContext; -import backtype.storm.topology.FailedException; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.state.State; +import org.apache.storm.trident.tuple.TridentTuple; +import org.apache.storm.task.IMetricsContext; +import org.apache.storm.topology.FailedException; import org.apache.storm.hive.common.HiveWriter; import org.apache.storm.hive.common.HiveWriter; import org.apache.hive.hcatalog.streaming.*; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveStateFactory.java ---------------------------------------------------------------------- diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveStateFactory.java b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveStateFactory.java index 982ce03..7e0e1f2 100644 --- a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveStateFactory.java +++ b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveStateFactory.java @@ -17,11 +17,11 @@ */ package org.apache.storm.hive.trident; -import backtype.storm.task.IMetricsContext; +import org.apache.storm.task.IMetricsContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.trident.state.State; -import storm.trident.state.StateFactory; +import org.apache.storm.trident.state.State; +import org.apache.storm.trident.state.StateFactory; import org.apache.storm.hive.common.HiveOptions; import java.util.Map; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveUpdater.java ---------------------------------------------------------------------- diff --git a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveUpdater.java b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveUpdater.java index f4c2a9a..82cfc15 100644 --- a/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveUpdater.java +++ b/external/storm-hive/src/main/java/org/apache/storm/hive/trident/HiveUpdater.java @@ -17,9 +17,9 @@ */ package org.apache.storm.hive.trident; -import storm.trident.operation.TridentCollector; -import storm.trident.state.BaseStateUpdater; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.state.BaseStateUpdater; +import org.apache.storm.trident.tuple.TridentTuple; import java.util.List; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/HiveTopology.java ---------------------------------------------------------------------- diff --git a/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/HiveTopology.java b/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/HiveTopology.java index e9ecbd0..1132587 100644 --- a/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/HiveTopology.java +++ b/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/HiveTopology.java @@ -18,16 +18,16 @@ package org.apache.storm.hive.bolt; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.StormSubmitter; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.StormSubmitter; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; import org.apache.storm.hive.bolt.mapper.DelimitedRecordHiveMapper; import org.apache.storm.hive.common.HiveOptions; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java ---------------------------------------------------------------------- diff --git a/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java b/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java index c3197c2..a52c490 100644 --- a/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java +++ b/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/HiveTopologyPartitioned.java @@ -18,17 +18,17 @@ package org.apache.storm.hive.bolt; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.StormSubmitter; -import backtype.storm.spout.SpoutOutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.topology.base.BaseRichSpout; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; -import backtype.storm.utils.Utils; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.StormSubmitter; +import org.apache.storm.spout.SpoutOutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.topology.base.BaseRichSpout; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; +import org.apache.storm.utils.Utils; import org.apache.storm.hive.bolt.mapper.DelimitedRecordHiveMapper; import org.apache.storm.hive.common.HiveOptions; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/TestHiveBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/TestHiveBolt.java b/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/TestHiveBolt.java index 159beda..ead2c8d 100644 --- a/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/TestHiveBolt.java +++ b/external/storm-hive/src/test/java/org/apache/storm/hive/bolt/TestHiveBolt.java @@ -18,15 +18,15 @@ package org.apache.storm.hive.bolt; -import backtype.storm.Config; -import backtype.storm.task.GeneralTopologyContext; -import backtype.storm.task.OutputCollector; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.TupleImpl; -import backtype.storm.tuple.Values; -import backtype.storm.utils.MockTupleHelpers; +import org.apache.storm.Config; +import org.apache.storm.task.GeneralTopologyContext; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.TupleImpl; +import org.apache.storm.tuple.Values; +import org.apache.storm.utils.MockTupleHelpers; import org.apache.storm.hive.common.HiveOptions; import org.apache.storm.hive.bolt.mapper.DelimitedRecordHiveMapper; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hive/src/test/java/org/apache/storm/hive/common/TestHiveWriter.java ---------------------------------------------------------------------- diff --git a/external/storm-hive/src/test/java/org/apache/storm/hive/common/TestHiveWriter.java b/external/storm-hive/src/test/java/org/apache/storm/hive/common/TestHiveWriter.java index 63b1949..952b0fb 100644 --- a/external/storm-hive/src/test/java/org/apache/storm/hive/common/TestHiveWriter.java +++ b/external/storm-hive/src/test/java/org/apache/storm/hive/common/TestHiveWriter.java @@ -36,13 +36,13 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import backtype.storm.Config; -import backtype.storm.task.GeneralTopologyContext; -import backtype.storm.topology.TopologyBuilder; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.TupleImpl; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +import org.apache.storm.task.GeneralTopologyContext; +import org.apache.storm.topology.TopologyBuilder; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.TupleImpl; +import org.apache.storm.tuple.Values; import org.apache.hadoop.hive.metastore.txn.TxnDbUtil; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-hive/src/test/java/org/apache/storm/hive/trident/TridentHiveTopology.java ---------------------------------------------------------------------- diff --git a/external/storm-hive/src/test/java/org/apache/storm/hive/trident/TridentHiveTopology.java b/external/storm-hive/src/test/java/org/apache/storm/hive/trident/TridentHiveTopology.java index a208502..10921bc 100644 --- a/external/storm-hive/src/test/java/org/apache/storm/hive/trident/TridentHiveTopology.java +++ b/external/storm-hive/src/test/java/org/apache/storm/hive/trident/TridentHiveTopology.java @@ -22,25 +22,25 @@ package org.apache.storm.hive.trident; import org.apache.storm.hive.bolt.mapper.DelimitedRecordHiveMapper; import org.apache.storm.hive.common.HiveOptions; -import backtype.storm.Config; -import backtype.storm.LocalCluster; -import backtype.storm.StormSubmitter; -import backtype.storm.generated.StormTopology; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.Values; -import backtype.storm.task.TopologyContext; -import storm.trident.operation.TridentCollector; -import storm.trident.spout.IBatchSpout; +import org.apache.storm.Config; +import org.apache.storm.LocalCluster; +import org.apache.storm.StormSubmitter; +import org.apache.storm.generated.StormTopology; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.Values; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.spout.IBatchSpout; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import storm.trident.Stream; -import storm.trident.TridentState; -import storm.trident.TridentTopology; -import storm.trident.state.StateFactory; +import org.apache.storm.trident.Stream; +import org.apache.storm.trident.TridentState; +import org.apache.storm.trident.TridentTopology; +import org.apache.storm.trident.state.StateFactory; public class TridentHiveTopology { http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java index 0c0cca6..a09c73c 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/AbstractJdbcBolt.java @@ -17,10 +17,10 @@ */ package org.apache.storm.jdbc.bolt; -import backtype.storm.Config; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.base.BaseRichBolt; +import org.apache.storm.Config; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.base.BaseRichBolt; import org.apache.commons.lang.Validate; import org.apache.storm.jdbc.common.ConnectionProvider; import org.apache.storm.jdbc.common.JdbcClient; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcInsertBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcInsertBolt.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcInsertBolt.java index c3328f1..b93a1eb 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcInsertBolt.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcInsertBolt.java @@ -16,10 +16,10 @@ * limitations under the License. */ package org.apache.storm.jdbc.bolt; -import backtype.storm.task.OutputCollector; -import backtype.storm.task.TopologyContext; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Tuple; +import org.apache.storm.task.OutputCollector; +import org.apache.storm.task.TopologyContext; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Tuple; import org.apache.commons.lang.Validate; import org.apache.commons.lang3.StringUtils; import org.apache.storm.jdbc.common.Column; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcLookupBolt.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcLookupBolt.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcLookupBolt.java index b1dadb7..7224786 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcLookupBolt.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/bolt/JdbcLookupBolt.java @@ -17,9 +17,9 @@ */ package org.apache.storm.jdbc.bolt; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Tuple; -import backtype.storm.tuple.Values; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Tuple; +import org.apache.storm.tuple.Values; import org.apache.commons.lang.Validate; import org.apache.storm.jdbc.common.Column; import org.apache.storm.jdbc.common.ConnectionProvider; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcLookupMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcLookupMapper.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcLookupMapper.java index 0660a4c..462bee9 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcLookupMapper.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcLookupMapper.java @@ -17,9 +17,9 @@ */ package org.apache.storm.jdbc.mapper; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.ITuple; -import backtype.storm.tuple.Values; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.ITuple; +import org.apache.storm.tuple.Values; import org.apache.storm.jdbc.common.Column; import java.util.List; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcMapper.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcMapper.java index c8c80bc..b18af32 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcMapper.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/JdbcMapper.java @@ -17,7 +17,7 @@ */ package org.apache.storm.jdbc.mapper; -import backtype.storm.tuple.ITuple; +import org.apache.storm.tuple.ITuple; import org.apache.storm.jdbc.common.Column; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcLookupMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcLookupMapper.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcLookupMapper.java index b267bd1..7fadbe9 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcLookupMapper.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcLookupMapper.java @@ -18,10 +18,10 @@ package org.apache.storm.jdbc.mapper; -import backtype.storm.topology.OutputFieldsDeclarer; -import backtype.storm.tuple.Fields; -import backtype.storm.tuple.ITuple; -import backtype.storm.tuple.Values; +import org.apache.storm.topology.OutputFieldsDeclarer; +import org.apache.storm.tuple.Fields; +import org.apache.storm.tuple.ITuple; +import org.apache.storm.tuple.Values; import org.apache.commons.lang.Validate; import org.apache.storm.jdbc.common.Column; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcMapper.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcMapper.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcMapper.java index 9befb1e..d93c29f 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcMapper.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/mapper/SimpleJdbcMapper.java @@ -17,7 +17,7 @@ */ package org.apache.storm.jdbc.mapper; -import backtype.storm.tuple.ITuple; +import org.apache.storm.tuple.ITuple; import org.apache.commons.lang.Validate; import org.apache.storm.jdbc.common.Column; import org.apache.storm.jdbc.common.ConnectionProvider; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcQuery.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcQuery.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcQuery.java index ad39f4b..8d014cd 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcQuery.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcQuery.java @@ -17,10 +17,10 @@ */ package org.apache.storm.jdbc.trident.state; -import backtype.storm.tuple.Values; -import storm.trident.operation.TridentCollector; -import storm.trident.state.BaseQueryFunction; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.tuple.Values; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.state.BaseQueryFunction; +import org.apache.storm.trident.tuple.TridentTuple; import java.util.List; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java index 27c911c..814b20b 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcState.java @@ -17,9 +17,9 @@ */ package org.apache.storm.jdbc.trident.state; -import backtype.storm.Config; -import backtype.storm.topology.FailedException; -import backtype.storm.tuple.Values; +import org.apache.storm.Config; +import org.apache.storm.topology.FailedException; +import org.apache.storm.tuple.Values; import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; import org.apache.storm.jdbc.common.Column; @@ -29,9 +29,9 @@ import org.apache.storm.jdbc.mapper.JdbcMapper; import org.apache.storm.jdbc.mapper.JdbcLookupMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import storm.trident.operation.TridentCollector; -import storm.trident.state.State; -import storm.trident.tuple.TridentTuple; +import org.apache.storm.trident.operation.TridentCollector; +import org.apache.storm.trident.state.State; +import org.apache.storm.trident.tuple.TridentTuple; import java.io.Serializable; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/storm/blob/d839d1bf/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcStateFactory.java ---------------------------------------------------------------------- diff --git a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcStateFactory.java b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcStateFactory.java index a1bbdef..0295748 100644 --- a/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcStateFactory.java +++ b/external/storm-jdbc/src/main/java/org/apache/storm/jdbc/trident/state/JdbcStateFactory.java @@ -17,9 +17,9 @@ */ package org.apache.storm.jdbc.trident.state; -import backtype.storm.task.IMetricsContext; -import storm.trident.state.State; -import storm.trident.state.StateFactory; +import org.apache.storm.task.IMetricsContext; +import org.apache.storm.trident.state.State; +import org.apache.storm.trident.state.StateFactory; import java.util.Map;
