Merge branch 'release-2.0.0' of https://github.com/DataTorrent/Malhar into release-2.0.0
diff --git a/demos/twitter/src/main/java/com/datatorrent/demos/twitter/KinesisHashtagsApplication.java b/demos/twitter/src/main/java/com/datatorrent/demos/twitter/KinesisHashtagsApplication.java
index 46d6ef8..8f144a8 100644
--- a/demos/twitter/src/main/java/com/datatorrent/demos/twitter/KinesisHashtagsApplication.java
+++ b/demos/twitter/src/main/java/com/datatorrent/demos/twitter/KinesisHashtagsApplication.java
@@ -163,7 +163,7 @@
* </ul>
*
*/
-@ApplicationAnnotation(name="Twitter-KinesisDemo")
+@ApplicationAnnotation(name="TwitterKinesisDemo")
public class KinesisHashtagsApplication implements StreamingApplication
{
private final Locality locality = null;
diff --git a/demos/twitter/src/main/resources/META-INF/properties-TwitterKinesisDemo.xml b/demos/twitter/src/main/resources/META-INF/properties-TwitterKinesisDemo.xml
new file mode 100644
index 0000000..30289ba
--- /dev/null
+++ b/demos/twitter/src/main/resources/META-INF/properties-TwitterKinesisDemo.xml
@@ -0,0 +1,26 @@
+
+<!-- properties for the twitter kinesis demo -->
+<configuration>
+
+ <property>
+ <name>dt.operator.FromKinesis.streamName</name>
+ <value>TwitterTag</value>
+ </property>
+ <property>
+ <name>dt.operator.FromKinesis.accessKey</name>
+ </property>
+ <property>
+ <name>dt.operator.FromKinesis.secretKey</name>
+ </property>
+ <property>
+ <name>dt.operator.ToKinesis.streamName</name>
+ <value>TwitterTag</value>
+ </property>
+ <property>
+ <name>dt.operator.ToKinesis.accessKey</name>
+ </property>
+ <property>
+ <name>dt.operator.ToKinesis.secretKey</name>
+ </property>
+
+</configuration>
diff --git a/demos/twitter/src/main/resources/META-INF/properties.xml b/demos/twitter/src/main/resources/META-INF/properties.xml
index ebb778f..c497b39 100644
--- a/demos/twitter/src/main/resources/META-INF/properties.xml
+++ b/demos/twitter/src/main/resources/META-INF/properties.xml
@@ -43,12 +43,4 @@
<name>dt.operator.TweetSampler.feedMultiplier</name>
<value>20</value>
</property>
- <property>
- <name>dt.application.KinesisDemo.operator.FromKinesis.streamName</name>
- <value>TwitterTag</value>
- </property>
- <property>
- <name>dt.application.KinesisDemo.operator.ToKinesis.streamName</name>
- <value>TwitterTag</value>
- </property>
</configuration>
