Refactoring the packages

diff --git a/PartsList/PartsList/app/controllers/Application.scala b/PartsList/PartsList/app/controllers/Application.scala
index a930f8b..43bb019 100644 (file)
--- a/PartsList/PartsList/app/controllers/Application.scala
+++ b/PartsList/PartsList/app/controllers/Application.scala
@@ -13,40 +13,7 @@ import org.squeryl.PrimitiveTypeMode._
 object Application extends Controller {
   
   def index = Action { implicit request =>
-    Ok(views.html.index("Your new application is not ready."))
+    Ok(views.html.index("Your new application is ready."))
   }
-  
-  def picture = Action {
-    Ok(views.html.uploadTestForm())
-  }
-  
-  def upload = Action(parse.multipartFormData) { request =>
-      inTransaction {
-    request.body.file("picture").map { picture =>
-      val filename = picture.filename
-      val contentType = picture.contentType
-      var atach = Messages("atach.folder")
-      if(!atach.endsWith("/")) {atach = atach.concat("/")}
-      val url = atach + filename
-      picture.ref.moveTo(new File(url), true)
-      PartsListDb.atachs.insert(Atach(contentType.get, filename, "AAA", 1))
-      
-      Ok("File upload -- " + filename + " -- "+ contentType.get)
-    }.getOrElse{
-      Redirect(routes.Application.index).flashing(
-          "error" -> "Missing file"
-       )
-    }
-     }
-  }
-  
-  def show = Action {
-    val file = new File("/home/uyaji/git/Relation/PartsList/attach/picture.jpg")
-    val data = new Array[Byte](file.length().asInstanceOf[Int])
-    val io = new FileInputStream(file)
-    io.read(data)
-    io.close()
-    Ok(data).as("image/jpeg")
-  }
-  
-}
+ 
+}
\ No newline at end of file

diff --git a/PartsList/PartsList/app/controllers/NotifyController.scala b/PartsList/PartsList/app/controllers/NotifyController.scala
index e3bc6a7..ad0404f 100644 (file)
--- a/PartsList/PartsList/app/controllers/NotifyController.scala
+++ b/PartsList/PartsList/app/controllers/NotifyController.scala
@@ -8,9 +8,9 @@ import play.api.data.Forms._
 import play.api.data.validation.Constraints._
 import forms._
 import models._
-import utils._
+import models.services._
+import infra.services._
 import beans._
-import services._
 import org.squeryl._
 import org.squeryl.PrimitiveTypeMode._
 import scala.collection.mutable.ArrayBuffer

diff --git a/PartsList/PartsList/app/controllers/PartsListController.scala b/PartsList/PartsList/app/controllers/PartsListController.scala
index 4bb7fde..e2ba03b 100644 (file)
--- a/PartsList/PartsList/app/controllers/PartsListController.scala
+++ b/PartsList/PartsList/app/controllers/PartsListController.scala
@@ -9,10 +9,11 @@ import org.squeryl._
 import org.squeryl.PrimitiveTypeMode._
 import views._
 import models._
+import models.services._
 import beans._
 import forms._
-import utils._
-import services._
+import controllers.services._
+import models.services._
 import scala.collection.mutable.ArrayBuffer
 
 object PartsListController extends Controller{

diff --git a/PartsList/PartsList/app/controllers/PartsMasterController.scala b/PartsList/PartsList/app/controllers/PartsMasterController.scala
index 12b2ed3..078e5ea 100644 (file)
--- a/PartsList/PartsList/app/controllers/PartsMasterController.scala
+++ b/PartsList/PartsList/app/controllers/PartsMasterController.scala
@@ -7,6 +7,7 @@ import play.api.data._
 import play.api.data.Forms._
 import forms._
 import models._
+import models.services._
 import beans._
 import services._
 import org.squeryl._

diff --git a/PartsList/PartsList/app/controllers/ReplyController.scala b/PartsList/PartsList/app/controllers/ReplyController.scala
index ada654e..65d8f6e 100644 (file)
--- a/PartsList/PartsList/app/controllers/ReplyController.scala
+++ b/PartsList/PartsList/app/controllers/ReplyController.scala
@@ -5,8 +5,8 @@ import play.api.data._
 import play.api.data.Forms._
 import forms._
 import models._
-import utils._
-import services._
+import models.services._
+import infra.services._
 import org.squeryl._
 import org.squeryl.PrimitiveTypeMode._
 import scala.collection.mutable.ArrayBuffer

diff --git a/PartsList/PartsList/app/utils/Recursion.scala b/PartsList/PartsList/app/controllers/services/Recursion.scala
similarity index 97%
rename from PartsList/PartsList/app/utils/Recursion.scala
rename to PartsList/PartsList/app/controllers/services/Recursion.scala
index 1666a4d..6e6ef08 100644 (file)
--- a/PartsList/PartsList/app/utils/Recursion.scala
+++ b/PartsList/PartsList/app/controllers/services/Recursion.scala
@@ -1,4 +1,4 @@
-package utils
+package controllers.services
 import models._
 import beans._
 import scala.collection.mutable.ArrayBuffer

diff --git a/PartsList/PartsList/app/utils/SendMail.scala b/PartsList/PartsList/app/infra/services/SendMail.scala
similarity index 98%
rename from PartsList/PartsList/app/utils/SendMail.scala
rename to PartsList/PartsList/app/infra/services/SendMail.scala
index 4962a10..e79eeb9 100644 (file)
--- a/PartsList/PartsList/app/utils/SendMail.scala
+++ b/PartsList/PartsList/app/infra/services/SendMail.scala
@@ -1,4 +1,4 @@
-package utils
+package infra.services
 import play.api.mvc._
 import play.api._
 import play.api.i18n._

diff --git a/PartsList/PartsList/app/services/AtachManager.scala b/PartsList/PartsList/app/models/services/AtachManager.scala
similarity index 96%
rename from PartsList/PartsList/app/services/AtachManager.scala
rename to PartsList/PartsList/app/models/services/AtachManager.scala
index 12fa816..868e45b 100644 (file)
--- a/PartsList/PartsList/app/services/AtachManager.scala
+++ b/PartsList/PartsList/app/models/services/AtachManager.scala
@@ -1,4 +1,4 @@
-package services
+package models.services
 import models._
 import play.api.i18n._
 import play.api.mvc.MultipartFormData.FilePart

diff --git a/PartsList/PartsList/app/services/PartManager.scala b/PartsList/PartsList/app/models/services/PartManager.scala
similarity index 94%
rename from PartsList/PartsList/app/services/PartManager.scala
rename to PartsList/PartsList/app/models/services/PartManager.scala
index 9f8ba2c..c63a615 100644 (file)
--- a/PartsList/PartsList/app/services/PartManager.scala
+++ b/PartsList/PartsList/app/models/services/PartManager.scala
@@ -1,6 +1,7 @@
-package services
+package models.services
 import models._
 import forms._
+import models.services._
 import org.squeryl._
 import org.squeryl.PrimitiveTypeMode._
 

diff --git a/PartsList/PartsList/app/services/ProjectManager.scala b/PartsList/PartsList/app/models/services/ProjectManager.scala
similarity index 89%
rename from PartsList/PartsList/app/services/ProjectManager.scala
rename to PartsList/PartsList/app/models/services/ProjectManager.scala
index cdcefba..64602b5 100644 (file)
--- a/PartsList/PartsList/app/services/ProjectManager.scala
+++ b/PartsList/PartsList/app/models/services/ProjectManager.scala
@@ -1,4 +1,4 @@
-package services
+package models.services
 import models._
 import org.squeryl._
 import org.squeryl.PrimitiveTypeMode._

diff --git a/PartsList/PartsList/app/views/uploadTestForm.scala.html b/PartsList/PartsList/app/views/uploadTestForm.scala.html
deleted file mode 100644 (file)
index b9002ac..0000000
--- a/PartsList/PartsList/app/views/uploadTestForm.scala.html
+++ /dev/null
@@ -1,10 +0,0 @@
-@import helper._
-@main("Upload Part by Play 2.1") {
-       @form(action = routes.Application.upload, 'enctype -> "multipart/form-data") {
-               <input type="file" name="picture">
-               <p>
-                       <input type="submit">
-               </p>
-               <br />
-       }
-}
\ No newline at end of file

diff --git a/PartsList/PartsList/conf/routes b/PartsList/PartsList/conf/routes
index b741b58..e15446d 100644 (file)
--- a/PartsList/PartsList/conf/routes
+++ b/PartsList/PartsList/conf/routes
@@ -55,9 +55,6 @@ GET            /partDelete/:id                                 controllers.PartsMasterController.partDelete(id:Long)
 GET             /relationDelete/:parentName/:childName                          controllers.PartsListController.relationDelete(parentName:String, childName:String)
 GET             /showAtach                                      controllers.AtachController.showAtach(id:Long)
 GET             /dropAtach                                      controllers.AtachController.dropAtach(id:Long)
-GET             /picture                                                controllers.Application.picture
-POST    /upload                                                 controllers.Application.upload
-GET             /show                                                   controllers.Application.show
 GET             /projectAutocomple                      controllers.Autocomplete.projectList()
 GET             /partAutocomplete                       controllers.Autocomplete.partList()
 GET             /userAutocomplete                       controllers.Autocomplete.userList()