Permalink
Browse files

INTTEMPLATES-14 - Upgrade to SI 2.2.0.RELEASE

  • Loading branch information...
1 parent 3e82024 commit 81fb0e3d48e9a5bc2cb01409f0ee9d5786f8f9dc Gunnar Hillert committed Dec 13, 2012
Showing with 10,717 additions and 188 deletions.
  1. +5 −5 si-sts-templates/pom.xml
  2. +4 −0 si-sts-templates/src/main/assembly/adapter.xml
  3. +11 −0 si-sts-templates/src/main/assembly/standalone-simple.xml
  4. +11 −0 si-sts-templates/src/main/assembly/standalone.xml
  5. +20 −0 si-sts-templates/src/main/assembly/war.xml
  6. +4 −4 si-template-projects/adapter/build.gradle
  7. +0 −1 si-template-projects/adapter/wizard.json
  8. +14 −7 si-template-projects/si-template-standalone-project/build.gradle
  9. BIN si-template-projects/si-template-standalone-project/gradle/wrapper/gradle-wrapper.jar
  10. +6 −0 si-template-projects/si-template-standalone-project/gradle/wrapper/gradle-wrapper.properties
  11. +164 −0 si-template-projects/si-template-standalone-project/gradlew
  12. +90 −0 si-template-projects/si-template-standalone-project/gradlew.bat
  13. +9 −9 si-template-projects/si-template-standalone-project/pom.xml
  14. +57 −0 si-template-projects/si-template-standalone-project/publish-maven.gradle
  15. +2 −2 si-template-projects/si-template-standalone-project/src/main/java/sipackage/Main.java
  16. +5 −4 ...plate-projects/si-template-standalone-project/src/main/java/sipackage/SpringIntegrationUtils.java
  17. +7 −8 ...mplate-projects/si-template-standalone-project/src/main/java/sipackage/TransformationHandler.java
  18. +4 −0 ...s/si-template-standalone-project/src/test/java/sipackage/SpringIntegrationProjectStartupTest.java
  19. +21 −5 si-template-projects/si-template-standalone-project/wizard.json
  20. +13 −5 si-template-projects/si-template-standalone-simple-project/build.gradle
  21. BIN si-template-projects/si-template-standalone-simple-project/gradle/wrapper/gradle-wrapper.jar
  22. +6 −0 si-template-projects/si-template-standalone-simple-project/gradle/wrapper/gradle-wrapper.properties
  23. +164 −0 si-template-projects/si-template-standalone-simple-project/gradlew
  24. +90 −0 si-template-projects/si-template-standalone-simple-project/gradlew.bat
  25. +8 −8 si-template-projects/si-template-standalone-simple-project/pom.xml
  26. +57 −0 si-template-projects/si-template-standalone-simple-project/publish-maven.gradle
  27. +0 −34 si-template-projects/si-template-standalone-simple-project/si-template-standalone-simple-project.iml
  28. +2 −2 si-template-projects/si-template-standalone-simple-project/src/main/java/sipackage/Main.java
  29. +2 −2 ...i-template-standalone-simple-project/src/main/java/sipackage/service/StringConversionService.java
  30. +5 −1 ...ts/si-template-standalone-simple-project/src/test/java/sipackage/StringConversionServiceTest.java
  31. +21 −5 si-template-projects/si-template-standalone-simple-project/wizard.json
  32. +3 −3 si-template-projects/si-template-war-project/.project
  33. +2 −1 si-template-projects/si-template-war-project/.settings/com.springsource.sts.config.flow.prefs
  34. +0 −4 si-template-projects/si-template-war-project/.settings/org.eclipse.jdt.core.prefs
  35. +4 −0 si-template-projects/si-template-war-project/.settings/org.eclipse.m2e.core.prefs
  36. +3 −5 si-template-projects/si-template-war-project/.settings/org.eclipse.wst.common.component
  37. +10 −0 si-template-projects/si-template-war-project/README.md
  38. +33 −12 si-template-projects/si-template-war-project/build.gradle
  39. BIN si-template-projects/si-template-war-project/gradle/wrapper/gradle-wrapper.jar
  40. +6 −0 si-template-projects/si-template-war-project/gradle/wrapper/gradle-wrapper.properties
  41. +164 −0 si-template-projects/si-template-war-project/gradlew
  42. +90 −0 si-template-projects/si-template-war-project/gradlew.bat
  43. +18 −10 si-template-projects/si-template-war-project/pom.xml
  44. +57 −0 si-template-projects/si-template-war-project/publish-maven.gradle
  45. +3 −3 ...ct/src/main/java/{stsorg/stsspringframework/stsintegration → sipackage}/model/TwitterMessage.java
  46. +5 −5 ...in/java/{stsorg/stsspringframework/stsintegration → sipackage}/mvc/controller/HomeController.java
  47. +4 −0 si-template-projects/si-template-war-project/src/main/java/sipackage/package-info.java
  48. +4 −4 .../src/main/java/{stsorg/stsspringframework/stsintegration → sipackage}/service/TwitterService.java
  49. +5 −5 ...va/{stsorg/stsspringframework/stsintegration → sipackage}/service/impl/DefaultTwitterService.java
  50. +2 −4 ...emplate-war-project/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
  51. +1 −1 ...plate-projects/si-template-war-project/src/main/resources/META-INF/spring/mvc/servlet-context.xml
  52. +1 −1 si-template-projects/si-template-war-project/src/main/resources/log4j.xml
  53. +1 −1 si-template-projects/si-template-war-project/src/main/webapp/WEB-INF/views/home.jsp
  54. +0 −18 si-template-projects/si-template-war-project/src/main/webapp/js/jquery-1.6.1.min.js
  55. +9,472 −0 si-template-projects/si-template-war-project/src/main/webapp/js/jquery-1.8.3.min.js
  56. +3 −1 ...t/src/test/java/{stsorg/stsspringframework/stsintegration → sipackage}/SpringIntegrationTest.java
  57. +24 −8 si-template-projects/si-template-war-project/wizard.json
View
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.sts.templates</groupId>
<artifactId>si-sts-templates</artifactId>
- <version>1.0.0.M3</version>
+ <version>1.0.0.M4</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
@@ -29,10 +29,10 @@
<template.version>${project.version}</template.version>
<template.category>Integration</template.category>
- <template.standalone.size>12200</template.standalone.size>
- <template.standalone-simple.size>9900</template.standalone-simple.size>
- <template.war.size>61000</template.war.size>
- <template.adapter.size>117000</template.adapter.size>
+ <template.standalone.size>15087</template.standalone.size>
+ <template.standalone-simple.size>12656</template.standalone-simple.size>
+ <template.war.size>64708</template.war.size>
+ <template.adapter.size>118119</template.adapter.size>
</properties>
@@ -30,5 +30,9 @@
<outputDirectory></outputDirectory>
<filtered>true</filtered>
</file>
+ <file>
+ <source>${project.basedir}/../si-template-projects/adapter/.settings/org.eclipse.jdt.core.prefs</source>
+ <outputDirectory>.settings</outputDirectory>
+ </file>
</files>
</assembly>
@@ -18,6 +18,9 @@
<exclude>**/.settings/**</exclude>
<exclude>**/.pmd</exclude>
<exclude>**/.idea/**</exclude>
+ <exclude>**/gradle/**</exclude>
+ <exclude>**/gradlew*</exclude>
+ <exclude>**/publish-maven.gradle</exclude>
<exclude>**/.gradle/**</exclude>
<exclude>**/build.gradle</exclude>
<exclude>**/build/**</exclude>
@@ -32,5 +35,13 @@
<outputDirectory></outputDirectory>
<filtered>true</filtered>
</file>
+ <file>
+ <source>${project.basedir}/../si-template-projects/si-template-standalone-simple-project/.settings/org.eclipse.core.resources.prefs</source>
+ <outputDirectory>.settings</outputDirectory>
+ </file>
+ <file>
+ <source>${project.basedir}/../si-template-projects/si-template-standalone-simple-project/.settings/org.eclipse.jdt.core.prefs</source>
+ <outputDirectory>.settings</outputDirectory>
+ </file>
</files>
</assembly>
@@ -18,6 +18,9 @@
<exclude>**/.settings/**</exclude>
<exclude>**/.pmd</exclude>
<exclude>**/.idea/**</exclude>
+ <exclude>**/gradle/**</exclude>
+ <exclude>**/gradlew*</exclude>
+ <exclude>**/publish-maven.gradle</exclude>
<exclude>**/.gradle/**</exclude>
<exclude>**/build.gradle</exclude>
<exclude>**/build/**</exclude>
@@ -32,5 +35,13 @@
<outputDirectory></outputDirectory>
<filtered>true</filtered>
</file>
+ <file>
+ <source>${project.basedir}/../si-template-projects/si-template-standalone-project/.settings/org.eclipse.core.resources.prefs</source>
+ <outputDirectory>.settings</outputDirectory>
+ </file>
+ <file>
+ <source>${project.basedir}/../si-template-projects/si-template-standalone-project/.settings/org.eclipse.jdt.core.prefs</source>
+ <outputDirectory>.settings</outputDirectory>
+ </file>
</files>
</assembly>
@@ -15,8 +15,12 @@
<excludes>
<exclude>**/*.log</exclude>
<exclude>**/.DS_Store</exclude>
+ <exclude>**/.settings/**</exclude>
<exclude>**/.pmd</exclude>
<exclude>**/.idea/**</exclude>
+ <exclude>**/gradle/**</exclude>
+ <exclude>**/gradlew*</exclude>
+ <exclude>**/publish-maven.gradle</exclude>
<exclude>**/.gradle/**</exclude>
<exclude>**/build.gradle</exclude>
<exclude>**/build/**</exclude>
@@ -31,5 +35,21 @@
<outputDirectory></outputDirectory>
<filtered>true</filtered>
</file>
+ <file>
+ <source>${project.basedir}/../si-template-projects/si-template-war-project/.settings/org.eclipse.core.resources.prefs</source>
+ <outputDirectory>.settings</outputDirectory>
+ </file>
+ <file>
+ <source>${project.basedir}/../si-template-projects/si-template-war-project/.settings/org.eclipse.jdt.core.prefs</source>
+ <outputDirectory>.settings</outputDirectory>
+ </file>
+ <file>
+ <source>${project.basedir}/../si-template-projects/si-template-war-project/.settings/org.eclipse.wst.common.project.facet.core.xml</source>
+ <outputDirectory>.settings</outputDirectory>
+ </file>
+ <file>
+ <source>${project.basedir}/../si-template-projects/si-template-war-project/.settings/org.eclipse.wst.common.component</source>
+ <outputDirectory>.settings</outputDirectory>
+ </file>
</files>
</assembly>
@@ -28,9 +28,9 @@ ext {
junitVersion = '4.10'
log4jVersion = '1.2.12'
mockitoVersion = '1.9.0'
- springVersion = '3.1.2.RELEASE'
- springIntegrationVersion = '2.1.2.RELEASE'
-
+ springVersion = '3.1.3.RELEASE'
+ springIntegrationVersion = '2.2.0.RELEASE'
+
idPrefix = 'siAdapterLowerPrefix'
}
@@ -260,5 +260,5 @@ task dist(dependsOn: assemble) {
task wrapper(type: Wrapper) {
description = 'Generates gradlew[.bat] scripts'
- gradleVersion = '1.1'
+ gradleVersion = '1.3'
}
@@ -60,7 +60,6 @@
}
]
},
-
"topLevelPackage" : "sipackage",
"projectName" : "si-template-project-name",
"pages" : {
@@ -2,21 +2,24 @@ apply plugin: 'java'
apply plugin: 'application'
apply plugin: 'eclipse'
apply plugin: 'idea'
+apply from: 'publish-maven.gradle'
repositories {
mavenCentral()
maven { url 'http://repo.springsource.org/libs-milestone' }
}
-group = "mavenGroupId"
-version = "mavenVersion"
+group = "SI-TEMPLATE-GROUP-ID"
+version = "SI-TEMPLATE-BUILD-VERSION"
sourceCompatibility=1.6
targetCompatibility=1.6
-junitVersion = '4.10'
-log4jVersion = '1.2.16'
-springIntegrationVersion = '2.1.2.RELEASE'
+ext {
+ junitVersion = '4.11'
+ log4jVersion = '1.2.17'
+ springIntegrationVersion = '2.2.0.RELEASE'
+}
eclipse {
project {
@@ -27,15 +30,19 @@ eclipse {
mainClassName = "sipackage.Main"
run{
-
standardInput = System.in
}
dependencies {
compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion"
compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion"
compile "log4j:log4j:$log4jVersion"
- compile "commons-io:commons-io:2.1"
+ compile "commons-io:commons-io:2.4"
testCompile "junit:junit-dep:$junitVersion"
}
+
+task wrapper(type: Wrapper) {
+ description = 'Generates gradlew[.bat] scripts'
+ gradleVersion = '1.3'
+}
@@ -0,0 +1,6 @@
+#Thu Dec 13 12:40:09 EST 2012
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.3-bin.zip
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/"
+APP_HOME="`pwd -P`"
+cd "$SAVED"
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
Oops, something went wrong.

0 comments on commit 81fb0e3

Please sign in to comment.