Skip to content

Commit 9343a40

Browse files
committed
part of gearpump#397 move distributed shell to examples
1 parent 66d71b8 commit 9343a40

File tree

61 files changed

+27
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+27
-27
lines changed

experiments/distributedshell/src/main/scala/org/apache/gearpump/distributedshell/DistShellAppMaster.scala renamed to examples/distributedshell/src/main/scala/org/apache/gearpump/examples/distributedshell/DistShellAppMaster.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
package org.apache.gearpump.distributedshell
18+
package org.apache.gearpump.examples.distributedshell
1919

2020
import akka.actor.{Deploy, Props}
2121
import akka.remote.RemoteScope
2222
import com.typesafe.config.{ConfigFactory, Config}
2323
import org.apache.gearpump.cluster.ClientToMaster.ShutdownApplication
2424
import org.apache.gearpump.cluster.appmaster.ExecutorSystemScheduler.{ExecutorSystemJvmConfig, StartExecutorSystemTimeout, ExecutorSystemStarted}
2525
import org.apache.gearpump.cluster.{ApplicationMaster, ExecutorContext, AppMasterContext, Application}
26-
import org.apache.gearpump.distributedshell.DistShellAppMaster._
26+
import org.apache.gearpump.examples.distributedshell.DistShellAppMaster._
2727
import org.apache.gearpump.util.{LogUtil, Constants, ActorUtil, Util}
2828
import org.slf4j.Logger
2929

experiments/distributedshell/src/main/scala/org/apache/gearpump/distributedshell/DistributedShell.scala renamed to examples/distributedshell/src/main/scala/org/apache/gearpump/examples/distributedshell/DistributedShell.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
package org.apache.gearpump.distributedshell
18+
package org.apache.gearpump.examples.distributedshell
1919

20-
import org.apache.gearpump.cluster.{UserConfig, ClusterConfig, Application}
20+
import org.apache.gearpump.cluster.{UserConfig, Application}
2121
import org.apache.gearpump.cluster.client.ClientContext
2222
import org.apache.gearpump.cluster.main.{ParseResult, CLIOption, ArgumentsParser}
2323
import org.apache.gearpump.util.LogUtil
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
package org.apache.gearpump.distributedshell
18+
package org.apache.gearpump.examples.distributedshell
1919

2020
import org.apache.gearpump.cluster.client.ClientContext
2121
import org.apache.gearpump.cluster.main.{ArgumentsParser, CLIOption}
22-
import org.apache.gearpump.distributedshell.DistShellAppMaster.ShellCommand
22+
import org.apache.gearpump.examples.distributedshell.DistShellAppMaster.ShellCommand
2323

2424
import akka.pattern.ask
2525
import org.apache.gearpump.util.Constants

experiments/distributedshell/src/main/scala/org/apache/gearpump/distributedshell/ShellExecutor.scala renamed to examples/distributedshell/src/main/scala/org/apache/gearpump/examples/distributedshell/ShellExecutor.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
* limitations under the License.
1717
*/
1818

19-
package org.apache.gearpump.distributedshell
19+
package org.apache.gearpump.examples.distributedshell
2020

2121
import akka.actor.Actor
2222
import org.apache.gearpump.cluster.{UserConfig, ExecutorContext}
23-
import org.apache.gearpump.distributedshell.DistShellAppMaster.{ShellCommand, ShellCommandResult}
23+
import org.apache.gearpump.examples.distributedshell.DistShellAppMaster.{ShellCommandResult, ShellCommand}
2424
import org.apache.gearpump.util.LogUtil
2525
import org.slf4j.Logger
2626

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
package org.apache.gearpump.distributedshell
18+
package org.apache.gearpump.examples.distributedshell
1919

2020
import akka.actor.ActorSystem
2121
import akka.testkit.{TestActorRef, TestProbe}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
package org.apache.gearpump.distributedshell
18+
package org.apache.gearpump.examples.distributedshell
1919

2020
import akka.testkit.TestProbe
2121
import org.apache.gearpump.cluster.ClientToMaster.ResolveAppId
2222
import org.apache.gearpump.cluster.MasterToClient.ResolveAppIdResult
2323
import org.apache.gearpump.cluster.{TestUtil, MasterHarness}
24-
import org.apache.gearpump.distributedshell.DistShellAppMaster.ShellCommand
24+
import org.apache.gearpump.examples.distributedshell.DistShellAppMaster.ShellCommand
2525
import org.apache.gearpump.util.Util
2626
import org.scalatest.{BeforeAndAfter, Matchers, PropSpec}
2727

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
package org.apache.gearpump.distributedshell
18+
package org.apache.gearpump.examples.distributedshell
1919

2020
import com.typesafe.config.Config
2121
import org.apache.gearpump.cluster.ClientToMaster.SubmitApplication
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
package org.apache.gearpump.distributedshell
18+
package org.apache.gearpump.examples.distributedshell
1919

2020
import org.scalatest.{BeforeAndAfter, Matchers, WordSpec}
21-
import org.apache.gearpump.distributedshell.DistShellAppMaster.{ShellCommandResultAggregator, ShellCommandResult}
21+
import org.apache.gearpump.examples.distributedshell.DistShellAppMaster.{ShellCommandResultAggregator, ShellCommandResult}
2222

2323

2424
class ShellCommandResultAggregatorSpec extends WordSpec with Matchers with BeforeAndAfter {

experiments/distributedshell/src/test/scala/org/apache/gearpump/distributedshell/ShellExecutorSpec.scala renamed to examples/distributedshell/src/test/scala/org/apache/gearpump/examples/distributedshell/ShellExecutorSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
package org.apache.gearpump.distributedshell
18+
package org.apache.gearpump.examples.distributedshell
1919

2020
import akka.actor.{ActorSystem, Props}
2121
import akka.testkit.TestProbe
2222
import org.apache.gearpump.cluster.scheduler.Resource
2323
import org.apache.gearpump.cluster.{ExecutorContext, TestUtil, UserConfig}
24-
import org.apache.gearpump.distributedshell.DistShellAppMaster.{ShellCommand, ShellCommandResult}
24+
import org.apache.gearpump.examples.distributedshell.DistShellAppMaster.{ShellCommand, ShellCommandResult}
2525
import org.scalatest.{Matchers, WordSpec}
2626

2727
import scala.sys.process._

project/Build.scala

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ object Build extends sbt.Build {
173173
"master" -> Seq("-DlogFilename=master"),
174174
"worker" -> Seq("-DlogFilename=worker")
175175
),
176-
packExclude := Seq(fsio.id, examples_kafka.id, sol.id, wordcount.id, complexdag.id, examples.id),
176+
packExclude := Seq(fsio.id, examples_kafka.id, sol.id, wordcount.id, complexdag.id, examples.id, distributedshell.id),
177177
packResourceDir += (baseDirectory.value / "conf" -> "conf"),
178178
packResourceDir += (baseDirectory.value / "services" / "dashboard" -> "dashboard"),
179179
packResourceDir += (baseDirectory.value / "examples" / "target" / scalaVersionMajor -> "examples"),
@@ -190,7 +190,7 @@ object Build extends sbt.Build {
190190
packExpandedClasspath := false,
191191
packExtraClasspath := new DefaultValueMap(Seq("${PROG_HOME}/conf", "${PROG_HOME}/dashboard"))
192192
)
193-
).dependsOn(core, streaming, services, external_kafka, distributedshell)
193+
).dependsOn(core, streaming, services, external_kafka)
194194
.aggregate(core, streaming, fsio, examples_kafka, sol, wordcount, complexdag, services, external_kafka, examples, distributedshell)
195195

196196
lazy val core = Project(
@@ -229,7 +229,7 @@ object Build extends sbt.Build {
229229

230230
lazy val examples_kafka = Project(
231231
id = "gearpump-examples-kafka",
232-
base = file("examples/kafka"),
232+
base = file("examples/streaming/kafka"),
233233
settings = commonSettings ++
234234
Seq(
235235
libraryDependencies ++= Seq(
@@ -242,7 +242,7 @@ object Build extends sbt.Build {
242242

243243
lazy val fsio = Project(
244244
id = "gearpump-examples-fsio",
245-
base = file("examples/fsio"),
245+
base = file("examples/streaming/fsio"),
246246
settings = commonSettings ++
247247
Seq(
248248
libraryDependencies ++= Seq(
@@ -255,7 +255,7 @@ object Build extends sbt.Build {
255255

256256
lazy val sol = Project(
257257
id = "gearpump-examples-sol",
258-
base = file("examples/sol"),
258+
base = file("examples/streaming/sol"),
259259
settings = commonSettings ++
260260
Seq(
261261
libraryDependencies ++= Seq(
@@ -268,7 +268,7 @@ object Build extends sbt.Build {
268268

269269
lazy val wordcount = Project(
270270
id = "gearpump-examples-wordcount",
271-
base = file("examples/wordcount"),
271+
base = file("examples/streaming/wordcount"),
272272
settings = commonSettings ++
273273
Seq(
274274
libraryDependencies ++= Seq(
@@ -281,7 +281,7 @@ object Build extends sbt.Build {
281281

282282
lazy val complexdag = Project(
283283
id = "gearpump-examples-complexdag",
284-
base = file("examples/complexdag"),
284+
base = file("examples/streaming/complexdag"),
285285
settings = commonSettings ++
286286
Seq(
287287
libraryDependencies ++= Seq(
@@ -296,7 +296,7 @@ object Build extends sbt.Build {
296296
id = "gearpump-examples",
297297
base = file("examples"),
298298
settings = commonSettings ++ myAssemblySettings
299-
) dependsOn (wordcount, complexdag, sol, fsio, examples_kafka)
299+
) dependsOn (wordcount, complexdag, sol, fsio, examples_kafka, distributedshell)
300300

301301
lazy val services = Project(
302302
id = "gearpump-services",
@@ -331,9 +331,9 @@ object Build extends sbt.Build {
331331
) dependsOn(streaming % "test->test;compile->compile")
332332

333333
lazy val distributedshell = Project(
334-
id = "gearpump-experiments-distributedshell",
335-
base = file("experiments/distributedshell"),
334+
id = "gearpump-examples-distributedshell",
335+
base = file("examples/distributedshell"),
336336
settings = commonSettings
337-
) dependsOn(core % "test->test;compile->compile")
337+
) dependsOn(core % "test->test", core % "provided")
338338

339339
}

0 commit comments

Comments
 (0)