Skip to content

Commit

Permalink
replace scala4fun to utils4s
Browse files Browse the repository at this point in the history
  • Loading branch information
@jacksu
jacksu committed Nov 18, 2015
1 parent 11b4bc8 commit 610c493
Show file tree
Hide file tree
Showing 30 changed files with 65 additions and 38 deletions.
4 changes: 2 additions & 2 deletions analysis-demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>demo</artifactId>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<version>1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>cn.thinkjoy.scala4fun.analysis</groupId>
<groupId>cn.thinkjoy.utils4s.analysis</groupId>
<artifactId>analysis-demo</artifactId>
<inceptionYear>2008</inceptionYear>

Expand Down
2 changes: 1 addition & 1 deletion analysis-demo/src/main/scala/cn/thinkjoy/scala4fun/analysis/analysisApp.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun.analysis
package cn.thinkjoy.utils4s.analysis

import squants.energy.Power
import squants.energy._
Expand Down
4 changes: 2 additions & 2 deletions file-demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>demo</artifactId>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<version>1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>cn.thinkjoy.scala4fun.file</groupId>
<groupId>cn.thinkjoy.utils4s.file</groupId>
<artifactId>file-demo</artifactId>
<inceptionYear>2008</inceptionYear>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion file-demo/src/main/scala/cn/thinkjoy/scala4fun/file/FileApp.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun.file
package cn.thinkjoy.utils4s.file

import better.files._
import java.io.{File=>JFile}
Expand Down
4 changes: 2 additions & 2 deletions json4s-demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>demo</artifactId>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<version>1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>cn.thinkjoy.scala4fun.json4s</groupId>
<groupId>cn.thinkjoy.utils4s.json4s</groupId>
<artifactId>json4s-demo</artifactId>
<inceptionYear>2008</inceptionYear>

Expand Down
2 changes: 1 addition & 1 deletion json4s-demo/src/main/scala/cn/thinkjoy/scala4fun/json4s/Json4sDemo.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun.json4s
package cn.thinkjoy.utils4s.json4s

import org.json4s._
import org.json4s.jackson.JsonMethods._
Expand Down
4 changes: 2 additions & 2 deletions lamma-demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>demo</artifactId>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<version>1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<artifactId>lamma-demo</artifactId>
<inceptionYear>2008</inceptionYear>

Expand Down
2 changes: 1 addition & 1 deletion lamma-demo/src/main/scala/cn/thinkjoy/scala4fun/lamma/BasicOper.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun.lamma
package cn.thinkjoy.utils4s.lamma

import io.lamma._

Expand Down
4 changes: 2 additions & 2 deletions log-demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>demo</artifactId>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<version>1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<artifactId>log-demo</artifactId>
<packaging>pom</packaging>
<inceptionYear>2008</inceptionYear>
Expand Down
2 changes: 1 addition & 1 deletion log-demo/src/main/scala/cn/thinkjoy/scala4fun/App.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun
package cn.thinkjoy.utils4s
import org.log4s._

/**
Expand Down
2 changes: 1 addition & 1 deletion log-demo/src/main/scala/cn/thinkjoy/scala4fun/Logging.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun
package cn.thinkjoy.utils4s
import org.log4s._

/**
Expand Down
2 changes: 1 addition & 1 deletion log-demo/src/main/scala/cn/thinkjoy/scala4fun/LoggingTest.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun
package cn.thinkjoy.utils4s

import org.log4s._

Expand Down
4 changes: 2 additions & 2 deletions nscala-time-demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>demo</artifactId>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<version>1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>cn.thinkjoy.scala4fun.nscala-time</groupId>
<groupId>cn.thinkjoy.utils4s.nscala-time</groupId>
<artifactId>nscala-time-demo</artifactId>
<packaging>pom</packaging>
<inceptionYear>2008</inceptionYear>
Expand Down
2 changes: 1 addition & 1 deletion nscala-time-demo/src/main/scala/cn/thinkjoy/scala4fun/nscala_time/BasicOper.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun.nscala_time
package cn.thinkjoy.utils4s.nscala_time

import com.github.nscala_time.time._
import com.github.nscala_time.time.Imports._
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<artifactId>demo</artifactId>
<packaging>pom</packaging>
<version>1.0</version>
Expand Down Expand Up @@ -40,6 +40,7 @@
<module>resources-demo</module>
<module>file-demo</module>
<module>analysis-demo</module>
<module>twitter-util-demo</module>
</modules>

<build>
Expand Down
4 changes: 2 additions & 2 deletions resources-demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>demo</artifactId>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<version>1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<artifactId>resources-demo</artifactId>
<inceptionYear>2008</inceptionYear>

Expand Down
2 changes: 1 addition & 1 deletion resources-demo/src/main/scala/cn/thinkjoy/scala4fun/resources/ResourcesApp.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun.resources
package cn.thinkjoy.utils4s.resources

import java.util.Properties

Expand Down
4 changes: 2 additions & 2 deletions scala-demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>demo</artifactId>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<version>1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<artifactId>scala-demo</artifactId>
<inceptionYear>2008</inceptionYear>

Expand Down
2 changes: 1 addition & 1 deletion scala-demo/src/main/scala/cn/thinkjoy/scala4fun/CaseClass.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun
package cn.thinkjoy.utils4s

/**
* Created by jacksu on 15/10/24.
Expand Down
2 changes: 1 addition & 1 deletion scala-demo/src/main/scala/cn/thinkjoy/scala4fun/Extract.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun
package cn.thinkjoy.utils4s

/**
* Created by jacksu on 15/10/25.
Expand Down
2 changes: 1 addition & 1 deletion scala-demo/src/main/scala/cn/thinkjoy/scala4fun/PatternMatching.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun
package cn.thinkjoy.utils4s

/**
* Pattern Matching
Expand Down
2 changes: 1 addition & 1 deletion sparkstreaming-demo/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ idea调试过程中，application配置文件的配置如下：
测试命令

```scala
spark-submit --master local[5] --class cn.thinkjoy.scala4fun.sparkstreaming.SparkStreamingDemo sparkstreaming-demo-1.0-SNAPSHOT-jar-with-dependencies.jar 10.254.212.167,10.136.3.214/kafka test test 1 1
spark-submit --master local[5] --class cn.thinkjoy.utils4s.sparkstreaming.SparkStreamingDemo sparkstreaming-demo-1.0-SNAPSHOT-jar-with-dependencies.jar 10.254.212.167,10.136.3.214/kafka test test 1 1
```

在实际环境中，只需去掉 `--master local[5]`
4 changes: 2 additions & 2 deletions sparkstreaming-demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>demo</artifactId>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<version>1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>cn.thinkjoy.scala4fun.sparkstreaming</groupId>
<groupId>cn.thinkjoy.utils4s.sparkstreaming</groupId>
<artifactId>sparkstreaming-demo</artifactId>
<inceptionYear>2008</inceptionYear>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion ...reaming-demo/src/main/scala/cn/thinkjoy/scala4fun/sparkstreaming/SparkStreamingDemo.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun.sparkstreaming
package cn.thinkjoy.utils4s.sparkstreaming

import _root_.kafka.serializer.StringDecoder
import org.apache.spark.storage.StorageLevel
Expand Down
14 changes: 14 additions & 0 deletions twitter-util-demo/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>demo</artifactId>
<groupId>cn.thinkjoy.utils4s</groupId>
<version>1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>cn.thinkjoy.utils4s.twitter.util</groupId>
<artifactId>twitter-util-demo</artifactId>
<inceptionYear>2008</inceptionYear>

</project>
12 changes: 12 additions & 0 deletions twitter-util-demo/src/main/scala/cn/thinkjoy/scala4fun/twitter/util/App.scala
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package cn.thinkjoy.utils4s.twitter.util

/**
* Hello world!
*
*/
object App {
def main(args: Array[String]) {
println( "Hello World!" )
}

}
4 changes: 2 additions & 2 deletions unittest-demo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>demo</artifactId>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<version>1.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>cn.thinkjoy.scala4fun</groupId>
<groupId>cn.thinkjoy.utils4s</groupId>
<artifactId>unittest-demo</artifactId>
<inceptionYear>2008</inceptionYear>

Expand Down
2 changes: 1 addition & 1 deletion unittest-demo/src/main/scala/cn/thinkjoy/scala4fun/App.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun
package cn.thinkjoy.utils4s

/**
* Hello world!
Expand Down
2 changes: 1 addition & 1 deletion unittest-demo/src/test/scala/cn/thinkjoy/scala4fun/StackSpec.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun
package cn.thinkjoy.utils4s

import scala.collection.mutable.Stack

Expand Down
2 changes: 1 addition & 1 deletion unittest-demo/src/test/scala/cn/thinkjoy/scala4fun/UnitSpec.scala
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cn.thinkjoy.scala4fun
package cn.thinkjoy.utils4s

import org.scalatest.{Matchers, FlatSpec}

Expand Down

0 comments on commit 610c493

Please sign in to comment.