You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/03 15:44:14 UTC
svn commit: r1607646 - in /tomee/tomee/trunk: examples/scala-basic/
examples/scala-basic/build.sbt
examples/scala-basic/src/main/scala/org/superbiz/GreetingService.scala
examples/scala-basic/src/test/scala/org/superbiz/GreetingServiceTest.scala
pom.xml
Author: andygumbrecht
Date: Thu Jul 3 13:44:13 2014
New Revision: 1607646
URL: http://svn.apache.org/r1607646
Log:
Update scala
Modified:
tomee/tomee/trunk/examples/scala-basic/ (props changed)
tomee/tomee/trunk/examples/scala-basic/build.sbt
tomee/tomee/trunk/examples/scala-basic/src/main/scala/org/superbiz/GreetingService.scala
tomee/tomee/trunk/examples/scala-basic/src/test/scala/org/superbiz/GreetingServiceTest.scala
tomee/tomee/trunk/pom.xml
Propchange: tomee/tomee/trunk/examples/scala-basic/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 3 13:44:13 2014
@@ -1,3 +1,4 @@
-target
*.iml
.idea
+project
+target
Modified: tomee/tomee/trunk/examples/scala-basic/build.sbt
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/scala-basic/build.sbt?rev=1607646&r1=1607645&r2=1607646&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/scala-basic/build.sbt (original)
+++ tomee/tomee/trunk/examples/scala-basic/build.sbt Thu Jul 3 13:44:13 2014
@@ -22,13 +22,13 @@ version := "1.1.0-SNAPSHOT"
scalaVersion := "2.11.1"
resolvers ++= Seq(
- "Local Maven Repository" at "file://" + Path.userHome.absolutePath + "/.m2/repository",
- "Apache Snapshots" at "https://repository.apache.org/content/groups/snapshots/"
+ "Local Maven Repository" at "file://" + Path.userHome.absolutePath + "/.m2/repository",
+ "Apache Snapshots" at "https://repository.apache.org/content/groups/snapshots/"
)
libraryDependencies ++= Seq(
- "org.apache.openejb" % "javaee-api" % "6.0-6",
- "org.apache.openejb" % "openejb-core" % "5.0.0-SNAPSHOT" % "test",
- "org.scalatest" %% "scalatest" % "1.6.1" % "test"
+ "org.apache.openejb" % "javaee-api" % "6.0-6",
+ "org.apache.openejb" % "openejb-core" % "5.0.0-SNAPSHOT" % "test",
+ "org.scalatest" %% "scalatest_2.11" % "2.2.0" % "test"
)
Modified: tomee/tomee/trunk/examples/scala-basic/src/main/scala/org/superbiz/GreetingService.scala
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/scala-basic/src/main/scala/org/superbiz/GreetingService.scala?rev=1607646&r1=1607645&r2=1607646&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/scala-basic/src/main/scala/org/superbiz/GreetingService.scala (original)
+++ tomee/tomee/trunk/examples/scala-basic/src/main/scala/org/superbiz/GreetingService.scala Thu Jul 3 13:44:13 2014
@@ -6,7 +6,7 @@
* (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
+ * 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,
@@ -16,21 +16,21 @@
*/
package org.superbiz
-import javax.ejb.{Singleton, LocalBean, Lock, LockType}
+import javax.ejb.{LocalBean, Lock, LockType, Singleton}
object GreetingService {
- val DefaultName = "Scala"
+ val DefaultName = "Scala"
}
@LocalBean
@Singleton
@Lock(LockType.READ)
class GreetingService {
- def hi(name: String = GreetingService.DefaultName) = {
- if (name != null) {
- "hi " + name
- } else {
- "hi " + GreetingService.DefaultName
- }
+ def hi(name: String = GreetingService.DefaultName) = {
+ if (name != null) {
+ "hi " + name
+ } else {
+ "hi " + GreetingService.DefaultName
}
+ }
}
Modified: tomee/tomee/trunk/examples/scala-basic/src/test/scala/org/superbiz/GreetingServiceTest.scala
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/scala-basic/src/test/scala/org/superbiz/GreetingServiceTest.scala?rev=1607646&r1=1607645&r2=1607646&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/scala-basic/src/test/scala/org/superbiz/GreetingServiceTest.scala (original)
+++ tomee/tomee/trunk/examples/scala-basic/src/test/scala/org/superbiz/GreetingServiceTest.scala Thu Jul 3 13:44:13 2014
@@ -6,7 +6,7 @@
* (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
+ * 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,
@@ -16,48 +16,48 @@
*/
package org.superbiz
-import org.scalatest._
-
import javax.ejb.embeddable.EJBContainer
import javax.inject.Inject
+import org.scalatest._
+
class GreetingServiceTest extends FunSuite with BeforeAndAfterAll with BeforeAndAfterEach {
@Inject
private var service: GreetingService = null
- test ("Hi scala") {
+ test("Hi scala") {
val message = service hi "scala"
- assert (message == "hi scala")
+ assert(message == "hi scala")
}
- test ("Default Hi") {
+ test("Default Hi") {
val message = service.hi()
- assert (message == "hi Scala")
+ assert(message == "hi Scala")
}
- test ("Hi null") {
+ test("Hi null") {
val message = service.hi(null)
- assert (message == "hi Scala") // when called with null we use default name
+ assert(message == "hi Scala") // when called with null we use default name
}
- /***************************************************************/
+ /** *************************************************************/
/** the OpenEJB Hook to be able to inject beans in this class **/
/** kind of internal of this test class, "hidden" being last **/
- /***************************************************************/
+ /** *************************************************************/
private var container: EJBContainer = null
- override def beforeAll () {
- container = EJBContainer.createEJBContainer ()
+ override def beforeAll() {
+ container = EJBContainer.createEJBContainer()
}
- override def beforeEach () {
- container.getContext().bind ("inject", this)
+ override def beforeEach() {
+ container.getContext().bind("inject", this)
}
- override def afterAll () {
+ override def afterAll() {
if (container != null) {
- container.close()
+ container.close()
}
}
}
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1607646&r1=1607645&r2=1607646&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Thu Jul 3 13:44:13 2014
@@ -307,11 +307,6 @@
<artifactId>maven-doap-plugin</artifactId>
<version>1.1</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.4</version>
- </plugin>
</plugins>
</pluginManagement>