Permalink
Browse files

Converted to new submodule-free Gradle build

  • Loading branch information...
Craig Walls
Craig Walls committed Apr 12, 2012
1 parent defc3b7 commit 181baa515927b083a0654489e2b50f713e2a8b50
Showing with 154 additions and 159 deletions.
  1. +0 −3 .gitmodules
  2. +0 −28 build.gradle
  3. +0 −1 buildSrc
  4. +1 −42 gradle.properties
  5. BIN gradle/wrapper/gradle-wrapper.jar
  6. +6 −0 gradle/wrapper/gradle-wrapper.properties
  7. +56 −62 gradlew
  8. +30 −22 gradlew.bat
  9. +60 −0 publish-maven.gradle
  10. BIN {docs → }/src/api/doc-files/th-background.png
  11. 0 {docs → }/src/api/overview.html
  12. 0 {docs → }/src/api/spring-javadoc.css
  13. 0 {docs/src/info → src/dist}/changelog.txt
  14. 0 {docs/src/info → src/dist}/license.txt
  15. 0 {docs/src/info → src/dist}/notice.txt
  16. +1 −1 {docs/src/info → src/dist}/readme.txt
  17. 0 {docs → }/src/reference/docbook/connecting.xml
  18. 0 {docs → }/src/reference/docbook/implementing.xml
  19. 0 {docs → }/src/reference/docbook/index.xml
  20. 0 {docs → }/src/reference/docbook/overview.xml
  21. 0 {docs → }/src/reference/docbook/serviceprovider.xml
  22. 0 {docs → }/src/reference/docbook/signin.xml
  23. 0 {docs → }/src/reference/resources/css/highlight.css
  24. 0 {docs → }/src/reference/resources/css/html.css
  25. 0 {docs → }/src/reference/resources/css/manual.css
  26. 0 {docs → }/src/reference/resources/css/stylesheet.css
  27. BIN {docs → }/src/reference/resources/image_src/oauth_flows.graffle
  28. BIN {docs → }/src/reference/resources/images/admon/note.png
  29. BIN {docs → }/src/reference/resources/images/callouts/1.gif
  30. BIN {docs → }/src/reference/resources/images/callouts/1.png
  31. 0 {docs → }/src/reference/resources/images/callouts/1.svg
  32. BIN {docs → }/src/reference/resources/images/callouts/10.gif
  33. BIN {docs → }/src/reference/resources/images/callouts/10.png
  34. 0 {docs → }/src/reference/resources/images/callouts/10.svg
  35. BIN {docs → }/src/reference/resources/images/callouts/11.gif
  36. BIN {docs → }/src/reference/resources/images/callouts/11.png
  37. 0 {docs → }/src/reference/resources/images/callouts/11.svg
  38. BIN {docs → }/src/reference/resources/images/callouts/12.gif
  39. BIN {docs → }/src/reference/resources/images/callouts/12.png
  40. 0 {docs → }/src/reference/resources/images/callouts/12.svg
  41. BIN {docs → }/src/reference/resources/images/callouts/13.gif
  42. BIN {docs → }/src/reference/resources/images/callouts/13.png
  43. 0 {docs → }/src/reference/resources/images/callouts/13.svg
  44. BIN {docs → }/src/reference/resources/images/callouts/14.gif
  45. BIN {docs → }/src/reference/resources/images/callouts/14.png
  46. 0 {docs → }/src/reference/resources/images/callouts/14.svg
  47. BIN {docs → }/src/reference/resources/images/callouts/15.gif
  48. BIN {docs → }/src/reference/resources/images/callouts/15.png
  49. 0 {docs → }/src/reference/resources/images/callouts/15.svg
  50. 0 {docs → }/src/reference/resources/images/callouts/16.svg
  51. 0 {docs → }/src/reference/resources/images/callouts/17.svg
  52. 0 {docs → }/src/reference/resources/images/callouts/18.svg
  53. 0 {docs → }/src/reference/resources/images/callouts/19.svg
  54. BIN {docs → }/src/reference/resources/images/callouts/2.gif
  55. BIN {docs → }/src/reference/resources/images/callouts/2.png
  56. 0 {docs → }/src/reference/resources/images/callouts/2.svg
  57. 0 {docs → }/src/reference/resources/images/callouts/20.svg
  58. 0 {docs → }/src/reference/resources/images/callouts/21.svg
  59. 0 {docs → }/src/reference/resources/images/callouts/22.svg
  60. 0 {docs → }/src/reference/resources/images/callouts/23.svg
  61. 0 {docs → }/src/reference/resources/images/callouts/24.svg
  62. 0 {docs → }/src/reference/resources/images/callouts/25.svg
  63. 0 {docs → }/src/reference/resources/images/callouts/26.svg
  64. 0 {docs → }/src/reference/resources/images/callouts/27.svg
  65. 0 {docs → }/src/reference/resources/images/callouts/28.svg
  66. 0 {docs → }/src/reference/resources/images/callouts/29.svg
  67. BIN {docs → }/src/reference/resources/images/callouts/3.gif
  68. BIN {docs → }/src/reference/resources/images/callouts/3.png
  69. 0 {docs → }/src/reference/resources/images/callouts/3.svg
  70. 0 {docs → }/src/reference/resources/images/callouts/30.svg
  71. BIN {docs → }/src/reference/resources/images/callouts/4.gif
  72. BIN {docs → }/src/reference/resources/images/callouts/4.png
  73. 0 {docs → }/src/reference/resources/images/callouts/4.svg
  74. BIN {docs → }/src/reference/resources/images/callouts/5.gif
  75. BIN {docs → }/src/reference/resources/images/callouts/5.png
  76. 0 {docs → }/src/reference/resources/images/callouts/5.svg
  77. BIN {docs → }/src/reference/resources/images/callouts/6.gif
  78. BIN {docs → }/src/reference/resources/images/callouts/6.png
  79. 0 {docs → }/src/reference/resources/images/callouts/6.svg
  80. BIN {docs → }/src/reference/resources/images/callouts/7.gif
  81. BIN {docs → }/src/reference/resources/images/callouts/7.png
  82. 0 {docs → }/src/reference/resources/images/callouts/7.svg
  83. BIN {docs → }/src/reference/resources/images/callouts/8.gif
  84. BIN {docs → }/src/reference/resources/images/callouts/8.png
  85. 0 {docs → }/src/reference/resources/images/callouts/8.svg
  86. BIN {docs → }/src/reference/resources/images/callouts/9.gif
  87. BIN {docs → }/src/reference/resources/images/callouts/9.png
  88. 0 {docs → }/src/reference/resources/images/callouts/9.svg
  89. BIN {docs → }/src/reference/resources/images/facebook-authorize-basic.png
  90. BIN {docs → }/src/reference/resources/images/facebook-authorize-loginbutton.png
  91. BIN {docs → }/src/reference/resources/images/facebook-authorize-scoped.png
  92. BIN {docs → }/src/reference/resources/images/important.png
  93. BIN {docs → }/src/reference/resources/images/logo.png
  94. BIN {docs → }/src/reference/resources/images/note.png
  95. BIN {docs → }/src/reference/resources/images/oauth1_flow.png
  96. BIN {docs → }/src/reference/resources/images/oauth2_flow.png
  97. BIN {docs → }/src/reference/resources/images/sign-in-with-facebook.png
  98. BIN {docs → }/src/reference/resources/images/sign-in-with-twitter-d.png
  99. BIN {docs → }/src/reference/resources/images/sign-in-with-twitter.png
  100. BIN {docs → }/src/reference/resources/images/spring-social-twitter-example.png
  101. BIN {docs → }/src/reference/resources/images/tip.png
  102. BIN {docs → }/src/reference/resources/images/twitter-authorize.png
  103. BIN {docs → }/src/reference/resources/images/xdev-spring_logo.jpg
  104. 0 {docs → }/src/reference/resources/xsl/html-custom.xsl
  105. 0 {docs → }/src/reference/resources/xsl/html-single-custom.xsl
  106. 0 {docs → }/src/reference/resources/xsl/pdf-custom.xsl
View
@@ -1,3 +0,0 @@
-[submodule "buildSrc"]
- path = buildSrc
- url = git://github.com/SpringSource/spring-build-gradle.git
View
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
- import org.springframework.build.Version
// -----------------------------------------------------------------------------
@@ -31,10 +30,6 @@ abbreviation = 'SOCIAL'
apply plugin: 'base'
apply plugin: 'idea'
-def buildSrcDir = "$rootDir/buildSrc"
-apply from: "$buildSrcDir/wrapper.gradle"
-apply from: "$buildSrcDir/maven-root-pom.gradle"
-
// -----------------------------------------------------------------------------
// Configuration for all projects including this one (the root project)
//
@@ -44,13 +39,6 @@ allprojects {
// group will translate to groupId during pom generation and deployment
group = 'org.springframework.social'
- // version will be used in maven pom generation as well as determining
- // where artifacts should be deployed, based on release type of snapshot,
- // milestone or release.
- // @see org.springframework.build.Version under buildSrc/ for more info
- // @see gradle.properties for the declaration of this property.
- version = new Version(springSocialVersion)
-
// default set of maven repositories to be used when resolving dependencies
repositories {
mavenRepo urls: 'http://maven.springframework.org/release'
@@ -88,12 +76,6 @@ configure(javaprojects) {
libsBinDir = new File(libsDir, 'bin')
libsSrcDir = new File(libsDir, 'src')
- // add tasks for creating source jars and generating poms etc
- apply from: "$buildSrcDir/maven-deployment.gradle"
-
- // add tasks for finding and publishing .xsd files
- apply from: "$buildSrcDir/schema-publication.gradle"
-
h2Version = '1.3.163'
hamcrestVersion = '1.2.1'
httpComponentsVersion = '4.1.2'
@@ -169,13 +151,3 @@ project('spring-social-web') {
}
metaInf << files("src/main/resources/tld/spring-social.tld")
}
-
-// -----------------------------------------------------------------------------
-// Configuration for the docs subproject
-// -----------------------------------------------------------------------------
-project('docs') {
- apply from: "$buildSrcDir/docs.gradle"
-}
-
-apply from: "$buildSrcDir/dist.gradle"
-apply from: "$buildSrcDir/checks.gradle"
Submodule buildSrc deleted from db4431
View
@@ -1,42 +1 @@
-# Copyright 2002-2010 the original author or authors.
-#
-# 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.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# ------------------------------------------------------------------------------
-# version to be applied to all projects in this multi-project build. this is
-# the one and only location version changes need to be made.
-# ------------------------------------------------------------------------------
-springSocialVersion=1.1.0.BUILD-SNAPSHOT
-
-# ------------------------------------------------------------------------------
-# build system user roles
-# role may be either 'developer' or 'buildmaster'
-# ------------------------------------------------------------------------------
-role=developer
-
-# ------------------------------------------------------------------------------
-# for buildmasters: create a $HOME/.gradle/gradle.properties with the following
-# properties. They'll be necessary uploading artifacts to s3, maven repos, and
-# static.springframework.org. By placing them in your home directory, there's
-# no need to change/check in this file. Remember that properties can also be
-# specified at the gradle command line with -P, e.g.: -Prole=buildmaster
-# ------------------------------------------------------------------------------
-# role = buildmaster # overrides default 'role = developer' above
-# s3AccessKey=<springsource s3 access key>
-# s3SecretAccessKey=<springsource s3 secret access key>
-# docsHost=static.springsource.org
-# sshHost=static.springsource.org
-# sshUsername=<your user id>
-# sshPrivateKey=<path to your ssh private key used for logging into sshHost
-# mavenSyncRepoDir=<path to sourceforge cvs checkout for maven central sync>
+version = 1.1.0.BUILD-SNAPSHOT
Binary file not shown.
@@ -0,0 +1,6 @@
+#Thu Feb 23 13:43:17 CET 2012
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-milestone-8a-bin.zip
View
118 gradlew
@@ -1,16 +1,20 @@
#!/bin/bash
##############################################################################
-## ##
-## Gradle wrapper script for UN*X ##
-## ##
+##
+## Gradle start up script for UN*X
+##
##############################################################################
-# Uncomment those lines to set JVM options. GRADLE_OPTS and JAVA_OPTS can be used together.
-# GRADLE_OPTS="$GRADLE_OPTS -Xmx512m"
-# JAVA_OPTS="$JAVA_OPTS -Xmx512m"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
-GRADLE_APP_NAME=Gradle
+# ADDED BY HAND -- DO NOT ACCIDENTALLY DELETE WHEN UPGRADING GRADLE WRAPPER!
+GRADLE_OPTS="-XX:MaxPermSize=1024m -Xmx1024m $GRADLE_OPTS"
+# END ADDED BY HAND
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
@@ -42,54 +46,51 @@ case "`uname`" in
;;
esac
-# Attempt to set JAVA_HOME if it's not already set.
-if [ -z "$JAVA_HOME" ] ; then
- if $darwin ; then
- [ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] && export JAVA_HOME="/Library/Java/Home"
- [ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] && export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
- else
- javaExecutable="`which javac`"
- [ -z "$javaExecutable" -o "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ] && die "JAVA_HOME not set and cannot find javac to deduce location, please set JAVA_HOME."
- # readlink(1) is not available as standard on Solaris 10.
- readLink=`which readlink`
- [ `expr "$readLink" : '\([^ ]*\)'` = "no" ] && die "JAVA_HOME not set and readlink not available, please set JAVA_HOME."
- javaExecutable="`readlink -f \"$javaExecutable\"`"
- javaHome="`dirname \"$javaExecutable\"`"
- javaHome=`expr "$javaHome" : '\(.*\)/bin'`
- export JAVA_HOME="$javaHome"
- fi
-fi
-
# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
- [ -n "$JAVACMD" ] && JAVACMD=`cygpath --unix "$JAVACMD"`
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi
-STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain
-CLASSPATH=`dirname "$0"`/buildSrc/wrapper/gradle-wrapper.jar
-WRAPPER_PROPERTIES=`dirname "$0"`/buildSrc/wrapper/gradle-wrapper.properties
+# 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 [ -z "$JAVACMD" ] ; then
- 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 [ -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"
+ JAVACMD="$JAVA_HOME/bin/java"
fi
-fi
-if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+ 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
-if [ -z "$JAVA_HOME" ] ; then
- warn "JAVA_HOME environment variable is not set"
fi
# Increase the maximum file descriptors if we can.
@@ -108,15 +109,14 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
fi
fi
-# For Darwin, add GRADLE_APP_NAME to the JAVA_OPTS as -Xdock:name
+# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
- JAVA_OPTS="$JAVA_OPTS -Xdock:name=$GRADLE_APP_NAME"
-# we may also want to set -Xdock:image
+ JAVA_OPTS="$JAVA_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
- JAVA_HOME=`cygpath --path --mixed "$JAVA_HOME"`
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
# We build the pattern for arguments to be converted via cygpath
@@ -143,7 +143,7 @@ if $cygwin ; then
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
- done
+ done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
@@ -158,17 +158,11 @@ if $cygwin ; then
esac
fi
-GRADLE_APP_BASE_NAME=`basename "$0"`
-
-exec "$JAVACMD" $JAVA_OPTS $GRADLE_OPTS \
- -classpath "$CLASSPATH" \
- -Dorg.gradle.appname="$GRADLE_APP_BASE_NAME" \
- -Dorg.gradle.wrapper.properties="$WRAPPER_PROPERTIES" \
- $STARTER_MAIN_CLASS \
- "$@"
-
-RETCODE=$?
+# 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"
-if [ "$RETCODE" == "1" ] ; then
- echo "Gradle classes not found -- did you forget to clone --recursive when checking out this repository? See README for more details"
-fi
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
View
@@ -1,24 +1,37 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
-@rem ##
-@rem Gradle startup script for Windows ##
-@rem ##
+@rem
+@rem Gradle startup script for Windows
+@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
-@rem Uncomment those lines to set JVM options. GRADLE_OPTS and JAVA_OPTS can be used together.
-@rem set GRADLE_OPTS=%GRADLE_OPTS% -Xmx512m
-@rem set JAVA_OPTS=%JAVA_OPTS% -Xmx512m
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.\
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
set JAVA_EXE=java.exe
-if not defined JAVA_HOME goto init
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+goto fail
+
+:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
@@ -29,14 +42,14 @@ echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
-echo.
-goto end
+
+goto fail
:init
@rem Get command-line arguments, handling Windowz variants
if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%eval[2+2]" == "4" goto 4NT_args
+if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -56,27 +69,22 @@ set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
-set STARTER_MAIN_CLASS=org.gradle.wrapper.GradleWrapperMain
-set CLASSPATH=%DIRNAME%\buildSrc\wrapper\gradle-wrapper.jar
-set WRAPPER_PROPERTIES=%DIRNAME%\buildSrc\wrapper\gradle-wrapper.properties
-
-set GRADLE_OPTS=%JAVA_OPTS% %GRADLE_OPTS% -Dorg.gradle.wrapper.properties="%WRAPPER_PROPERTIES%"
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
-"%JAVA_EXE%" %GRADLE_OPTS% -classpath "%CLASSPATH%" %STARTER_MAIN_CLASS% %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
-if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1
-
+:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit "%ERRORLEVEL%"
-exit /b "%ERRORLEVEL%"
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
-:omega
+:omega
Oops, something went wrong.

0 comments on commit 181baa5

Please sign in to comment.