Merge pull request #27 from ifreitas/Scala-2.11

Scala 2.11
ifreitas · Feb 25, 2018 · 9dace37 · 9dace37
2 parents e505242 + 2208aac
commit 9dace37
Show file tree

Hide file tree

Showing 73 changed files with 168 additions and 400 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.gitignore b/.gitignore
@@ -15,5 +15,8 @@ profiles
 log/
 .cache
 .settings
+.classpath
+.project
 databases
 knowledge_base
+/bin/
diff --git a/.project b/.project
diff --git a/build.sbt b/build.sbt
@@ -4,32 +4,39 @@ version := "0.3.2"
 
 organization := "Israel Freitas"
 
-scalaVersion := "2.10.2"
+scalaVersion := "2.11.0"
 
 EclipseKeys.withSource := true
 
 resolvers ++= Seq(
-                  "snapshots"            at "http://oss.sonatype.org/content/repositories/snapshots",
-                  "staging"              at "http://oss.sonatype.org/content/repositories/staging"  ,
-                  "releases"             at "http://oss.sonatype.org/content/repositories/releases" ,
+                  "snapshots"            at "https://oss.sonatype.org/content/repositories/snapshots",
+                  "staging"              at "https://oss.sonatype.org/content/repositories/staging"  ,
+                  "releases"             at "https://oss.sonatype.org/content/repositories/releases" ,
                   "Ansvia Releases Repo" at "http://scala.repo.ansvia.com/releases/"
                  )
 
-seq(webSettings :_*)
+enablePlugins(JettyPlugin)
 
 mainClass := Some("RunWebApp")
 
-//unmanagedResourceDirectories in Test <+= (baseDirectory) { _ / "src/main/webapp" }
+unmanagedResourceDirectories in Test += (baseDirectory) { _ / "src/main/webapp" }.value
 
 scalacOptions ++= Seq("-deprecation", "-unchecked")
 
 libraryDependencies ++= {
-  val liftVersion = "2.6-M2"
+  val liftVersion = "2.6"
   Seq(
-    "org.eclipse.jetty"        % "jetty-webapp"   % "8.1.12.v20130726"    % "compile,container,test",
-    "org.eclipse.jetty.orbit"  % "javax.servlet"  % "3.0.0.v201112011016" % "compile,container,test" artifacts Artifact("javax.servlet", "jar", "jar"),
-    "org.scalatest"            % "scalatest_2.10"              % "2.0.M8"              % "test",
-    "org.mockito"              % "mockito-all"                 % "1.9.5"               % "test",
-    "org.seleniumhq.selenium"  % "selenium-java"               % "2.35.0"              % "test"
+    "org.scala-lang.modules"     %% "scala-xml"         % "1.0.6",
+    "com.ansvia.graph"           %% "blueprints-scala"  % "0.1.61-20150416-SNAPSHOT",
+    "com.orientechnologies"      % "orientdb-core"      % "1.6.3",
+    "com.orientechnologies"      % "orient-commons"     % "1.6.3",
+    "com.orientechnologies"      % "orientdb-client"    % "1.6.3",
+    "net.liftweb"                %% "lift-webkit"       % liftVersion           % "compile" withSources(),
+    "org.eclipse.jetty.orbit"    % "javax.servlet"      % "3.0.0.v201112011016" % "compile,test" artifacts Artifact("javax.servlet", "jar", "jar"),
+    "org.eclipse.jetty"          % "jetty-webapp"       % "8.1.12.v20130726"    % "compile,test",
+    "net.liftweb"                %% "lift-mapper"       % liftVersion           % "compile",
+    "org.scalatest"              %% "scalatest"         % "2.1.3"               % "test",
+    "org.mockito"                % "mockito-all"        % "1.9.5"               % "test",
+    "org.seleniumhq.selenium"    % "selenium-java"      % "2.35.0"              % "test"
   )
 }
diff --git a/lib/activation-1.1.jar b/lib/activation-1.1.jar
diff --git a/lib/aiml-to-xml_2.10-0.15.3.jar b/lib/aiml-to-xml_2.10-0.15.3.jar
diff --git a/lib/aiml-to-xml_2.11-0.15.3.jar b/lib/aiml-to-xml_2.11-0.15.3.jar
diff --git a/lib/ansvia-commons-0.0.7.jar b/lib/ansvia-commons-0.0.7.jar
diff --git a/lib/blueprints-core-2.5.0-20131216.163836-23.jar b/lib/blueprints-core-2.5.0-20131216.163836-23.jar
diff --git a/lib/blueprints-core-2.5.0-SNAPSHOT.jar b/lib/blueprints-core-2.5.0-SNAPSHOT.jar
diff --git a/lib/blueprints-orient-graph-2.5.0-20131216.164251-22.jar b/lib/blueprints-orient-graph-2.5.0-20131216.164251-22.jar
diff --git a/lib/blueprints-scala_2.10-0.1.3-20130629-SNAPSHOT.jar b/lib/blueprints-scala_2.10-0.1.3-20130629-SNAPSHOT.jar
diff --git a/lib/castor-1.1-codegen.jar b/lib/castor-1.1-codegen.jar
diff --git a/lib/castor-1.1.jar b/lib/castor-1.1.jar
diff --git a/lib/colt-1.2.0.jar b/lib/colt-1.2.0.jar
diff --git a/lib/commons-beanutils-1.7.0.jar b/lib/commons-beanutils-1.7.0.jar
diff --git a/lib/commons-beanutils-core-1.8.0.jar b/lib/commons-beanutils-core-1.8.0.jar
diff --git a/lib/commons-codec-1.6.jar b/lib/commons-codec-1.6.jar
diff --git a/lib/commons-collections-3.2.1.jar b/lib/commons-collections-3.2.1.jar
diff --git a/lib/commons-configuration-1.6.jar b/lib/commons-configuration-1.6.jar
diff --git a/lib/commons-dbcp-1.4.jar b/lib/commons-dbcp-1.4.jar
diff --git a/lib/commons-digester-1.8.jar b/lib/commons-digester-1.8.jar
diff --git a/lib/commons-fileupload-1.2.2.jar b/lib/commons-fileupload-1.2.2.jar
diff --git a/lib/commons-lang-2.4.jar b/lib/commons-lang-2.4.jar
diff --git a/lib/commons-logging-1.1.1.jar b/lib/commons-logging-1.1.1.jar
diff --git a/lib/commons-pool-1.5.7.jar b/lib/commons-pool-1.5.7.jar
diff --git a/lib/concurrent-1.3.4.jar b/lib/concurrent-1.3.4.jar
diff --git a/lib/gnu.getopt-1.0.10.jar b/lib/gnu.getopt-1.0.10.jar
diff --git a/lib/gremlin-java-2.5.0-20131204.001019-6.jar b/lib/gremlin-java-2.5.0-20131204.001019-6.jar
diff --git a/lib/htmlparser-1.4.jar b/lib/htmlparser-1.4.jar
diff --git a/lib/jackson-annotations-2.2.2.jar b/lib/jackson-annotations-2.2.2.jar
diff --git a/lib/jackson-core-2.2.2.jar b/lib/jackson-core-2.2.2.jar
diff --git a/lib/jackson-databind-2.2.2.jar b/lib/jackson-databind-2.2.2.jar
diff --git a/lib/jackson-datatype-json-org-2.2.3.jar b/lib/jackson-datatype-json-org-2.2.3.jar
diff --git a/lib/jdbcappender.jar b/lib/jdbcappender.jar
diff --git a/lib/jettison-1.3.3.jar b/lib/jettison-1.3.3.jar
diff --git a/lib/jna-4.0.0.jar b/lib/jna-4.0.0.jar
diff --git a/lib/jna-platform-4.0.0.jar b/lib/jna-platform-4.0.0.jar
diff --git a/lib/joda-convert-1.2.jar b/lib/joda-convert-1.2.jar
diff --git a/lib/joda-time-2.1.jar b/lib/joda-time-2.1.jar
diff --git a/lib/js.jar b/lib/js.jar
diff --git a/lib/json-20090211.jar b/lib/json-20090211.jar
diff --git a/lib/jstl.jar b/lib/jstl.jar
diff --git a/lib/lift-actor_2.10-2.6-M2.jar b/lib/lift-actor_2.10-2.6-M2.jar
diff --git a/lib/lift-common_2.10-2.6-M2.jar b/lib/lift-common_2.10-2.6-M2.jar
diff --git a/lib/lift-db_2.10-2.6-M2.jar b/lib/lift-db_2.10-2.6-M2.jar
diff --git a/lib/lift-json_2.10-2.6-M2.jar b/lib/lift-json_2.10-2.6-M2.jar
diff --git a/lib/lift-mapper_2.10-2.6-M2.jar b/lib/lift-mapper_2.10-2.6-M2.jar
diff --git a/lib/lift-markdown_2.10-2.6-M2.jar b/lib/lift-markdown_2.10-2.6-M2.jar
diff --git a/lib/lift-proto_2.10-2.6-M2.jar b/lib/lift-proto_2.10-2.6-M2.jar
diff --git a/lib/lift-util_2.10-2.6-M2.jar b/lib/lift-util_2.10-2.6-M2.jar
diff --git a/lib/lift-webkit_2.10-2.6-M2.jar b/lib/lift-webkit_2.10-2.6-M2.jar
diff --git a/lib/logback-classic-1.0.6.jar b/lib/logback-classic-1.0.6.jar
diff --git a/lib/logback-core-1.0.6.jar b/lib/logback-core-1.0.6.jar
diff --git a/lib/orient-commons-1.6.3.jar b/lib/orient-commons-1.6.3.jar
diff --git a/lib/orientdb-client-1.6.3.jar b/lib/orientdb-client-1.6.3.jar
diff --git a/lib/orientdb-core-1.6.3.jar b/lib/orientdb-core-1.6.3.jar
diff --git a/lib/orientdb-enterprise-1.6.3.jar b/lib/orientdb-enterprise-1.6.3.jar
diff --git a/lib/orientdb-nativeos-1.6.3.jar b/lib/orientdb-nativeos-1.6.3.jar
diff --git a/lib/paranamer-2.4.1.jar b/lib/paranamer-2.4.1.jar
diff --git a/lib/pipes-2.5.0-20131024.235509-5.jar b/lib/pipes-2.5.0-20131024.235509-5.jar
diff --git a/lib/saxon9he.jar b/lib/saxon9he.jar
diff --git a/lib/scala-reflect-2.10.0.jar b/lib/scala-reflect-2.10.0.jar
diff --git a/lib/slf4j-api-1.7.2.jar b/lib/slf4j-api-1.7.2.jar
diff --git a/lib/snappy-0.3.jar b/lib/snappy-0.3.jar
diff --git a/lib/standard.jar b/lib/standard.jar
diff --git a/lib/stax-api-1.0.1.jar b/lib/stax-api-1.0.1.jar
diff --git a/project/build.properties b/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.1.0
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,3 @@
-addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "0.4.0")
-
-//Enable the sbt eclipse plugin
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
 
+addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "4.0.1")
diff --git a/src/main/scala/brain/models/Teste2.scala b/src/main/scala/brain/models/Teste2.scala
diff --git a/src/main/scala/brain/rest/BrainRest.scala b/src/main/scala/brain/rest/BrainRest.scala
@@ -1,12 +1,12 @@
 /**
  * Copyright 2013 Israel Freitas ([email protected])
- * 
+ *
  * Licensed 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.
@@ -46,9 +46,9 @@ object ContentToValidade{
 
 
 object BrainRest extends RestHelper {
-    
+
     def jsonMessage(success:Boolean, msg:String, httpStatus:Int) = JsonResponse((("success"->success) ~ ("msg"->msg)), httpStatus)
-	
+
     serve("rest"/"validate" prefix {
         case "memorize" :: Nil JsonPost ContentToValidade(fieldContent) -> _ => {
             try{
@@ -69,15 +69,15 @@ object BrainRest extends RestHelper {
         	}
         }
     })
-    
+
     serve("rest"/"chat" prefix{
         case message :: Nil JsonGet _ => {
             jsonMessage(true, ProgramD.response(message), 200)
         }
     })
-    
+
     serve("rest"/"knowledges" prefix{
-        
+
         /*
          * KNOWLEDGE
          */
@@ -93,7 +93,7 @@ object BrainRest extends RestHelper {
                 db.shutdown()
             }
         }
-        
+
         //TODO change to Post!
         case "apply" :: Nil JsonGet _ => {
         	implicit val db = GraphDb.get
@@ -109,7 +109,7 @@ object BrainRest extends RestHelper {
         		db.shutdown()
         	}
         }
-        
+
 
 
         case id :: Nil JsonGet _ => {
@@ -125,7 +125,7 @@ object BrainRest extends RestHelper {
         		db.shutdown()
         	}
         }
-        
+
         // update
         case id :: Nil JsonPut Knowledge(knowledge) -> _ => {
         	implicit val db = GraphDb.get
@@ -144,7 +144,7 @@ object BrainRest extends RestHelper {
         }
 
         // create
-        case Nil JsonPost Knowledge(knowledge) -> _ => { 
+        case Nil JsonPost Knowledge(knowledge) -> _ => {
         	implicit val db = GraphDb.get
 			try{
 			    val vertex = knowledge.save
@@ -159,7 +159,7 @@ object BrainRest extends RestHelper {
         		db.shutdown()
         	}
         }
-        
+
         //requires the id url param
         case id :: Nil JsonDelete _ => {
         	implicit val db = GraphDb.get
@@ -176,7 +176,7 @@ object BrainRest extends RestHelper {
         		db.shutdown()
         	}
         }
-        
+
         /*
          * TOPICS
          */
@@ -192,7 +192,7 @@ object BrainRest extends RestHelper {
                 db.shutdown()
             }
         }
-        
+
               // update
         case knowledgeId :: "topics" :: id :: Nil JsonPut Topic(topic) -> _ => {
         	implicit val db = GraphDb.get
@@ -212,7 +212,7 @@ object BrainRest extends RestHelper {
         }
 
         // create
-        case knowledgeId :: "topics" :: Nil JsonPost Topic(topic) -> _ => { 
+        case knowledgeId :: "topics" :: Nil JsonPost Topic(topic) -> _ => {
         	implicit val db = GraphDb.get
 			try{
 			    //TODO: retornar 404 caso este knowlege nao tenha esta information
@@ -228,7 +228,7 @@ object BrainRest extends RestHelper {
         		db.shutdown()
         	}
         }
-        
+
         //requires the id url param
         case knowledgeId :: "topics" :: id :: Nil JsonDelete _ => {
         	implicit val db = GraphDb.get
@@ -246,7 +246,7 @@ object BrainRest extends RestHelper {
         		db.shutdown()
         	}
         }
-        
+
         /*
          * TEACHINGS
          */
@@ -262,14 +262,14 @@ object BrainRest extends RestHelper {
         		db.shutdown()
         	}
         }
-        
+
         // update
         case knowledgeId :: "topics" :: topicId :: "teachings" :: id :: Nil JsonPut Teaching(teaching) -> _ => {
         	implicit val db = GraphDb.get
 			try{
 				//TODO: retornar 404 caso este knowlege nao tenha esta information
 			    teaching.update
-				
+
 				teaching : JValue
 			}
         	catch{
@@ -279,9 +279,9 @@ object BrainRest extends RestHelper {
         		db.shutdown()
         	}
         }
-        
+
         // create
-        case knowledgeId :: "topics" :: topicId :: "teachings" :: Nil JsonPost Teaching(teaching) -> _ => { 
+        case knowledgeId :: "topics" :: topicId :: "teachings" :: Nil JsonPost Teaching(teaching) -> _ => {
         	implicit val db = GraphDb.get
 			try{
 				//TODO: retornar 404 caso este knowlege nao tenha esta information
@@ -297,7 +297,7 @@ object BrainRest extends RestHelper {
         		db.shutdown()
         	}
         }
-        
+
         //requires the id url param
         case knowledgeId :: "topics" :: topicId :: "teachings" :: id :: Nil JsonDelete _ => {
         	implicit val db = GraphDb.get
@@ -316,5 +316,5 @@ object BrainRest extends RestHelper {
         	}
         }
     })
-    
-}
+
+}