Merge https://github.com/IBMStreams/streamsx.hbase

IBMStreams · Feb 5, 2015 · a050766 · a050766
2 parents 42d8c33 + bf54e8a
commit a050766
Show file tree

Hide file tree

Showing 41 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 # project specific excludes
 /com.ibm.streamsx.hbase/com.ibm.streamsx.hbase
 /samples/*/doc/
+doc
 /tests/apps/*/doc
 /tests/apps/*/output*
 com.ibm.streamsx.hbase/doc/

diff --git a/build.xml b/build.xml
@@ -72,6 +72,7 @@
   <target name="samples" depends="toolkit">
     <subant target="indextoolkit" genericantfile="${basedir}/build.xml">
        <dirset dir="samples" includes="*"/>
+       <dirset dir="extraSamples" includes="*"/>
     </subant>
   </target>
   <target name="cleansamples">

diff --git a/samples/CustomKey/.gitignore → extraSamples/CustomKey/.gitignore b/samples/CustomKey/.gitignore → extraSamples/CustomKey/.gitignore
diff --git a/samples/CustomKey/.project → extraSamples/CustomKey/.project b/samples/CustomKey/.project → extraSamples/CustomKey/.project
diff --git a/...base.sample.CustomKey-Standalone.splbuild → ...base.sample.CustomKey-Standalone.splbuild b/...base.sample.CustomKey-Standalone.splbuild → ...base.sample.CustomKey-Standalone.splbuild
diff --git a/.../.settings/org.eclipse.jdt.apt.core.prefs → .../.settings/org.eclipse.jdt.apt.core.prefs b/.../.settings/org.eclipse.jdt.apt.core.prefs → .../.settings/org.eclipse.jdt.apt.core.prefs
diff --git a/...m.ibm.streamsx.hbase.sample/CustomKey.spl → ...m.ibm.streamsx.hbase.sample/CustomKey.spl b/...m.ibm.streamsx.hbase.sample/CustomKey.spl → ...m.ibm.streamsx.hbase.sample/CustomKey.spl
diff --git a/...treamsx/hbase/sample/HelperFunctions.java → ...treamsx/hbase/sample/HelperFunctions.java b/...treamsx/hbase/sample/HelperFunctions.java → ...treamsx/hbase/sample/HelperFunctions.java
diff --git a/.../ibm/streamsx/hbase/sample/KeyHelper.java → .../ibm/streamsx/hbase/sample/KeyHelper.java b/.../ibm/streamsx/hbase/sample/KeyHelper.java → .../ibm/streamsx/hbase/sample/KeyHelper.java
diff --git a/samples/CustomKey/info.xml → extraSamples/CustomKey/info.xml b/samples/CustomKey/info.xml → extraSamples/CustomKey/info.xml
diff --git a/samples/DeleteSample/.project → extraSamples/DeleteSample/.project b/samples/DeleteSample/.project → extraSamples/DeleteSample/.project
diff --git a/samples/DeleteSample/LICENSE.md → extraSamples/DeleteSample/LICENSE.md b/samples/DeleteSample/LICENSE.md → extraSamples/DeleteSample/LICENSE.md
diff --git a/samples/DeleteSample/Makefile → extraSamples/DeleteSample/Makefile b/samples/DeleteSample/Makefile → extraSamples/DeleteSample/Makefile
diff --git a/....streamsx.hbase.sample/CheckAndDelete.spl → ....streamsx.hbase.sample/CheckAndDelete.spl b/....streamsx.hbase.sample/CheckAndDelete.spl → ....streamsx.hbase.sample/CheckAndDelete.spl
diff --git a/...m.ibm.streamsx.hbase.sample/DeleteAll.spl → ...m.ibm.streamsx.hbase.sample/DeleteAll.spl b/...m.ibm.streamsx.hbase.sample/DeleteAll.spl → ...m.ibm.streamsx.hbase.sample/DeleteAll.spl
diff --git a/....ibm.streamsx.hbase.sample/DeleteDemo.spl → ....ibm.streamsx.hbase.sample/DeleteDemo.spl b/....ibm.streamsx.hbase.sample/DeleteDemo.spl → ....ibm.streamsx.hbase.sample/DeleteDemo.spl
diff --git a/samples/DeleteSample/data/absenceCheck.csv → ...amples/DeleteSample/data/absenceCheck.csv b/samples/DeleteSample/data/absenceCheck.csv → ...amples/DeleteSample/data/absenceCheck.csv
diff --git a/samples/DeleteSample/data/fullCheck.csv → extraSamples/DeleteSample/data/fullCheck.csv b/samples/DeleteSample/data/fullCheck.csv → extraSamples/DeleteSample/data/fullCheck.csv
diff --git a/samples/DeleteSample/data/rowColumn.csv → extraSamples/DeleteSample/data/rowColumn.csv b/samples/DeleteSample/data/rowColumn.csv → extraSamples/DeleteSample/data/rowColumn.csv
diff --git a/...les/DeleteSample/data/rowColumnFamily.csv → ...les/DeleteSample/data/rowColumnFamily.csv b/...les/DeleteSample/data/rowColumnFamily.csv → ...les/DeleteSample/data/rowColumnFamily.csv
diff --git a/samples/DeleteSample/info.xml → extraSamples/DeleteSample/info.xml b/samples/DeleteSample/info.xml → extraSamples/DeleteSample/info.xml
diff --git a/samples/IncrementSample/.project → extraSamples/IncrementSample/.project b/samples/IncrementSample/.project → extraSamples/IncrementSample/.project
diff --git a/samples/IncrementSample/LICENSE.md → extraSamples/IncrementSample/LICENSE.md b/samples/IncrementSample/LICENSE.md → extraSamples/IncrementSample/LICENSE.md
diff --git a/samples/IncrementSample/Makefile → extraSamples/IncrementSample/Makefile b/samples/IncrementSample/Makefile → extraSamples/IncrementSample/Makefile
diff --git a/...m.streamsx.hbase.sample/IncrementDemo.spl → ...m.streamsx.hbase.sample/IncrementDemo.spl b/...m.streamsx.hbase.sample/IncrementDemo.spl → ...m.streamsx.hbase.sample/IncrementDemo.spl
diff --git a/samples/IncrementSample/data/iliad_book1.txt → ...ples/IncrementSample/data/iliad_book1.txt b/samples/IncrementSample/data/iliad_book1.txt → ...ples/IncrementSample/data/iliad_book1.txt
diff --git a/samples/IncrementSample/info.xml → extraSamples/IncrementSample/info.xml b/samples/IncrementSample/info.xml → extraSamples/IncrementSample/info.xml
diff --git a/samples/ScanBooks/.project → extraSamples/ScanBooks/.project b/samples/ScanBooks/.project → extraSamples/ScanBooks/.project
diff --git a/samples/ScanBooks/LICENSE.md → extraSamples/ScanBooks/LICENSE.md b/samples/ScanBooks/LICENSE.md → extraSamples/ScanBooks/LICENSE.md
diff --git a/samples/ScanBooks/Makefile → extraSamples/ScanBooks/Makefile b/samples/ScanBooks/Makefile → extraSamples/ScanBooks/Makefile
diff --git a/...m.ibm.streamsx.hbase.sample/ScanBooks.spl → ...m.ibm.streamsx.hbase.sample/ScanBooks.spl b/...m.ibm.streamsx.hbase.sample/ScanBooks.spl → ...m.ibm.streamsx.hbase.sample/ScanBooks.spl
diff --git a/samples/ScanBooks/info.xml → extraSamples/ScanBooks/info.xml b/samples/ScanBooks/info.xml → extraSamples/ScanBooks/info.xml
diff --git a/samples/TableScan/.project → extraSamples/TableScan/.project b/samples/TableScan/.project → extraSamples/TableScan/.project
diff --git a/samples/TableScan/LICENSE.md → extraSamples/TableScan/LICENSE.md b/samples/TableScan/LICENSE.md → extraSamples/TableScan/LICENSE.md
diff --git a/samples/TableScan/Makefile → extraSamples/TableScan/Makefile b/samples/TableScan/Makefile → extraSamples/TableScan/Makefile
diff --git a/....ibm.streamsx.hbase.sample/ScanString.spl → ....ibm.streamsx.hbase.sample/ScanString.spl b/....ibm.streamsx.hbase.sample/ScanString.spl → ....ibm.streamsx.hbase.sample/ScanString.spl
diff --git a/....ibm.streamsx.hbase.sample/ScanTester.spl → ....ibm.streamsx.hbase.sample/ScanTester.spl b/....ibm.streamsx.hbase.sample/ScanTester.spl → ....ibm.streamsx.hbase.sample/ScanTester.spl
diff --git a/...m.streamsx.hbase.sample/ScanWithInput.spl → ...m.streamsx.hbase.sample/ScanWithInput.spl b/...m.streamsx.hbase.sample/ScanWithInput.spl → ...m.streamsx.hbase.sample/ScanWithInput.spl
diff --git a/samples/TableScan/info.xml → extraSamples/TableScan/info.xml b/samples/TableScan/info.xml → extraSamples/TableScan/info.xml
diff --git a/samples/README b/samples/README
@@ -0,0 +1,2 @@
+For additional samples, see this toolkit's home on github:
+http://www.github.com/IBMStreams/streamsx.hbase
diff --git a/updateWeb.pl b/updateWeb.pl
@@ -96,7 +96,7 @@ ($$)
 	next if (defined $exclude && $dir =~ /$exclude/);
 	next unless (-d "$fullName");
 	if (-e "$fullName/doc/spldoc") {
-	    if ($fullName =~ /samples/) {
+	    if ($fullName =~ /samples/ || $fullName =~ /extraSamples/) {
 		$debug && print "$fullName is a sample\n";
 		$samples{$f}="$fullName/doc/spldoc/html/index.html";
 	    }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		For additional samples, see this toolkit's home on github:
		http://www.github.com/IBMStreams/streamsx.hbase