Renamed and resttructured project to allign with other Scala DSL efforts

Author: olegz

build.gradle

@@ -50,11 +50,11 @@ subprojects { subproject ->
   dependencies {
 
 	// Libraries needed for scala api
-    compile 'org.scala-lang:scala-library:2.9.1'
+    compile 'org.scala-lang:scala-library:2.9.2'
 
 	// Libraries needed to run the scala tools
-    scalaTools 'org.scala-lang:scala-compiler:2.9.1'
-    scalaTools 'org.scala-lang:scala-library:2.9.1'
+    scalaTools 'org.scala-lang:scala-compiler:2.9.2'
+    scalaTools 'org.scala-lang:scala-library:2.9.2'
 
     testCompile "junit:junit-dep:$junitVersion"
     testCompile "log4j:log4j:$log4jVersion"
@@ -63,7 +63,7 @@ subprojects { subproject ->
   }
 }
 
-project('spring-integration-scala-core') {
+project('spring-integration-dsl-scala-core') {
   description = 'Spring Integration Scala Core'
   dependencies {
     // dependent libraries
@@ -72,10 +72,10 @@ project('spring-integration-scala-core') {
   }
 }
 
-project('spring-integration-scala-jms') {
+project('spring-integration-dsl-scala-jms') {
   description = 'Spring Integration Scala JMS'
   dependencies {
-    compile project(":spring-integration-scala-core")
+    compile project(":spring-integration-dsl-scala-core")
     compile "org.springframework.integration:spring-integration-jms:$springintegrationVersion"
     compile ("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1") 
 
@@ -86,22 +86,22 @@ project('spring-integration-scala-jms') {
   }
 }
 
-project('spring-integration-scala-gemfire') {
+project('spring-integration-dsl-scala-gemfire') {
     description = 'Spring Integration Scala GemFire'
     test {
         forkEvery = 1
         systemProperties['gemfire.disableShutdownHook'] = 'true'
     }
     dependencies {
-        compile project(":spring-integration-scala-core")
+        compile project(":spring-integration-dsl-scala-core")
         compile "org.springframework.integration:spring-integration-gemfire:$springintegrationVersion"
     }
 }
 
-project('spring-integration-scala-http') {
+project('spring-integration-dsl-scala-http') {
   description = 'Spring Integration Scala HTTP'
   dependencies {
-    compile project(":spring-integration-scala-core")
+    compile project(":spring-integration-dsl-scala-core")
     compile "org.springframework.integration:spring-integration-http:$springintegrationVersion"
   }
 }

settings.gradle

@@ -1,6 +1,6 @@
-rootProject.name = 'spring-integration-scala'
+rootProject.name = 'spring-integration-dsl-scala'
 
-include 'spring-integration-scala-core'
-include 'spring-integration-scala-http'
-include 'spring-integration-scala-jms'
-include 'spring-integration-scala-gemfire'
+include 'spring-integration-dsl-scala-core'
+include 'spring-integration-dsl-scala-http'
+include 'spring-integration-dsl-scala-jms'
+include 'spring-integration-dsl-scala-gemfire'

spring-integration-scala-core/src/main/scala/org/springframework/integration/dsl/AggregatorEndpointDsl.scala renamed to spring-integration-dsl-scala-core/src/main/scala/org/springframework/integration/dsl/AggregatorEndpointDsl.scala

@@ -316,3 +316,8 @@
 2012-05-22T10:19:18,INFO,LicenseActivatedEvent,expirationDate=unset|expirationType=floating-eval|serialNumber=G04E0-MFK43-M8E1H-0ZARK-AV25A|allowedVersions=vf.gf.dmn-6|available=60
 2012-05-22T10:19:18,INFO,ComponentStateChangeEvent,instanceIdType=self|instanceId=self|timestamp=2012-05-22T10:19:18|state=on
 2012-05-22T10:19:18,INFO,UpdatedLicenseStateEvent,enforcement=soft|licenseType=local|expirationDate=2012-07-21T10:19:18|used=1|available=60|addons=vf.gf.evaluation
+2012-05-22T10:37:10,INFO,EventManagerStartedEvent,
+2012-05-22T10:37:10,INFO,LicenseActivatedEvent,expirationDate=unset|expirationType=floating-eval|serialNumber=G04E0-MFK43-M8E1H-0ZARK-AV25A|allowedVersions=vf.gf.dmn-6|available=60
+2012-05-22T10:37:10,INFO,LicenseActivatedEvent,expirationDate=unset|expirationType=floating-eval|serialNumber=G04E0-MFK43-M8E1H-0ZARK-AV25A|allowedVersions=vf.gf.dmn-6|available=60
+2012-05-22T10:37:10,INFO,ComponentStateChangeEvent,instanceIdType=self|instanceId=self|timestamp=2012-05-22T10:37:10|state=on
+2012-05-22T10:37:10,INFO,UpdatedLicenseStateEvent,enforcement=soft|licenseType=local|expirationDate=2012-07-21T10:37:10|used=1|available=60|addons=vf.gf.evaluation

spring-integration-scala-core/src/main/scala/org/springframework/integration/dsl/BaseIntegrationComposition.scala renamed to spring-integration-dsl-scala-core/src/main/scala/org/springframework/integration/dsl/BaseIntegrationComposition.scala

@@ -0,0 +1,2 @@
+# vf.gf.dmn written May 22, 2012 10:37:10 AM EDT
+instance.self=self,on,1337697430465