You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dj...@apache.org on 2016/03/31 20:30:00 UTC
[1/2] incubator-quarks git commit: [QUARKS-64] Merge Hello Quarks!
recipe into HelloWorld sample
Repository: incubator-quarks
Updated Branches:
refs/heads/master a3c2770e7 -> 181a548ed
[QUARKS-64] Merge Hello Quarks! recipe into HelloWorld sample
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/4e704cb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/4e704cb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/4e704cb0
Branch: refs/heads/master
Commit: 4e704cb0ac6dffff15ffdcb7b7991dab815d9641
Parents: a3c2770
Author: Queenie Ma <qu...@gmail.com>
Authored: Wed Mar 30 09:10:30 2016 -0700
Committer: Queenie Ma <qu...@gmail.com>
Committed: Wed Mar 30 09:10:30 2016 -0700
----------------------------------------------------------------------
.../quarks/samples/topology/HelloQuarks.java | 46 ++++++++++++++++++++
.../quarks/samples/topology/HelloWorld.java | 43 ------------------
2 files changed, 46 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/4e704cb0/samples/topology/src/main/java/quarks/samples/topology/HelloQuarks.java
----------------------------------------------------------------------
diff --git a/samples/topology/src/main/java/quarks/samples/topology/HelloQuarks.java b/samples/topology/src/main/java/quarks/samples/topology/HelloQuarks.java
new file mode 100644
index 0000000..7279dd1
--- /dev/null
+++ b/samples/topology/src/main/java/quarks/samples/topology/HelloQuarks.java
@@ -0,0 +1,46 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+package quarks.samples.topology;
+
+import quarks.providers.direct.DirectProvider;
+import quarks.topology.TStream;
+import quarks.topology.Topology;
+
+/**
+ * Hello Quarks Topology sample.
+ *
+ */
+public class HelloQuarks {
+
+ /**
+ * Print "Hello Quarks!" as two tuples.
+ */
+ public static void main(String[] args) throws Exception {
+
+ DirectProvider dp = new DirectProvider();
+
+ Topology top = dp.newTopology();
+
+ TStream<String> helloStream = top.strings("Hello", "Quarks!");
+
+ helloStream.print();
+
+ dp.submit(top);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/4e704cb0/samples/topology/src/main/java/quarks/samples/topology/HelloWorld.java
----------------------------------------------------------------------
diff --git a/samples/topology/src/main/java/quarks/samples/topology/HelloWorld.java b/samples/topology/src/main/java/quarks/samples/topology/HelloWorld.java
deleted file mode 100644
index b9ad530..0000000
--- a/samples/topology/src/main/java/quarks/samples/topology/HelloWorld.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-package quarks.samples.topology;
-
-import quarks.providers.direct.DirectProvider;
-import quarks.topology.Topology;
-
-/**
- * Hello World Topology sample.
- *
- */
-public class HelloWorld {
-
- /**
- * Print Hello World as two tuples.
- */
- public static void main(String[] args) throws Exception {
-
- DirectProvider tp = new DirectProvider();
-
- Topology t = tp.newTopology("HelloWorld");
-
- t.strings("Hello", "World!").print();
-
- tp.submit(t);
- }
-}
[2/2] incubator-quarks git commit: [QUARKS-64] Update scripts for
HelloQuarks changes
Posted by dj...@apache.org.
[QUARKS-64] Update scripts for HelloQuarks changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/181a548e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/181a548e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/181a548e
Branch: refs/heads/master
Commit: 181a548ed66c4e72b65414fbe7bd8e353bd2888d
Parents: 4e704cb
Author: Queenie Ma <qu...@gmail.com>
Authored: Wed Mar 30 10:07:21 2016 -0700
Committer: Queenie Ma <qu...@gmail.com>
Committed: Wed Mar 30 10:07:21 2016 -0700
----------------------------------------------------------------------
quarks_overview.html | 4 ++--
scripts/README | 2 +-
scripts/runhelloquarks.cmd | 20 ++++++++++++++++++++
scripts/runhelloquarks.sh | 23 +++++++++++++++++++++++
scripts/runhelloworld.cmd | 20 --------------------
scripts/runhelloworld.sh | 23 -----------------------
6 files changed, 46 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/181a548e/quarks_overview.html
----------------------------------------------------------------------
diff --git a/quarks_overview.html b/quarks_overview.html
index 38c2245..29251db 100644
--- a/quarks_overview.html
+++ b/quarks_overview.html
@@ -134,8 +134,8 @@ See the {@code README} there.
Summary of samples:
<TABLE border=1 width="80%" table-layout="auto">
<TR class="rowColor"><TH>Sample</TH><TH>Description</TH><TH>Focus</TH></TR>
-<TR class="altColor"><TD>{@link quarks.samples.topology.HelloWorld}</TD>
- <TD>Prints Hello World! to standard output.</TD>
+<TR class="altColor"><TD>{@link quarks.samples.topology.HelloQuarks}</TD>
+ <TD>Prints Hello Quarks! to standard output.</TD>
<TD>Basic mechanics of declaring a topology and executing it.</TD></TR>
<TR class="altColor"><TD>{@link quarks.samples.topology.PeriodicSource}</TD>
<TD>Polls a random number generator for a new value every second
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/181a548e/scripts/README
----------------------------------------------------------------------
diff --git a/scripts/README b/scripts/README
index 1a89964..8b5768a 100644
--- a/scripts/README
+++ b/scripts/README
@@ -5,7 +5,7 @@ The source code for the samples is in the <quarks-release>/samples directory.
The samples can be run via by their run*.sh
shell scripts from this directory. e.g.,
-$ ./runhelloworld.sh
+$ ./runhelloquarks.sh
Note: On Windows, use an environment like Cygwin
to run these linux shell scripts.
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/181a548e/scripts/runhelloquarks.cmd
----------------------------------------------------------------------
diff --git a/scripts/runhelloquarks.cmd b/scripts/runhelloquarks.cmd
new file mode 100644
index 0000000..2e263d9
--- /dev/null
+++ b/scripts/runhelloquarks.cmd
@@ -0,0 +1,20 @@
+@echo OFF
+
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+REM Runs HelloQuarks
+set CLASSPATH=..\samples\lib\quarks.samples.topology.jar
+java quarks.samples.topology.HelloQuarks
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/181a548e/scripts/runhelloquarks.sh
----------------------------------------------------------------------
diff --git a/scripts/runhelloquarks.sh b/scripts/runhelloquarks.sh
new file mode 100755
index 0000000..315d832
--- /dev/null
+++ b/scripts/runhelloquarks.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+quarks=..
+
+# Runs HelloQuarks
+#
+export CLASSPATH="${quarks}/samples/lib/quarks.samples.topology.jar"
+java quarks.samples.topology.HelloQuarks
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/181a548e/scripts/runhelloworld.cmd
----------------------------------------------------------------------
diff --git a/scripts/runhelloworld.cmd b/scripts/runhelloworld.cmd
deleted file mode 100644
index 4a10f9d..0000000
--- a/scripts/runhelloworld.cmd
+++ /dev/null
@@ -1,20 +0,0 @@
-@echo OFF
-
-REM Licensed to the Apache Software Foundation (ASF) under one or more
-REM contributor license agreements. See the NOTICE file distributed with
-REM this work for additional information regarding copyright ownership.
-REM The ASF licenses this file to You under the Apache License, Version 2.0
-REM (the "License"); you may not use this file except in compliance with
-REM the License. You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-
-REM Runs HelloWorld
-set CLASSPATH=..\samples\lib\quarks.samples.topology.jar
-java quarks.samples.topology.HelloWorld
http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/181a548e/scripts/runhelloworld.sh
----------------------------------------------------------------------
diff --git a/scripts/runhelloworld.sh b/scripts/runhelloworld.sh
deleted file mode 100755
index 1d0004c..0000000
--- a/scripts/runhelloworld.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-quarks=..
-
-# Runs HelloWorld
-#
-export CLASSPATH="${quarks}/samples/lib/quarks.samples.topology.jar"
-java quarks.samples.topology.HelloWorld