Merge pull request #15 from rabobank-nederland/feature/use_rabo_rules

Renamed packages and uses Rabo-Rules 0.6.0
Rabobank-Archive · Sep 17, 2017 · 037097f · 037097f
2 parents 8046baa + 09864c8
commit 037097f
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 38 deletions.
diff --git a/app/controllers/GlossariesController.scala b/app/controllers/GlossariesController.scala
@@ -2,7 +2,7 @@ package controllers
 
 import javax.inject._
 
-import org.scalarules.facts.Fact
+import nl.rabobank.rules.facts.Fact
 import play.api.libs.functional.syntax._
 import play.api.libs.json._
 import play.api.mvc._

diff --git a/app/controllers/RestController.scala b/app/controllers/RestController.scala
@@ -4,9 +4,9 @@ import javax.inject.Inject
 
 import controllers.conversion._
 import controllers.conversion.Converter._
-import org.scalarules.engine.{Context, FactEngine}
-import org.scalarules.facts.Fact
-import org.scalarules.service.dsl.BusinessService
+import nl.rabobank.rules.engine.{Context, FactEngine}
+import nl.rabobank.rules.facts.Fact
+import nl.rabobank.rules.service.dsl.BusinessService
 import play.api.data.validation.ValidationError
 import play.api.libs.json._
 import play.api.mvc.{Action, Controller, Request, Result}

diff --git a/app/controllers/RulesRunner.scala b/app/controllers/RulesRunner.scala
@@ -1,7 +1,7 @@
 package controllers
 
-import org.scalarules.derivations.Derivation
-import org.scalarules.engine._
+import nl.rabobank.rules.derivations.Derivation
+import nl.rabobank.rules.engine._
 
 object RulesRunner {
   def run(context: Context, derivations: List[Derivation]): Context = FactEngine.runNormalDerivations(context, derivations)

diff --git a/app/controllers/conversion/Conversion.scala b/app/controllers/conversion/Conversion.scala
@@ -1,8 +1,8 @@
 package controllers.conversion
 
 import controllers.conversion.ImplicitConversions._
-import org.scalarules.facts.Fact
-import org.scalarules.finance.nl._
+import nl.rabobank.rules.facts.Fact
+import nl.rabobank.rules.finance.nl._
 import play.api.data.validation.ValidationError
 import play.api.libs.json.{JsObject, _}
 

diff --git a/app/controllers/conversion/Converter.scala b/app/controllers/conversion/Converter.scala
@@ -2,8 +2,8 @@ package controllers.conversion
 
 import controllers.conversion.ImplicitConversions.contextReads._
 import controllers.conversion.ImplicitConversions.contextWrites._
-import org.scalarules.engine._
-import org.scalarules.facts.Fact
+import nl.rabobank.rules.engine._
+import nl.rabobank.rules.facts.Fact
 import play.api.data.validation.ValidationError
 import play.api.libs.json._
 

diff --git a/app/controllers/conversion/ImplicitConversions.scala b/app/controllers/conversion/ImplicitConversions.scala
@@ -1,8 +1,8 @@
 package controllers.conversion
 
-import org.scalarules.engine.Context
-import org.scalarules.facts.Fact
-import org.scalarules.finance.nl._
+import nl.rabobank.rules.engine.Context
+import nl.rabobank.rules.facts.Fact
+import nl.rabobank.rules.finance.nl._
 import play.api.data.validation.ValidationError
 import play.api.libs.json._
 

diff --git a/app/controllers/conversion/JsResponse.scala b/app/controllers/conversion/JsResponse.scala
@@ -1,8 +1,8 @@
 package controllers.conversion
 
 import controllers.conversion.Converter._
-import org.scalarules.engine._
-import org.scalarules.facts.Fact
+import nl.rabobank.rules.engine._
+import nl.rabobank.rules.facts.Fact
 import play.api.libs.json.JsObject
 
 trait ResponseJsObject {

diff --git a/app/controllers/conversion/package.scala b/app/controllers/conversion/package.scala
@@ -1,6 +1,6 @@
 package controllers
 
-import org.scalarules.facts.Fact
+import nl.rabobank.rules.facts.Fact
 import play.api.libs.json.{JsObject, JsResult, JsValue}
 
 package object conversion {

diff --git a/app/services/BusinessServicesService.scala b/app/services/BusinessServicesService.scala
@@ -2,7 +2,7 @@ package services
 
 import javax.inject.{Inject, Singleton}
 
-import org.scalarules.service.dsl.BusinessService
+import nl.rabobank.rules.service.dsl.BusinessService
 import play.api.Configuration
 
 @Singleton

diff --git a/app/services/DerivationsService.scala b/app/services/DerivationsService.scala
@@ -2,8 +2,8 @@ package services
 
 import javax.inject.{Inject, Singleton}
 
-import org.scalarules.derivations.Derivation
-import org.scalarules.dsl.nl.grammar.ElementBerekening
+import nl.rabobank.rules.derivations.Derivation
+import nl.rabobank.rules.dsl.nl.grammar.ElementBerekening
 import play.api.{Configuration, Logger}
 
 @Singleton

diff --git a/app/services/GlossariesService.scala b/app/services/GlossariesService.scala
@@ -2,8 +2,8 @@ package services
 
 import javax.inject.{Inject, Singleton}
 
-import org.scalarules.facts.Fact
-import org.scalarules.utils.Glossary
+import nl.rabobank.rules.dsl.core.glossaries.Glossary
+import nl.rabobank.rules.facts.Fact
 import play.api.{Configuration, Logger}
 
 @Singleton

diff --git a/app/services/JarLoaderService.scala b/app/services/JarLoaderService.scala
@@ -5,9 +5,9 @@ import java.util.jar.{JarEntry, JarFile}
 import javax.inject.{Inject, Singleton}
 
 import controllers.conversion.JsonConversionsProvider
-import org.scalarules.dsl.nl.grammar.Berekening
-import org.scalarules.service.dsl.BusinessService
-import org.scalarules.utils.Glossary
+import nl.rabobank.rules.dsl.core.glossaries.Glossary
+import nl.rabobank.rules.dsl.nl.grammar.Berekening
+import nl.rabobank.rules.service.dsl.BusinessService
 import play.api.Configuration
 
 import scala.collection.JavaConverters._

diff --git a/build.sbt b/build.sbt
@@ -6,10 +6,10 @@
 useGpg := false
 
 lazy val commonSettings = Seq(
-  organization := "org.scala-rules",
-  organizationHomepage := Some(url("https://github.com/scala-rules")),
-  homepage := Some(url("https://github.com/scala-rules/rule-rest")),
-  version := "0.0.9-SNAPSHOT",
+  organization := "nl.rabobank.rules",
+  organizationHomepage := Some(url("https://github.com/rabobank-nederland")),
+  homepage := Some(url("https://github.com/rabobank-nederland/rule-rest")),
+  version := "0.1.0-SNAPSHOT",
   scalaVersion := "2.11.8",
   scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-Xlint", "-Xfatal-warnings")
 ) ++ staticAnalysisSettings ++ publishSettings
@@ -21,21 +21,21 @@ lazy val ruleRest = (project in file("."))
   .settings(commonSettings: _*)
   .settings(
     name := "rule-rest",
-    description := "Scala Rules REST Service",
+    description := "Rabo Rules REST Service",
     libraryDependencies ++= dependencies
   )
   .enablePlugins(PlayScala, UniversalDeployPlugin)
 
 
 // *** Dependencies ***
 
-lazy val scalaRulesVersion = "0.5.1"
+lazy val raboRulesVersion = "0.6.0"
 lazy val scalaTestVersion = "3.0.0"
 lazy val jodaTimeVersion = "2.4"
 lazy val jodaConvertVersion = "1.8"
 
 lazy val dependencies = Seq(
-  "org.scala-rules" %% "rule-engine" % scalaRulesVersion,
+  "nl.rabobank.rules" %% "rule-engine" % raboRulesVersion,
   "joda-time" % "joda-time" % jodaTimeVersion,
   "org.joda" % "joda-convert" % jodaConvertVersion,
   "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
@@ -113,8 +113,8 @@ lazy val pom =
     </developer>
   </developers>
   <scm>
-    <connection>scm:git:git@github.com:scala-rules/rule-rest.git</connection>
-    <developerConnection>scm:git:git@github.com:scala-rules/rule-rest.git</developerConnection>
-    <url>git@github.com:scala-rules/rule-rest.git</url>
+    <connection>scm:git:git@github.com:rabobank-nederland/rule-rest.git</connection>
+    <developerConnection>scm:git:git@github.com:rabobank-nederland/rule-rest.git</developerConnection>
+    <url>git@github.com:rabobank-nederland/rule-rest.git</url>
   </scm>
 
diff --git a/conf/application.conf b/conf/application.conf
@@ -1,4 +1,4 @@
-# Main configuration for ScalaRules Rule Viewer
+# Main configuration for RaboRules Rule Viewer
 
 # Secret key for crypto
 play.crypto.secret="%APPLICATION_SECRET%"
@@ -16,7 +16,7 @@ sources.root = "/public/sources/"
 # Note: these are ABSOLUTE paths
 jars.load = [
   // Add location to JARs containing Glossaries and Berekeningen, example:
-  // "C:/RootOfM2Folder/.m2/repository/org/scala-rules/examples_2.11/1.0.1-SNAPSHOT/examples_2.11-1.0.1-SNAPSHOT.jar"
+  // "C:/RootOfM2Folder/.m2/repository/nl/rabobank/rules/examples_2.11/1.0.1-SNAPSHOT/examples_2.11-1.0.1-SNAPSHOT.jar"
 ]
 
 # CORS Configuration

diff --git a/project/scalastyle-config.xml b/project/scalastyle-config.xml
@@ -1,5 +1,5 @@
 <scalastyle>
-    <name>ScalaRules standard configuration</name>
+    <name>RaboRules standard configuration</name>
 
     <check level="warning" class="org.scalastyle.file.FileLengthChecker" enabled="true">
         <parameters>

diff --git a/project/scalastyle-test-config.xml b/project/scalastyle-test-config.xml
@@ -1,5 +1,5 @@
 <scalastyle>
-    <name>ScalaRules test configuration</name>
+    <name>RaboRules test configuration</name>
 
     <check level="warning" class="org.scalastyle.file.FileLengthChecker" enabled="true">
         <parameters>