diff --git a/.gitignore b/.gitignore index bc8bd0d4..931062ae 100644 --- a/.gitignore +++ b/.gitignore @@ -2,15 +2,34 @@ *.sonarj *.sw* .DS_Store -.springBeans bin build.sh -ivy-cache integration-repo -target -spring-build/lib/docbook +ivy-cache .gradle build +target + +# Eclipse metadata +.classpath +.project +.settings +.springBeans + +# IDEA metadata and output dirs +*.iml +*.ipr +*.iws +out + +gradle-app.setting +spring-binding/src/main/java/META-INF/ +spring-faces/src/main/java/META-INF/ +spring-js-resources/src/main/java/META-INF/ +spring-js/src/main/java/META-INF/ +spring-webflow/src/main/java/META-INF/ + +spring-build/lib/docbook spring-webflow-samples/*/.project spring-webflow-samples/*/.classpath spring-webflow-samples/*/.settings diff --git a/README.md b/README.md index c710262c..1ad10f57 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,27 @@ Check out the [Spring forums](http://forum.springsource.org/forumdisplay.php?36- # Building from source -Instructions on [building Spring Web Flow](https://github.com/SpringSource/spring-webflow/wiki/Building-From-Source) from source are available via the project wiki. +Check out sources: +```` +git clone git://github.com/SpringSource/spring-webflow.git +```` + +Compile and test, build all jars, distribution zips and docs: +```` +./gradlew build +```` + +Install into your local Maven repository: +```` +./gradlew install +```` + +Generate Eclipse settings and then manually import projects: +```` +./import-into-eclipse.sh +```` + +The Spring Framework and Spring Web Flow use a very similar build system. For this reason the following [Gradle build FAQ](https://github.com/SpringSource/spring-framework/wiki/Gradle-build-and-release-FAQ) would be a very useful read. # Contributing diff --git a/build-spring-webflow/.project b/build-spring-webflow/.project deleted file mode 100644 index 509da81f..00000000 --- a/build-spring-webflow/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - build-spring-webflow - - - - - - - - diff --git a/build-spring-webflow/build.xml b/build-spring-webflow/build.xml deleted file mode 100644 index 69ac1e5d..00000000 --- a/build-spring-webflow/build.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/build-spring-webflow/ivysettings.xml b/build-spring-webflow/ivysettings.xml deleted file mode 100644 index 09173dea..00000000 --- a/build-spring-webflow/ivysettings.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/build-spring-webflow/package-artifact.xml b/build-spring-webflow/package-artifact.xml deleted file mode 100644 index 6322703b..00000000 --- a/build-spring-webflow/package-artifact.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build-spring-webflow/package-bundle.xml b/build-spring-webflow/package-bundle.xml deleted file mode 100644 index ab940737..00000000 --- a/build-spring-webflow/package-bundle.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/build-spring-webflow/package-top-level.xml b/build-spring-webflow/package-top-level.xml deleted file mode 100644 index ebc93a34..00000000 --- a/build-spring-webflow/package-top-level.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build-spring-webflow/publish-artifact.xml b/build-spring-webflow/publish-artifact.xml deleted file mode 100644 index e8159d09..00000000 --- a/build-spring-webflow/publish-artifact.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/build-spring-webflow/publish-documentation.xml b/build-spring-webflow/publish-documentation.xml deleted file mode 100644 index c4a391bc..00000000 --- a/build-spring-webflow/publish-documentation.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build-spring-webflow/publish-top-level.xml b/build-spring-webflow/publish-top-level.xml deleted file mode 100644 index 9b04354b..00000000 --- a/build-spring-webflow/publish-top-level.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build-spring-webflow/readme.txt b/build-spring-webflow/readme.txt deleted file mode 100644 index aab4d5c4..00000000 --- a/build-spring-webflow/readme.txt +++ /dev/null @@ -1,43 +0,0 @@ -This is where the master build that creates releases of Spring Web Flow resides. The build system is based on spring-build, which is linked in using an SVN external to https://src.springframework.org/svn/spring-build. - -USERS -- To build all Spring Web Flow projects, including samples: - - 1. From this directory, run: - ant - -Build Pre-requisites: -- javac 1.5 or > must be in your system path -- ant 1.7 or > must be in your system path - -Building Behind a Firewall: -- If you are building behind a proxy and are having connection problems, update the ../spring-build/lib/ivy/jets3t.properties file. - For more information about the configuration properties see http://jets3t.s3.amazonaws.com/toolkit/configuration.html#jets3t - -DEVELOPERS -- To build a new Spring Web Flow distribution for release: - - 1. Update the files containing the version number to reflect the new release version, if necessary. - - build.properties - build-spring-webflow/resources/readme.txt - spring-binding/pom.xml - spring-binding/template.mf - spring-js/pom.xml - spring-js/template.mf - spring-faces/pom.xml - spring-faces/template.mf - spring-webflow/pom.xml - spring-webflow/template.mf - spring-webflow-reference/src/spring-webflow-reference.xml - spring-webflow-reference/src/overview.xml - spring-webflow-samples/*/pom.xml - - 2. From this directory, run: - - ant jar package - - The release archive will be created and placed in: - target/artifacts - -Questions? See http://forum.springframework.org \ No newline at end of file diff --git a/build-spring-webflow/resources/notice.txt b/build-spring-webflow/resources/notice.txt deleted file mode 100644 index ad7c1121..00000000 --- a/build-spring-webflow/resources/notice.txt +++ /dev/null @@ -1,22 +0,0 @@ - ====================================================================== - == NOTICE file corresponding to section 4 d of the Apache License, == - == Version 2.0, for the Spring Web Flow distribution. == - ====================================================================== - - This product includes software developed by - the Apache Software Foundation (http://www.apache.org). - - The end-user documentation included with a redistribution, if any, - must include the following acknowledgement: - - "This product includes software developed by the Spring Framework - Project (http://www.springframework.org)." - - Alternately, this acknowledgement may appear in the software itself, - if and wherever such third-party acknowledgements normally appear. - - The names "Spring", "Spring Framework", and "Spring Web Flow" must - not be used to endorse or promote products derived from this - software without prior written permission. For written permission, - please contact rod.johnson@interface21.com or juergen.hoeller@interface21.com. - diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..b299841b --- /dev/null +++ b/build.gradle @@ -0,0 +1,383 @@ +buildscript { + repositories { + maven { url "http://repo.springsource.org/plugins-release" } + maven { url "http://repo.springsource.org/plugins-snapshot" } + } + dependencies { + classpath("org.springframework.build.gradle:propdeps-plugin:0.0.5") + classpath("org.springframework.build.gradle:docbook-reference-plugin:0.2.8") + classpath("me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1") + } +} + +configure(allprojects) { + apply plugin: "eclipse" + apply plugin: "idea" + apply plugin: "javadocHotfix" + group = "org.springframework.webflow" +} + +configure(subprojects) { subproject -> + apply plugin: "java" + apply plugin: "propdeps" + apply from: "${rootProject.projectDir}/publish-maven.gradle" + + sourceCompatibility=1.5 + targetCompatibility=1.5 + + [compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:none"] + + sourceSets.test.resources.srcDirs = ["src/main/java", "src/test/resources", "src/test/java"] + + repositories { + maven { url "http://repo.springsource.org/libs-release" } + } + + jar { + manifest.attributes["Implementation-Title"] = subproject.name + manifest.attributes["Implementation-Version"] = subproject.version + + from("${rootProject.projectDir}/src/dist") { + include "license.txt" + include "notice.txt" + into "META-INF" + expand(copyright: new Date().format("yyyy"), version: project.version) + } + } +} + +configure(subprojects.findAll {it.name != "spring-js-resources"}) { subproject -> + dependencies { + testCompile("junit:junit-dep:4.10") + testCompile("org.hamcrest:hamcrest-all:1.3") + testCompile("org.easymock:easymock:3.1") + } + + subproject.ext { + springVersion = "3.2.1.RELEASE" + springSecurityVersion = "3.1.3.RELEASE" + slf4jVersion = "1.6.1" + log4jVersion = "1.2.15" + } + + test { + systemProperty("java.awt.headless", "true") + include "**/*Tests.class" + } + + javadoc { + options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED + options.author = true + options.header = project.name + } + + task sourcesJar(type: Jar, dependsOn:classes) { + classifier = "sources" + from sourceSets.main.allJava + } + + task javadocJar(type: Jar) { + classifier = "javadoc" + from javadoc + } + + artifacts { + archives sourcesJar + archives javadocJar + } +} + +project("spring-binding") { + description = "Spring Binding" + + dependencies { + provided("javax.el:el-api:1.0") + compile("commons-logging:commons-logging:1.1.1") + compile("opensymphony:ognl:2.6.11") + compile("org.springframework:spring-beans:$springVersion") + compile("org.springframework:spring-context:$springVersion") + compile("org.springframework:spring-core:$springVersion") + compile("org.springframework:spring-expression:$springVersion") + testCompile("log4j:log4j:$log4jVersion") { + exclude group: "javax.mail", module: "mail" + exclude group: "javax.jms", module: "jms" + exclude group: "com.sun.jdmk", module: "jmxtools" + exclude group: "com.sun.jmx", module: "jmxri" + } + testCompile("org.jboss.el:jboss-el:2.0.1.GA") + } +} + +project("spring-js-resources") { + description = "Spring JS Resources" + + apply from: "spring-js-resources.gradle" + + jar { + dependsOn prepareResources + } +} + +project("spring-js") { + description = "Spring JS" + + dependencies { + compile(project(":spring-js-resources")) + compile("commons-logging:commons-logging:1.1.1") + provided("javax.servlet:servlet-api:2.4") + optional("org.apache.tiles:tiles-api:2.1.2") + optional("org.apache.tiles:tiles-core:2.1.2") + optional("org.apache.tiles:tiles-jsp:2.1.2") + optional("org.apache.tiles:tiles-servlet:2.1.2") + compile("org.springframework:spring-beans:$springVersion") + compile("org.springframework:spring-context:$springVersion") + compile("org.springframework:spring-core:$springVersion") + compile("org.springframework:spring-web:$springVersion") + compile("org.springframework:spring-webmvc:$springVersion") + testCompile("javax.servlet:jstl:1.2") + testCompile("log4j:log4j:$log4jVersion") { + exclude group: "javax.mail", module: "mail" + exclude group: "javax.jms", module: "jms" + exclude group: "com.sun.jdmk", module: "jmxtools" + exclude group: "com.sun.jmx", module: "jmxri" + } + testCompile("org.springframework:spring-test:$springVersion") + } +} + +project("spring-webflow") { + description = "Spring Web Flow" + + dependencies { + compile(project(":spring-binding")) + compile(project(":spring-js")) + compile("commons-logging:commons-logging:1.1.1") + provided("javax.el:el-api:2.2") + provided("javax.persistence:persistence-api:1.0.2") + provided("javax.servlet:servlet-api:2.4") + provided("javax.portlet:portlet-api:2.0") + provided("javax.transaction:transaction-api:1.1-rev-1") + provided("junit:junit:3.8.2") + compile("opensymphony:ognl:2.6.11") + optional("org.hibernate:hibernate:3.2.7.ga") { + exclude group: "org.slf4j", module: "slf4j-api" + } + optional("backport-util-concurrent:backport-util-concurrent:3.0") + optional("org.slf4j:slf4j-api:$slf4jVersion") + compile("org.springframework:spring-beans:$springVersion") + compile("org.springframework:spring-context:$springVersion") + compile("org.springframework:spring-core:$springVersion") + compile("org.springframework:spring-expression:$springVersion") + optional("org.springframework:spring-orm:$springVersion") + optional("org.springframework:spring-tx:$springVersion") + compile("org.springframework:spring-web:$springVersion") + compile("org.springframework:spring-webmvc:$springVersion") + optional("org.springframework:spring-webmvc-portlet:$springVersion") + optional("org.springframework.security:spring-security-core:$springSecurityVersion") + testCompile("javax.validation:validation-api:1.0.0.GA") + testCompile("org.apache.openjpa:openjpa:1.1.0") + testCompile("org.apache.openjpa:openjpa-lib:1.1.0") + testCompile("org.apache.openjpa:openjpa-persistence:1.1.0") + testCompile("org.apache.openjpa:openjpa-persistence-jdbc:1.1.0") + testCompile("org.hsqldb:hsqldb:2.2.8") + testCompile("org.jboss.el:jboss-el:2.0.1.GA") + testCompile("org.springframework:spring-aop:$springVersion") + testCompile("org.springframework:spring-jdbc:$springVersion") + testCompile("org.springframework:spring-test:$springVersion") + } +} + +project("spring-faces") { + description = "Spring Faces" + + dependencies { + compile(project(":spring-binding")) + compile(project(":spring-webflow")) + compile("commons-logging:commons-logging:1.1.1") + provided("javax.servlet:servlet-api:2.4") + provided("javax.portlet:portlet-api:2.0") + provided("javax.el:el-api:1.0") + compile("org.springframework:spring-beans:$springVersion") + compile("org.springframework:spring-context:$springVersion") + compile("org.springframework:spring-core:$springVersion") + compile("org.springframework:spring-expression:$springVersion") + compile("org.springframework:spring-web:$springVersion") + compile("org.springframework:spring-webmvc:$springVersion") + optional("org.richfaces.framework:richfaces-api:3.1.4.GA") + optional("org.springframework.security:spring-security-core:$springSecurityVersion") + optional("org.springframework.security:spring-security-web:$springSecurityVersion") + optional("org.springframework:spring-webmvc-portlet:$springVersion") + optional("com.sun.facelets:jsf-facelets:1.1.14") + provided("com.sun.faces:jsf-api:2.1.7") + provided("com.sun.faces:jsf-impl:2.1.7") + provided("org.apache.myfaces.core:myfaces-impl:2.1.7") + testCompile("log4j:log4j:$log4jVersion") { + exclude group: "javax.mail", module: "mail" + exclude group: "javax.jms", module: "jms" + exclude group: "com.sun.jdmk", module: "jmxtools" + exclude group: "com.sun.jmx", module: "jmxri" + } + testCompile("org.apache.myfaces.test:myfaces-test20:1.0.4") + testCompile("org.jboss.el:jboss-el:2.0.1.GA") + testCompile("org.slf4j:jcl-over-slf4j:$slf4jVersion") + testCompile("org.slf4j:slf4j-log4j12:$slf4jVersion") { + exclude group: "log4j", module: "log4j" + } + testCompile("org.springframework:spring-test:$springVersion") + } +} + +configure(rootProject) { + description = "Spring Web Flow" + + apply plugin: "docbook-reference" + + reference { + sourceDir = file("src/reference") + pdfFilename = "spring-webflow-reference.pdf" + } + + // don"t publish the default jar for the root project + configurations.archives.artifacts.clear() + + artifacts { + } + + task api(type: Javadoc) { + group = "Documentation" + description = "Generates aggregated Javadoc API documentation." + title = "${rootProject.description} ${version} API" + options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED + options.author = true + options.header = rootProject.description + options.overview = "src/api/overview.html" + source subprojects.collect { project -> + project.sourceSets.main.allJava + } + destinationDir = new File(buildDir, "api") + classpath = files(subprojects.collect { project -> + project.sourceSets.main.compileClasspath + }) + maxMemory = "1024m" + } + + task docsZip(type: Zip) { + group = "Distribution" + baseName = "spring-webflow" + classifier = "docs" + description = "Builds -${classifier} archive containing api and reference " + + "for deployment at static.springframework.org/spring-webflow/docs." + + from("src/dist") { + include "changelog.txt" + } + + from (api) { + into "api" + } + + from (reference) { + into "reference" + } + } + + task schemaZip(type: Zip) { + group = "Distribution" + baseName = "spring-webflow" + classifier = "schema" + description = "Builds -${classifier} archive containing all " + + "XSDs for deployment at static.springframework.org/schema." + + subprojects.each { subproject -> + def Properties schemas = new Properties(); + + subproject.sourceSets.main.resources.find { + it.path.endsWith("META-INF/spring.schemas") + }?.withInputStream { schemas.load(it) } + + for (def key : schemas.keySet()) { + def shortName = key.replaceAll(/http.*schema.(.*).spring-.*/, '$1') + assert shortName != key + File xsdFile = subproject.sourceSets.main.allSource.find { + it.path.endsWith(schemas.get(key)) + } + assert xsdFile != null + into (shortName) { + from xsdFile.path + } + } + } + + project(":spring-webflow").sourceSets.main.resources.matching { + include '**/engine/model/builder/xml/*.xsd' + }.each { File file -> + into ('webflow') { + from file.path + } + } + } + + task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) { + group = "Distribution" + baseName = "spring-webflow" + classifier = "dist" + description = "Builds -${classifier} archive, containing all jars and docs, " + + "suitable for community download page." + + def baseDir = "${baseName}-${project.version}"; + + from("src/dist") { + include "notice.txt" + into "${baseDir}" + expand(copyright: new Date().format("yyyy"), version: project.version) + } + + from("src/dist") { + include "readme.txt" + include "license.txt" + into "${baseDir}" + } + + from(zipTree(docsZip.archivePath)) { + into "${baseDir}/docs" + } + + from(zipTree(schemaZip.archivePath)) { + into "${baseDir}/schema" + } + + subprojects.each { subproject -> + into ("${baseDir}/libs") { + from subproject.jar + if (subproject.tasks.findByPath("sourcesJar")) { + from subproject.sourcesJar + } + if (subproject.tasks.findByPath("javadocJar")) { + from subproject.javadocJar + } + } + } + } + + artifacts { + archives docsZip + archives schemaZip + archives distZip + } + + task wrapper(type: Wrapper) { + description = "Generates gradlew[.bat] scripts" + gradleVersion = "1.9" + + doLast() { + def gradleOpts = "-XX:MaxPermSize=1024m -Xmx1024m" + def gradleBatOpts = "$gradleOpts -XX:MaxHeapSize=256m" + File wrapperFile = file("gradlew") + wrapperFile.text = wrapperFile.text.replace("DEFAULT_JVM_OPTS=", + "GRADLE_OPTS=\"$gradleOpts \$GRADLE_OPTS\"\nDEFAULT_JVM_OPTS=") + File wrapperBatFile = file("gradlew.bat") + wrapperBatFile.text = wrapperBatFile.text.replace("set DEFAULT_JVM_OPTS=", + "set GRADLE_OPTS=$gradleBatOpts %GRADLE_OPTS%\nset DEFAULT_JVM_OPTS=") + } + } +} diff --git a/build.properties b/build.properties deleted file mode 100644 index 69a319ff..00000000 --- a/build.properties +++ /dev/null @@ -1,24 +0,0 @@ -version=2.3.3 -release.type=integration -natural.name=spring-webflow -project.key=SWF -ivy.cache.dir=${basedir}/../ivy-cache -integration.repo.dir=${basedir}/../integration-repo -source.version=1.5 -javadoc.exclude.package.names=org/springframework/webflow/samples/** -javadoc.max.memory=256M -test.vm.args=-Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -ivy.settings.file=${basedir}/../build-spring-webflow/ivysettings.xml - -# For when releasing -#release.type=release -#build.stamp=RELEASE - -# For when releasing milestones -#release.type=milestone -#build.stamp=M1 - -# For development in trunk -#release.type=integration - - diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..547ac429 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +version=2.3.3.BUILD-SNAPSHOT diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..b6b646b0 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..4adb5c12 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Dec 16 14:01:13 EST 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..a1787c62 --- /dev/null +++ b/gradlew @@ -0,0 +1,165 @@ +#!/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. +GRADLE_OPTS="-XX:MaxPermSize=1024m -Xmx1024m $GRADLE_OPTS" +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 "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..e05bf913 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,91 @@ +@if "%DEBUG%" == "" @echo off +@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 Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set GRADLE_OPTS=-XX:MaxPermSize=1024m -Xmx1024m -XX:MaxHeapSize=256m %GRADLE_OPTS% +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +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 +%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 + +if exist "%JAVA_EXE%" goto init + +echo. +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. + +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 + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%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 + +: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 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/import-into-eclipse.sh b/import-into-eclipse.sh new file mode 100755 index 00000000..69085f4a --- /dev/null +++ b/import-into-eclipse.sh @@ -0,0 +1,84 @@ +STS_TEST_VERSION='3.2.0.RELEASE' + +cd `dirname $0` +clear +cat < Import... > Existing Projects into Workspace + > When prompted for the 'root directory', provide $PWD + > Press enter. You will see the modules show up under "Projects" + > All projects should be selected/checked. Click Finish. + > When the project import is complete, you should have no errors. + +When the above is complete, return here and press the enter key. +EOM + +read + +cat < Share Project... +- In the Share Project dialog that appears, select Git and press Next +- Check "Use or create repository in parent folder of project" +- Click Finish + +When complete, you'll have Git support enabled for all projects. + +You're ready to code! Goodbye! +EOM diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 19a1d5e6..00000000 --- a/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - org.springframework.webflow - spring-webflow-root - pom - Spring Web Flow - 2.3.2.RELEASE - - spring-binding - spring-js-resources - spring-js - spring-webflow - spring-faces - - - - Apache 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - diff --git a/publish-maven.gradle b/publish-maven.gradle new file mode 100644 index 00000000..a02e5a30 --- /dev/null +++ b/publish-maven.gradle @@ -0,0 +1,56 @@ +apply plugin: "propdeps-maven" + +install { + repositories.mavenInstaller { + customizePom(pom, project) + } +} + +def customizePom(pom, gradleProject) { + pom.whenConfigured { generatedPom -> + // eliminate test-scoped dependencies (no need in maven central poms) + generatedPom.dependencies.removeAll { dep -> + dep.scope == "test" + } + + // sort to make pom dependencies order consistent to ease comparison of older poms + generatedPom.dependencies = generatedPom.dependencies.sort { dep -> + "$dep.scope:$dep.groupId:$dep.artifactId" + } + + // add all items necessary for maven central publication + generatedPom.project { + name = gradleProject.description + description = gradleProject.description + url = "https://github.com/SpringSource/spring-webflow" + organization { + name = "SpringSource" + url = "http://springsource.org/spring-webflow" + } + licenses { + license { + name "The Apache Software License, Version 2.0" + url "http://www.apache.org/licenses/LICENSE-2.0.txt" + distribution "repo" + } + } + scm { + url = "https://github.com/SpringSource/spring-webflow" + connection = "scm:git:git://github.com/SpringSource/spring-webflow" + developerConnection = "scm:git:git://github.com/SpringSource/spring-webflow" + } + developers { + developer { + id = "rstoyanchev" + name = "Rossen Stoyanchev" + email = "rstoyanchev@vmware.com" + } + developer { + id = "pwebb" + name = "Phil Webb" + email = "pwebb@vmware.com" + } + } + } + } +} diff --git a/readme.txt b/readme.txt deleted file mode 100644 index cbfc5bed..00000000 --- a/readme.txt +++ /dev/null @@ -1,34 +0,0 @@ -Contained in this directory are the Spring Web Flow (SWF) related project sources. - -DIRECTORIES ------------ - -1. build-spring-webflow - Contains the metadata needed to build the SWF projects using spring-build. - -2. spring-build - A linked in SVN external to Spring's master build system. - Used to power the build for all Spring projects. - -3. spring-binding - the data binding and mapping project, a Spring Web Flow driven internal library. - -4. spring-webflow - The Spring Web Flow project. Contains the Web Flow engine. - -5. spring-js - Server side support for Spring's JavaScript abstraction framework. - -6. spring-js-resources - Client-side resources for Spring's JavaScript abstraction framework including the Dojo Toolkit. - -7. spring-faces - Spring's JavaServerFaces integration module, which includes Web Flow & JavaScript support. - -8. spring-webflow-samples - The Spring Web Flow sample applications, illustrating the framework in action. - - -BUILDING --------- - -To build all projects, cd to build-spring-webflow and run the following with ant (version 1.7 or >): - -ant clean clean-integration jar - -To install all jars as local Maven dependencies: - -ant clean clean-integration jar publish-maven-central-local - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..1273c39c --- /dev/null +++ b/settings.gradle @@ -0,0 +1,8 @@ +rootProject.name = 'webflow' + +include 'spring-binding' +include 'spring-faces' +include 'spring-js' +include 'spring-js-resources' +include 'spring-webflow' + diff --git a/spring-binding/.classpath b/spring-binding/.classpath deleted file mode 100644 index 76f31ad6..00000000 --- a/spring-binding/.classpath +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-binding/.project b/spring-binding/.project deleted file mode 100644 index a9a917b9..00000000 --- a/spring-binding/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - spring-binding - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - org.eclipse.jdt.core.javabuilder - - - org.eclipse.wst.common.project.facet.core.builder - - - org.eclipse.wst.validation.validationbuilder - - - - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - - \ No newline at end of file diff --git a/spring-binding/.settings/org.eclipse.jdt.core.prefs b/spring-binding/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f201f9dc..00000000 --- a/spring-binding/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,336 +0,0 @@ -#Wed Jun 09 09:16:13 BST 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes= -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=120 -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=8 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/spring-binding/.settings/org.eclipse.jdt.ui.prefs b/spring-binding/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 193deb8d..00000000 --- a/spring-binding/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,58 +0,0 @@ -#Wed Jun 25 10:24:03 EDT 2008 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_Spring Java Conventions -formatter_settings_version=11 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=false -org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.format_source_code=true -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/spring-binding/.settings/org.eclipse.wst.validation.prefs b/spring-binding/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 68bb37d5..00000000 --- a/spring-binding/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Fri May 05 18:13:37 EDT 2006 -DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator; -USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator; -USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator; -USER_PREFERENCE=overrideGlobalPreferencesfalse -eclipse.preferences.version=1 diff --git a/spring-binding/build.xml b/spring-binding/build.xml deleted file mode 100644 index 86df9f50..00000000 --- a/spring-binding/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/spring-binding/ivy.xml b/spring-binding/ivy.xml deleted file mode 100644 index 13de7703..00000000 --- a/spring-binding/ivy.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-binding/pom.xml b/spring-binding/pom.xml deleted file mode 100644 index 64020754..00000000 --- a/spring-binding/pom.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - 4.0.0 - org.springframework.webflow - spring-binding - jar - Spring Binding - 2.3.3.BUILD-SNAPSHOT - - - commons-logging - commons-logging - 1.1.1 - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - ognl - ognl - 2.6.9 - true - - - javax.el - el-api - 1.0 - provided - - - joda-time - joda-time - 1.6 - true - - - - org.easymock - easymock - 2.5.2 - test - - - junit - junit - 3.8.2 - test - - - org.springframework - spring-test - ${spring.version} - test - - - org.jboss.el - jboss-el - 2.0.1.GA - test - - - - - - maven2.java.net - http://download.java.net/maven/2 - - - jboss repository - https://repository.jboss.org/nexus/content/repositories/releases - - true - - - false - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-surefire-plugin - - junit:junit - - **/*Tests.java - - - - - maven-source-plugin - - - attach-sources - - jar - - - - - - - - src/test/java - - **/*.xml - - - - - - 3.2.1.RELEASE - - diff --git a/spring-binding/template.mf b/spring-binding/template.mf deleted file mode 100644 index f714bf0e..00000000 --- a/spring-binding/template.mf +++ /dev/null @@ -1,13 +0,0 @@ -Bundle-SymbolicName: org.springframework.binding -Bundle-Name: Spring Binding -Bundle-Vendor: SpringSource -Bundle-ManifestVersion: 2 -Import-Package: - ognl;version="[2.6.9, 3.0.0)";resolution:=optional, - org.jboss.el;version="[2.0.0, 3.0.0)";resolution:=optional -Import-Template: - org.springframework.*;version="[3.1.0.RELEASE, 3.3.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - javax.el;version="[1.0.0, 2.0.0)";resolution:=optional, - ognl;version="[2.6.9, 3.0.0)";resolution:=optional, - org.jboss.el;version="[2.0.0, 3.0.0)";resolution:=optional diff --git a/spring-build/aspect/artifact.xml b/spring-build/aspect/artifact.xml deleted file mode 100644 index ec467be2..00000000 --- a/spring-build/aspect/artifact.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-build/aspect/common.xml b/spring-build/aspect/common.xml deleted file mode 100644 index 48a15242..00000000 --- a/spring-build/aspect/common.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-build/aspect/default.xml b/spring-build/aspect/default.xml deleted file mode 100644 index 98907595..00000000 --- a/spring-build/aspect/default.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/spring-build/aspect/package.xml b/spring-build/aspect/package.xml deleted file mode 100644 index 49763b22..00000000 --- a/spring-build/aspect/package.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/spring-build/aspect/publish.xml b/spring-build/aspect/publish.xml deleted file mode 100644 index a3ce58ac..00000000 --- a/spring-build/aspect/publish.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/spring-build/aspect/quality.xml b/spring-build/aspect/quality.xml deleted file mode 100644 index 3af89084..00000000 --- a/spring-build/aspect/quality.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-build/common/artifact.xml b/spring-build/common/artifact.xml deleted file mode 100644 index bf00a872..00000000 --- a/spring-build/common/artifact.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-build/common/common.properties b/spring-build/common/common.properties deleted file mode 100644 index f8aaea0e..00000000 --- a/spring-build/common/common.properties +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 2010 SpringSource -# -# 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. - -# Common Properties -lib.dir=${spring.build.dir}/lib -artifacts.dir=${target.dir}/artifacts -target.dir=${basedir}/target -ci.build=false -natural.name=${ant.project.name} -build.stamp=BUILD-${timestamp} -bundle.version=${version}.${build.stamp} -publish.bucket=repository.springsource.com -local.repo.dir=${java.io.tmpdir}/local-repository - -# Artifact Properties -license.dir=${basedir} -main.java.dir=${basedir}/src/main/java -main.resources.dir=${basedir}/src/main/resources -main.output.dir=${target.dir}/classes -main.webapp.dir=${basedir}/src/main/webapp - -# Javadoc Properties -javadoc-all.output.dir=${target.dir}/javadoc-all -javadoc-api.output.dir=${target.dir}/javadoc-api -javadoc.prep.dir=${target.dir}/javadoc-prep -javadoc.exclude.package.names= -javadoc.stylesheet.file=${spring.build.dir}/common/spring-javadoc.css -javadoc.resources.dir=${spring.build.dir}/common/javadoc-resources -javadoc.max.memory=128M - -# JAR Properties -implementation.title=${ant.project.name} -implementation.version=${bundle.version} -jar.output.dir=${artifacts.dir} -jar.output.file=${jar.output.dir}/${ant.project.name}.jar -source-jar.output.dir=${artifacts.dir} -source-jar.output.file=${source-jar.output.dir}/${ant.project.name}-sources.jar - -# PAR Properties -par.output.dir=${artifacts.dir} -par.output.file=${par.output.dir}/${ant.project.name}.par -par.provided.dir=${target.dir}/par-provided -par.provided.bundles.dir=${par.provided.dir}/bundles -par.provided.libraries.dir=${par.provided.dir}/libraries -par.staging.dir=${target.dir}/par-expanded -application.name= -application.description= - -# Web Module Properties -web.module.output.dir=${artifacts.dir} -web.module.output.file=${web.module.output.dir}/${ant.project.name}.jar -web.module.staging.dir=${target.dir}/web-module-expanded -web.module.classes.dir=${web.module.staging.dir}/WEB-INF/classes - -# Library Properties -libd.input.file=${basedir}/${ant.project.name}.libd -libd.output.dir=${artifacts.dir} -libd.output.file=${libd.output.dir}/${ant.project.name}.libd - -# Resource Properties -resource.src.dir=${basedir}/src - -# WAR Properties -war.output.dir=${artifacts.dir} -war.output.file=${war.output.dir}/${ant.project.name}.war -war.staging.dir=${target.dir}/war-expanded -war.classes.dir=${war.staging.dir}/WEB-INF/classes -war.lib.dir=${war.staging.dir}/WEB-INF/lib - -# Compiler Properties -org.springframework.build.ant.version=1.1.0.RELEASE -org.eclipse.jdt.core.compiler.batch.version=3.3.0 -build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter -compile.debug=true -compile.debug.level=lines,vars,source -compiler.args=-enableJavadoc -source.version=1.5 -target.version=${source.version} - -# Package Properties -copy.to.dir=${package.dist.dir} -package.dir=${target.dir}/package-expanded -package.basename=${natural.name}-${bundle.version} -package.file.name=${package.basename}.zip -package.output.dir=${package.dir}/${package.basename} -package.output.file=${artifacts.dir}/${package.file.name} -package.dist.dir=${package.output.dir}/dist -package.lib.dir=${package.output.dir}/lib -package.src.dir=${package.output.dir}/src -package.docs.dir=${package.output.dir}/docs -package.jar.output.file=${ant.project.name}-${bundle.version}.jar -package.par.output.file=${ant.project.name}-${bundle.version}.par -package.libd.output.file=${ant.project.name}-${bundle.version}.libd -package.war.output.file=${ant.project.name}-${bundle.version}.war -package.source-jar.output.file=${ant.project.name}-sources-${bundle.version}.jar -org.springframework.build.aws.ant.version=3.0.3.RELEASE - -# AspectJ Properties -org.aspectj.tools.version=1.6.8.RELEASE -aspectj.x= - -# Test Properties -test.forkmode=perBatch -test.java.dir=${basedir}/src/test/java -test.resources.dir=${basedir}/src/test/resources -test.output.dir=${target.dir}/test-classes -test-results.output.dir=${target.dir}/test-results -test.vm.args= - -# Clover Properties -clover.db.dir=${clover.output.dir}/db -clover.db.file=${clover.db.dir}/clover.db -clover.output.dir=${target.dir}/clover -clover.staging.dir=${clover.output.dir}/staging -main.clover.dir=${clover.staging.dir}/main -test.clover.dir=${clover.staging.dir}/test -com.springsource.com.cenqua.clover.version=2.6.0 -clover.enforce=false -clover.coverage=0% - -# Docbook Properties -docbook.dir=${lib.dir}/docbook -docbook.target.dir=${target.dir}/docbook -org.apache.velocity.docbookframework.dist.version=1.0.0.BUILD-20080625 -com.springsource.net.sf.xslthl.version=1.2.0 -com.springsource.org.apache.xerces.version=2.8.1 -docbook.build.dir=${spring.build.dir}/docbook -docbook.output.dir=${target.dir}/${ant.project.name} -docbook.staging.dir=${docbook.target.dir}/staging -docbook.src.dir=${basedir}/src -docbook.images.dir=${basedir}/images -docbook.css.dir=${basedir}/css -docbook.styles.dir=${basedir}/styles - -# Findbugs Properties -findbugs.dir=${lib.dir}/findbugs -findbugs.exclude.file=${spring.build.dir}/common/findbugs-exclude.xml -findbugs.output.dir=${target.dir}/findbugs -findbugs.output.file=${findbugs.output.dir}/${ant.project.name}.xml -edu.umd.cs.findbugs.version=1.3.7 - -# Ivy Properties -bucket.basename=springframework.org -release.type=integration -ivy.checksums=sha1 -ivy.deliver.revision=${bundle.version} -ivy.file=${basedir}/ivy.xml -ivy.lib.dir=${lib.dir}/ivy -ivy.output.dir=${artifacts.dir} -ivy.output.file=${ivy.output.dir}/ivy.xml -ivy.settings.file=${spring.build.dir}/common/ivysettings.xml - -# Maven Properties -pom.output.dir=${artifacts.dir} -pom.output.file=${pom.output.dir}/pom.xml -local.pom.output.file=${basedir}/pom.xml -org.apache.maven.ant.version=2.0.10 -org.springframework.build.aws.maven.version=2.0.0.RELEASE - -# Bundlor Properties -bundlor.ant.version=1.0.0.RELEASE -manifest.template.file=${basedir}/template.mf -merge.existing.headers=true -fail.on.warnings=true - -# OSGi Properties -org.springframework.build.osgi.version=1.0.0.RELEASE -org.eclipse.osgi.version=3.5.0.v20090311-1300 - -#S3 Properties -accessKey= -secretKey= diff --git a/spring-build/common/common.xml b/spring-build/common/common.xml deleted file mode 100644 index 690cc193..00000000 --- a/spring-build/common/common.xml +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
]]>
- - - - - - - - - - - - diff --git a/spring-build/common/default-ivy-configurations.xml b/spring-build/common/default-ivy-configurations.xml deleted file mode 100644 index a8658ff7..00000000 --- a/spring-build/common/default-ivy-configurations.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/spring-build/common/findbugs-exclude.xml b/spring-build/common/findbugs-exclude.xml deleted file mode 100644 index 3d9127e5..00000000 --- a/spring-build/common/findbugs-exclude.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - diff --git a/spring-build/common/ivysettings.xml b/spring-build/common/ivysettings.xml deleted file mode 100644 index 587842a9..00000000 --- a/spring-build/common/ivysettings.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-build/common/javadoc-resources/TableHeading-background.png b/spring-build/common/javadoc-resources/TableHeading-background.png deleted file mode 100644 index 72d65e77..00000000 Binary files a/spring-build/common/javadoc-resources/TableHeading-background.png and /dev/null differ diff --git a/spring-build/common/package.xml b/spring-build/common/package.xml deleted file mode 100644 index b83a431a..00000000 --- a/spring-build/common/package.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-build/common/publish.xml b/spring-build/common/publish.xml deleted file mode 100644 index 5fcff6a0..00000000 --- a/spring-build/common/publish.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-build/common/quality.xml b/spring-build/common/quality.xml deleted file mode 100644 index 0dba1e5e..00000000 --- a/spring-build/common/quality.xml +++ /dev/null @@ -1,276 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-build/common/spring-javadoc.css b/spring-build/common/spring-javadoc.css deleted file mode 100644 index 191be29d..00000000 --- a/spring-build/common/spring-javadoc.css +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Copyright 2010 SpringSource - * - * 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. - */ - -.code -{ - border: 1px solid black; - background-color: #F4F4F4; - padding: 5px; -} - -body -{ - font: 12px Verdana, Arial, Helvetica, "Bitstream Vera Sans", sans-serif; - background-color: #fff; - color: #333; -} - - -/* Link colors */ -a -{ - color:#2c7b14; - text-decoration:none; -} - -a:hover -{ - text-decoration:underline; -} - -/* Headings */ -h1 -{ - font-size:28px; - color:#007c00; -} - -/* Table colors */ - -table -{ - border:none; -} - -td -{ - border:none; - border-bottom:1px dotted #ddd; -} - -th -{ - border:none; -} - -.TableHeadingColor th -{ - background-color: #efffcb; - background-image: url(resources/TableHeading-background.png); - background-repeat: repeat-x; - color:#fff; - font-size:14px; - height:26px; -} - -.TableSubHeadingColor -{ - background: #f7ffee; - -} -.TableRowColor -{ - background: #fff; -} - -.TableRowColor a -{ - border-bottom:none; - color:#2c7b14; - font-weight:normal; -} - -tr.TableRowColor:hover -{ - background:#eef2e1; -} - - -/* Font used in left-hand frame lists */ -.FrameTitleFont -{ - font-size: 120%; - font-weight:bold; -} - -.FrameTitleFont a -{ - color: #333; -} - -.FrameHeadingFont -{ - font-weight: bold; - font-size:95%; -} - -.FrameItemFont -{ - line-height:130%; - font-size: 95%; -} - -.FrameItemFont a -{ - color:#333; -} - -.FrameItemFont a:hover -{ - color:#249901; - border-bottom:none; - text-decoration:underline; -} - -/* Navigation bar fonts and colors */ -.NavBarCell1 -{ - background-color:#fff; - border:none; -} - -.NavBarCell1Rev -{ - background-color:#e3faa5; - border:1px solid #9ad00c; - padding:0; - margin:0; -} - -.NavBarCell1 a -{ - color:#333; - text-decoration:none; -} - -.NavBarFont1Rev -{ - -} - -.NavBarCell2 -{ - border:none; -} - -.NavBarCell2 a -{ - color:#249901; - font-size:90%; -} - -.NavBarCell3 -{ - border:none; -} - -/* Override sizes in font tags */ -font -{ - font: inherit !important; -} diff --git a/spring-build/docbook/common.xml b/spring-build/docbook/common.xml deleted file mode 100644 index 21d29584..00000000 --- a/spring-build/docbook/common.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/spring-build/docbook/css/html/highlight.css b/spring-build/docbook/css/html/highlight.css deleted file mode 100644 index 35104afc..00000000 --- a/spring-build/docbook/css/html/highlight.css +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2010 SpringSource - * - * 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. - */ - -.hl-keyword { - color: #7F0055; - font-weight: bold; -} - -.hl-comment { - color: #3F5F5F; - font-style: italic; -} - -.hl-multiline-comment { - color: #3F5FBF; - font-style: italic; -} - -.hl-tag { - color: #3F7F7F; -} - -.hl-attribute { - color: #7F007F; -} - -.hl-value { - color: #2A00FF; -} - -.hl-string { - color: #2A00FF; -} \ No newline at end of file diff --git a/spring-build/docbook/css/html/stylesheet.css b/spring-build/docbook/css/html/stylesheet.css deleted file mode 100644 index 39491bf3..00000000 --- a/spring-build/docbook/css/html/stylesheet.css +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2010 SpringSource - * - * 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. - */ - -@IMPORT url("highlight.css"); - -html { - padding: 0pt; - margin: 0pt; -} - -body { - margin-left: 10%; - margin-right: 10%; - font-family: Arial, Sans-serif; -} - -div { - margin: 0pt; -} - -p { - text-align: justify; -} - -hr { - border: 1px solid gray; - background: gray; -} - -h1,h2,h3,h4 { - color: #234623; - font-family: Arial, Sans-serif; -} - -pre { - line-height: 1.0; - color: black; -} - -pre.programlisting { - font-size: 10pt; - padding: 7pt 3pt; - border: 1pt solid black; - background: #eeeeee; - clear: both; -} - -div.table { - margin: 1em; - padding: 0.5em; - text-align: center; -} - -div.table table { - display: table; - width: 100%; -} - -div.table td { - padding-left: 7px; - padding-right: 7px; -} diff --git a/spring-build/docbook/default.xml b/spring-build/docbook/default.xml deleted file mode 100644 index 50ab46a3..00000000 --- a/spring-build/docbook/default.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/spring-build/docbook/documentation.xml b/spring-build/docbook/documentation.xml deleted file mode 100644 index e51651b1..00000000 --- a/spring-build/docbook/documentation.xml +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-build/docbook/package.xml b/spring-build/docbook/package.xml deleted file mode 100644 index b66bfad5..00000000 --- a/spring-build/docbook/package.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-build/docbook/publish.xml b/spring-build/docbook/publish.xml deleted file mode 100644 index d572e146..00000000 --- a/spring-build/docbook/publish.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-build/docbook/styles/html/custom.xsl b/spring-build/docbook/styles/html/custom.xsl deleted file mode 100644 index 9e67ce90..00000000 --- a/spring-build/docbook/styles/html/custom.xsl +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - 1 - 0 - 1 - - - - images/ - .gif - - 120 - images/callouts/ - .gif - - - css/stylesheet.css - text/css - book toc,title - - text-align: left - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Begin Google Analytics code - - - End Google Analytics code - - - \ No newline at end of file diff --git a/spring-build/docbook/styles/html/titlepage.xml b/spring-build/docbook/styles/html/titlepage.xml deleted file mode 100644 index 3e4f90b4..00000000 --- a/spring-build/docbook/styles/html/titlepage.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - <subtitle/> - <corpauthor/> - <authorgroup/> - <author/> - <mediaobject/> - <othercredit/> - <productname/> - <releaseinfo/> - <copyright/> - <pubdate/> - <revision/> - <revhistory/> - <abstract/> - </t:titlepage-content> - - <t:titlepage-content t:side="verso"> - <legalnotice/> - </t:titlepage-content> - - <t:titlepage-separator> - <hr/> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> -</t:titlepage> - -</t:templates> diff --git a/spring-build/docbook/styles/pdf/custom.xsl b/spring-build/docbook/styles/pdf/custom.xsl deleted file mode 100644 index 587ee408..00000000 --- a/spring-build/docbook/styles/pdf/custom.xsl +++ /dev/null @@ -1,661 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:xslthl="http://xslthl.sf.net" - exclude-result-prefixes="xslthl" - version='1.0'> - - <!-- Use nice graphics for admonitions --> - <xsl:param name="admon.graphics">'1'</xsl:param> - <xsl:param name="admon.graphics.path">@file.prefix@@dbf.xsl@/images/</xsl:param> - - <xsl:param name="draft.watermark.image" select="'@file.prefix@@dbf.xsl@/images/draft.png'"/> - <xsl:param name="paper.type" select="'@paper.type@'"/> - - <xsl:param name="page.margin.top" select="'1cm'"/> - <xsl:param name="region.before.extent" select="'1cm'"/> - <xsl:param name="body.margin.top" select="'1.5cm'"/> - - <xsl:param name="body.margin.bottom" select="'1.5cm'"/> - <xsl:param name="region.after.extent" select="'1cm'"/> - <xsl:param name="page.margin.bottom" select="'1cm'"/> - <xsl:param name="title.margin.left" select="'0cm'"/> - - <!-- Leave image paths as relative when navigating XInclude --> - <xsl:param name="keep.relative.image.uris" select="1"/> - -<!--################################################### - Header and Footer control - ################################################### --> - - <!-- Number of levels of sections to include in markers (for running headings/footings). Default is 2. --> - <xsl:param name="marker.section.level">1</xsl:param> - - <!-- Remove rules from top and bottom of the page --> - <xsl:param name="header.rule" select="0"></xsl:param> - <xsl:param name="footer.rule" select="0"></xsl:param> - -<!-- More space in the center header for long text - <xsl:attribute-set name="header.content.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$body.font.family"/> - </xsl:attribute> - <xsl:attribute name="margin-left">-5em</xsl:attribute> - <xsl:attribute name="margin-right">-5em</xsl:attribute> - </xsl:attribute-set> ---> -<!--################################################### - Table of Contents - ################################################### --> - - <xsl:param name="generate.toc"> - book toc,title - </xsl:param> - - <!-- Show only Sections up to level 1 in the TOCs --> - <xsl:param name="toc.section.depth">1</xsl:param> - -<!--################################################### - Custom Header and Footer - ################################################### --> -<!-- - pageclass - - There is a specific pageclass value for each type of page design that might be needed. For example, an index might - be two-column layout while the rest of the book is single column. Each pageclass has a set of FO simple-page-masters - defined for it. The following pageclass values are available by default, but this list could be extended by adding - custom page masters. - - titlepage Division title page, including set, book, part. - lot Page with a list of titles, including book table of contents, list of figures, etc. - front Front matter pages, including preface, dedication - body Main content pages - back Back matter pages, including appendix, glossary, etc. - index Alphabetical book-style index - - sequence - - Within a pageclass, the sequence of pages can have different page designs. For example, the first page of sequence - might omit the running header so it will not detract from the main title. The enumerated sequence values are: - - first First page of a page class. - odd Odd-numbered pages in the page class. - even Even-numbered pages. - blank Blank page at end of sequence, to even out page count. - - If the output format is single-sided, then odd and even pages should have the same design, and the blank page is - not called upon. ---> - <xsl:template name="header.content"> - <xsl:param name="pageclass" select="''"/> - <xsl:param name="sequence" select="''"/> - <xsl:param name="position" select="''"/> - <xsl:param name="gentext-key" select="''"/> - - <xsl:variable name="ProductName"> - <xsl:choose> - <xsl:when test="//productname"> - <xsl:value-of select="//productname"/><xsl:text> </xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>please define productname in your docbook file!</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="TitleAbbrev"> - <xsl:choose> - <xsl:when test="//titleabbrev"> - <xsl:value-of select="//titleabbrev"/><xsl:text> </xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>please define titleabbrev in your docbook file!</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <!-- $double.sided can be 0 or 1, meaning false or true respectively --> - <!-- pageclass can be titlepage, lot, front, body, back, index --> - <!-- sequence can be first, odd, even, blank --> - <!-- position can be left, center, right --> - <xsl:choose> - <xsl:when test="$double.sided != 0"> - <xsl:choose> - <xsl:when test="$pageclass='titlepage'"><!-- nop --></xsl:when> - <xsl:when test="$pageclass='lot'"> <!-- nop --></xsl:when> - - <xsl:when test="$pageclass='front' or $pageclass='body'"> - <xsl:choose> - <xsl:when test="$sequence='first' or $sequence='odd'"> - <xsl:choose> - <xsl:when test="$position='left'"> - <xsl:apply-templates select="." mode="titleabbrev.markup"/> <!-- chapter header --> - </xsl:when> - <xsl:when test="$position='center'"> - <!-- - <xsl:value-of select="$TitleAbbrev"/> - --> - </xsl:when> - <xsl:when test="$position='right'"> - <fo:page-number/> - </xsl:when> - </xsl:choose> - </xsl:when> - - <xsl:when test="$sequence='even' or $sequence='blank'"> - <xsl:choose> - <xsl:when test="$position='left'"> - <fo:page-number/> - </xsl:when> - <xsl:when test="$position='center'"> - <!-- - <fo:retrieve-marker retrieve-class-name="section.head.marker" - retrieve-position="first-including-carryover" - retrieve-boundary="page-sequence"/> - --> - </xsl:when> - <xsl:when test="$position='right'"> - <xsl:value-of select="$TitleAbbrev"/> - </xsl:when> - </xsl:choose> - </xsl:when> - </xsl:choose> - </xsl:when> - - <xsl:when test="$pageclass='back'"> <!-- nop --></xsl:when> - <xsl:when test="$pageclass='index'"> <!-- nop --></xsl:when> - <xsl:otherwise> <!-- nop --></xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:when test="$double.sided = 0"> - <xsl:choose> - <xsl:when test="$pageclass='titlepage'"><!-- nop --></xsl:when> - <xsl:when test="$pageclass='lot'"> <!-- nop --></xsl:when> - - <xsl:when test="$pageclass='front' or $pageclass='body'"> - <xsl:choose> - <xsl:when test="$sequence='first' or $sequence='odd' or $sequence='even' or $sequence='blank'"> - <xsl:choose> - <xsl:when test="$position='left'"> - <xsl:apply-templates select="." mode="titleabbrev.markup"/> <!-- chapter header --> - </xsl:when> - <xsl:when test="$position='center'"> - <!-- - <xsl:value-of select="$TitleAbbrev"/> - --> - </xsl:when> - <xsl:when test="$position='right'"> - <fo:page-number/> - </xsl:when> - </xsl:choose> - </xsl:when> - </xsl:choose> - </xsl:when> - - <xsl:when test="$pageclass='back'"> <!-- nop --></xsl:when> - <xsl:when test="$pageclass='index'"> <!-- nop --></xsl:when> - <xsl:otherwise> <!-- nop --></xsl:otherwise> - </xsl:choose> - </xsl:when> - </xsl:choose> - - - </xsl:template> - -<!--################################################### - Custom Footer - ################################################### --> - - <xsl:template name="footer.content"> - <xsl:param name="pageclass" select="''"/> - <xsl:param name="sequence" select="''"/> - <xsl:param name="position" select="''"/> - <xsl:param name="gentext-key" select="''"/> - - <xsl:variable name="Version"> - <xsl:choose> - <xsl:when test="//releaseinfo"> - <xsl:value-of select="//releaseinfo"/> - </xsl:when> - <xsl:otherwise> - <!-- nop --> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <xsl:variable name="TitleAbbrev"> - <xsl:choose> - <xsl:when test="//titleabbrev"> - <xsl:value-of select="//titleabbrev"/><xsl:text> </xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>please define titleabbrev in your docbook file!</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - - <!-- $double.sided can be 0 or 1, meaning false or true respectively --> - <!-- pageclass can be titlepage, lot, front, body, back, index --> - <!-- sequence can be first, odd, even, blank --> - <!-- position can be left, center, right --> - <xsl:choose> - <xsl:when test="$double.sided != 0"> - <xsl:choose> - <xsl:when test="$pageclass='titlepage'"> <!-- nop --></xsl:when> - - <xsl:when test="$pageclass='lot' or $pageclass='front' or $pageclass='body'"> - <xsl:choose> - <xsl:when test="$pageclass!='titlepage' and ($sequence='first' or $sequence='odd')"> - <xsl:choose> - <xsl:when test="$position='left'"> - <xsl:value-of select="$Version"/> - </xsl:when> - <xsl:when test="$position='center'"> - <!-- - <xsl:value-of select="$TitleAbbrev"/> - <fo:retrieve-marker retrieve-class-name="section.head.marker" - retrieve-position="first-including-carryover" - retrieve-boundary="page-sequence"/> - --> - </xsl:when> - <xsl:when test="$position='right'"> - <fo:page-number/> - </xsl:when> - </xsl:choose> - </xsl:when> - - <xsl:when test="$sequence='even' or $sequence='blank'"> - <xsl:choose> - <xsl:when test="$position='left'"> - <fo:page-number/> - </xsl:when> - <xsl:when test="$position='center'"> - <!-- - <xsl:value-of select="$TitleAbbrev"/> - --> - </xsl:when> - <xsl:when test="$position='right'"> - <xsl:apply-templates select="." mode="titleabbrev.markup"/> <!-- chapter header --> - </xsl:when> - </xsl:choose> - </xsl:when> - </xsl:choose> - </xsl:when> - - <xsl:when test="$pageclass='back'"> <!-- nop --></xsl:when> - <xsl:when test="$pageclass='index'"> <!-- nop --></xsl:when> - <xsl:otherwise> <!-- nop --></xsl:otherwise> - </xsl:choose> - </xsl:when> - <xsl:when test="$double.sided = 0"> - <xsl:choose> - <xsl:when test="$pageclass='titlepage'"><!-- nop --></xsl:when> - <xsl:when test="$pageclass='lot'"> <!-- nop --></xsl:when> - - <xsl:when test="$pageclass='front' or $pageclass='body'"> - <xsl:choose> - <xsl:when test="$sequence='first' or $sequence='odd' or $sequence='even' or $sequence='blank'"> - <xsl:choose> - <xsl:when test="$position='left'"> - <xsl:value-of select="$Version"/> - </xsl:when> - <xsl:when test="$position='center'"> - <fo:retrieve-marker retrieve-class-name="section.head.marker" - retrieve-position="first-including-carryover" - retrieve-boundary="page-sequence"/> - </xsl:when> - <xsl:when test="$position='right'"> - <fo:page-number/> - </xsl:when> - </xsl:choose> - </xsl:when> - </xsl:choose> - </xsl:when> - - <xsl:when test="$pageclass='back'"> <!-- nop --></xsl:when> - <xsl:when test="$pageclass='index'"> <!-- nop --></xsl:when> - <xsl:otherwise> <!-- nop --></xsl:otherwise> - </xsl:choose> - </xsl:when> - </xsl:choose> - - </xsl:template> - - <xsl:template match="processing-instruction('hard-pagebreak')"> - <fo:block break-before='page'/> - </xsl:template> - -<!--################################################### - Extensions - ################################################### --> - -<!-- These extensions are required for table printing and other stuff --> - <xsl:param name="use.extensions">1</xsl:param> - <xsl:param name="tablecolumns.extension">0</xsl:param> - <xsl:param name="callout.extensions">1</xsl:param> - <xsl:param name="fop.extensions">1</xsl:param> - -<!--################################################### - Paper & Page Size - ################################################### --> - -<!-- Paper type, no headers on blank pages, no double sided printing --> - <xsl:param name="double.sided">1</xsl:param> - <xsl:param name="headers.on.blank.pages">1</xsl:param> - <xsl:param name="footers.on.blank.pages">1</xsl:param> - -<!--################################################### - Fonts & Styles - ################################################### --> - <xsl:param name="alignment">left</xsl:param> - - <xsl:param name="hyphenate">false</xsl:param> - - <xsl:attribute-set name="footer.content.properties"> - <xsl:attribute name="font-family"> - <xsl:value-of select="$body.fontset"/> - </xsl:attribute> - </xsl:attribute-set> - -<!-- Default Font size --> - <xsl:param name="body.font.master">12</xsl:param> - <xsl:param name="body.font.small">8</xsl:param> - -<!-- Line height in body text --> - <xsl:param name="line-height">1.2</xsl:param> - -<!-- Chapter title size --> - <xsl:attribute-set name="chapter.titlepage.recto.style"> - <xsl:attribute name="text-align">left</xsl:attribute> - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.8"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - </xsl:attribute-set> - -<!-- Why is the font-size for chapters hardcoded in the XSL FO templates? - Let's remove it, so this sucker can use our attribute-set only... --> - <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode"> - <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" - xsl:use-attribute-sets="chapter.titlepage.recto.style"> - <xsl:call-template name="component.title"> - <xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/> - </xsl:call-template> - </fo:block> - </xsl:template> - -<!-- Sections 1, 2 and 3 titles have a small bump factor and padding --> - <xsl:attribute-set name="section.title.level1.properties"> - <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.5"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - <xsl:attribute-set name="section.title.level2.properties"> - <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.25"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - <xsl:attribute-set name="section.title.level3.properties"> - <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.4em</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master * 1.0"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - -<!-- Use code syntax highlighting --> - <xsl:param name="highlight.source" select="1"/> - <xsl:param name="highlight.default.language" select="xml" /> - - <xsl:template match='xslthl:keyword'> - <fo:inline font-weight="bold" color="#7F0055"><xsl:apply-templates/></fo:inline> - </xsl:template> - - <xsl:template match='xslthl:comment'> - <fo:inline font-style="italic" color="#3F5F5F"><xsl:apply-templates/></fo:inline> - </xsl:template> - - <xsl:template match='xslthl:oneline-comment'> - <fo:inline font-style="italic" color="#3F5F5F"><xsl:apply-templates/></fo:inline> - </xsl:template> - - <xsl:template match='xslthl:multiline-comment'> - <fo:inline font-style="italic" color="#3F5FBF"><xsl:apply-templates/></fo:inline> - </xsl:template> - - <xsl:template match='xslthl:tag'> - <fo:inline color="#3F7F7F"><xsl:apply-templates/></fo:inline> - </xsl:template> - - <xsl:template match='xslthl:attribute'> - <fo:inline color="#7F007F"><xsl:apply-templates/></fo:inline> - </xsl:template> - - <xsl:template match='xslthl:value'> - <fo:inline color="#2A00FF"><xsl:apply-templates/></fo:inline> - </xsl:template> - - <xsl:template match='xslthl:string'> - <fo:inline color="#2A00FF"><xsl:apply-templates/></fo:inline> - </xsl:template> - -<!--################################################### - Tables - ################################################### --> - - <!-- Some padding inside tables --> - <xsl:attribute-set name="table.cell.padding"> - <xsl:attribute name="padding-left">4pt</xsl:attribute> - <xsl:attribute name="padding-right">4pt</xsl:attribute> - <xsl:attribute name="padding-top">4pt</xsl:attribute> - <xsl:attribute name="padding-bottom">4pt</xsl:attribute> - </xsl:attribute-set> - -<!-- Only hairlines as frame and cell borders in tables --> - <xsl:param name="table.frame.border.thickness">0.1pt</xsl:param> - <xsl:param name="table.cell.border.thickness">0.1pt</xsl:param> - -<!--################################################### - Labels - ################################################### --> - -<!-- Label Chapters and Sections (numbering) --> - <xsl:param name="chapter.autolabel" select="1"/> - <xsl:param name="section.autolabel" select="1"/> - <xsl:param name="section.autolabel.max.depth" select="1"/> - - <xsl:param name="section.label.includes.component.label" select="1"/> - <xsl:param name="table.footnote.number.format" select="'1'"/> - -<!--################################################### - Programlistings - ################################################### --> - -<!-- Verbatim text formatting (programlistings) --> - <xsl:attribute-set name="monospace.verbatim.properties"> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.small * 0.90"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - </xsl:attribute-set> - - <xsl:attribute-set name="verbatim.properties"> - <xsl:attribute name="space-before.minimum">1em</xsl:attribute> - <xsl:attribute name="space-before.optimum">1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - - <xsl:attribute name="border-color">#444444</xsl:attribute> - <xsl:attribute name="border-style">solid</xsl:attribute> - <xsl:attribute name="border-width">0.1pt</xsl:attribute> - <xsl:attribute name="padding-top">0.5em</xsl:attribute> - <xsl:attribute name="padding-left">0.5em</xsl:attribute> - <xsl:attribute name="padding-right">0.5em</xsl:attribute> - <xsl:attribute name="padding-bottom">0.5em</xsl:attribute> - <xsl:attribute name="margin-left">0em</xsl:attribute> - <xsl:attribute name="margin-right">0em</xsl:attribute> - </xsl:attribute-set> - - <!-- Shade (background) programlistings --> - <xsl:param name="shade.verbatim">1</xsl:param> - <xsl:attribute-set name="shade.verbatim.style"> - <xsl:attribute name="background-color">#F0F0F0</xsl:attribute> - </xsl:attribute-set> - - <xsl:attribute-set name="list.block.spacing"> - <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - - <xsl:attribute-set name="abstract.properties"> - <xsl:attribute name="font-weight">normal</xsl:attribute> - </xsl:attribute-set> - - <xsl:attribute-set name="example.properties"> - <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute> - <xsl:attribute name="space-before.optimum">0.5em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.5em</xsl:attribute> - <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> - <xsl:attribute name="keep-together.within-column">always</xsl:attribute> - </xsl:attribute-set> - -<!--################################################### - Title information for Figures, Examples etc. - ################################################### --> - - <xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing"> - <xsl:attribute name="font-weight">normal</xsl:attribute> - <xsl:attribute name="font-style">italic</xsl:attribute> - <xsl:attribute name="font-size"> - <xsl:value-of select="$body.font.master"/> - <xsl:text>pt</xsl:text> - </xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="space-before.minimum">0.1em</xsl:attribute> - <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute> - <xsl:attribute name="space-before.maximum">0.1em</xsl:attribute> - </xsl:attribute-set> - -<!--################################################### - Callouts - ################################################### --> - -<!-- don't use images for callouts --> - <xsl:param name="callout.graphics">0</xsl:param> - <xsl:param name="callout.unicode">1</xsl:param> - -<!-- Place callout marks at this column in annotated areas --> - <xsl:param name="callout.defaultcolumn">90</xsl:param> - -<!--################################################### - Misc - ################################################### --> - -<!-- Placement of titles --> - <xsl:param name="formal.title.placement"> - figure after - example after - equation before - table before - procedure before - </xsl:param> - -<!-- Format Variable Lists as Blocks (prevents horizontal overflow) --> - <xsl:param name="variablelist.as.blocks">1</xsl:param> - - <xsl:param name="body.start.indent">0pt</xsl:param> - -<!-- Remove "Chapter" from the Chapter titles... --> - <xsl:param name="local.l10n.xml" select="document('')"/> - <l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"> - <l:l10n language="en"> - <l:context name="title-numbered"> - <l:template name="chapter" text="%n. %t"/> - <l:template name="section" text="%n %t"/> - </l:context> - <l:context name="title"> - <l:template name="example" text="Example %n %t"/> - </l:context> - </l:l10n> - </l:i18n> - -<!--################################################### - colored and hyphenated links - ################################################### --> - - <xsl:template match="ulink"> - <fo:basic-link external-destination="{@url}" - xsl:use-attribute-sets="xref.properties" - text-decoration="underline" - color="blue"> - <xsl:choose> - <xsl:when test="count(child::node())=0"> - <xsl:value-of select="@url"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </fo:basic-link> - </xsl:template> - - <xsl:template match="link"> - <fo:basic-link internal-destination="{@linkend}" - xsl:use-attribute-sets="xref.properties" - text-decoration="underline" - color="blue"> - <xsl:choose> - <xsl:when test="count(child::node())=0"> - <xsl:value-of select="@linkend"/> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </fo:basic-link> - </xsl:template> - -</xsl:stylesheet> \ No newline at end of file diff --git a/spring-build/docbook/styles/pdf/titlepage.xml b/spring-build/docbook/styles/pdf/titlepage.xml deleted file mode 100644 index b32d1ea6..00000000 --- a/spring-build/docbook/styles/pdf/titlepage.xml +++ /dev/null @@ -1,96 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<!DOCTYPE t:templates [ -<!ENTITY hsize0 "10pt"> -<!ENTITY hsize1 "12pt"> -<!ENTITY hsize2 "14.4pt"> -<!ENTITY hsize3 "17.28pt"> -<!ENTITY hsize4 "20.736pt"> -<!ENTITY hsize5 "24.8832pt"> -<!ENTITY hsize0space "7.5pt"> <!-- 0.75 * hsize0 --> -<!ENTITY hsize1space "9pt"> <!-- 0.75 * hsize1 --> -<!ENTITY hsize2space "10.8pt"> <!-- 0.75 * hsize2 --> -<!ENTITY hsize3space "12.96pt"> <!-- 0.75 * hsize3 --> -<!ENTITY hsize4space "15.552pt"> <!-- 0.75 * hsize4 --> -<!ENTITY hsize5space "18.6624pt"> <!-- 0.75 * hsize5 --> -]> -<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0" - xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param" - xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - - <t:titlepage t:element="book" t:wrapper="fo:block"> - <t:titlepage-content t:side="recto"> - <title - t:named-template="division.title" - param:node="ancestor-or-self::book[1]" - text-align="center" - font-size="&hsize5;" - space-before="&hsize5space;" - font-weight="bold" - font-family="{$title.fontset}" - /> - <subtitle - text-align="center" - font-size="&hsize4;" - space-before="&hsize4space;" - font-family="{$title.fontset}" - /> - - <corpauthor space-before="0.5em" - font-size="&hsize2;" - /> - - <authorgroup space-before="0.5em" - font-size="&hsize2;" - /> - - <author space-before="0.5em" font-size="&hsize2;"/> - <mediaobject space-before="2em" space-after="2em"/> - <releaseinfo space-before="5em" font-size="&hsize2;"/> - - <othercredit space-before="2em" font-weight="normal" font-size="8"/> - <pubdate space-before="0.5em"/> - <revision space-before="0.5em"/> - <revhistory space-before="0.5em"/> - - <abstract space-before="0.5em" - text-align="start" - margin-left="0.1in" - margin-right="0.1in" - font-family="{$body.fontset}" - /> - </t:titlepage-content> - - <t:titlepage-content t:side="verso" text-align="start"> - <copyright space-before="1.5em"/> - <legalnotice space-before="15em"/> - </t:titlepage-content> - - <t:titlepage-separator> - </t:titlepage-separator> - - <t:titlepage-before t:side="recto"> - </t:titlepage-before> - - <t:titlepage-before t:side="verso"> - </t:titlepage-before> - </t:titlepage> - -<!-- ==================================================================== --> - -</t:templates> diff --git a/spring-build/lib/ivy/commons-codec.jar b/spring-build/lib/ivy/commons-codec.jar deleted file mode 100644 index 957b6752..00000000 Binary files a/spring-build/lib/ivy/commons-codec.jar and /dev/null differ diff --git a/spring-build/lib/ivy/commons-httpclient.jar b/spring-build/lib/ivy/commons-httpclient.jar deleted file mode 100644 index 7c59774a..00000000 Binary files a/spring-build/lib/ivy/commons-httpclient.jar and /dev/null differ diff --git a/spring-build/lib/ivy/commons-logging.jar b/spring-build/lib/ivy/commons-logging.jar deleted file mode 100644 index 1deef144..00000000 Binary files a/spring-build/lib/ivy/commons-logging.jar and /dev/null differ diff --git a/spring-build/lib/ivy/current.version b/spring-build/lib/ivy/current.version deleted file mode 100644 index ebbc211d..00000000 --- a/spring-build/lib/ivy/current.version +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2010 SpringSource -# -# 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. - -ivy.jar= 2.1.0 -org.springframework.build.aws.ivy.jar= 1.0.8.RELEASE -commons-codec= 1.3.0 -commons-httpclient= 3.1.0 -commons-logging= 1.1.1 -jets3t= 0.7.0 diff --git a/spring-build/lib/ivy/ivy.jar b/spring-build/lib/ivy/ivy.jar deleted file mode 100644 index 3902b6fd..00000000 Binary files a/spring-build/lib/ivy/ivy.jar and /dev/null differ diff --git a/spring-build/lib/ivy/jets3t.jar b/spring-build/lib/ivy/jets3t.jar deleted file mode 100644 index 3bab2985..00000000 Binary files a/spring-build/lib/ivy/jets3t.jar and /dev/null differ diff --git a/spring-build/lib/ivy/jets3t.properties b/spring-build/lib/ivy/jets3t.properties deleted file mode 100644 index 6a83275c..00000000 --- a/spring-build/lib/ivy/jets3t.properties +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2010 SpringSource -# -# 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. - -## JetS3t Configuration Properties - -# A full description of all configuration properties can be found at -# http://jets3t.s3.amazonaws.com/toolkit/configuration.html - -# Proxy configuration -httpclient.proxy-autodetect=true -#httpclient.proxy-host= -#httpclient.proxy-port= -#httpclient.proxy-user= -#httpclient.proxy-password= -#httpclient.proxy-domain= diff --git a/spring-build/lib/ivy/org.springframework.build.aws.ivy.jar b/spring-build/lib/ivy/org.springframework.build.aws.ivy.jar deleted file mode 100644 index 252d9a85..00000000 Binary files a/spring-build/lib/ivy/org.springframework.build.aws.ivy.jar and /dev/null differ diff --git a/spring-build/library/artifact.xml b/spring-build/library/artifact.xml deleted file mode 100644 index 96612d1c..00000000 --- a/spring-build/library/artifact.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="artifact-library" xmlns:ivy="antlib:org.apache.ivy.ant"> - - <import file="common.xml"/> - - <filterset id="library.filters" /> - -<!-- Main targets --> - <target name="javadoc-all" description="Does nothing"/> - - <target name="javadoc-api" description="Does nothing."/> - - <target name="jar" depends="ivy.init, resolve.compile" - description="Creates a libd file with the proper versions substituted."> - <delete quiet="true" file="${ivy.output.file}"/> - <mkdir dir="${ivy.output.dir}"/> - <delete quiet="true" file="${libd.output.file}"/> - <mkdir dir="${libd.output.dir}"/> - - <copy file="${libd.input.file}" tofile="${libd.output.file}"> - <filterset> - <filter token="bundle.version" value="${bundle.version}"/> - <filterset refid="library.filters"/> - </filterset> - </copy> - - <ivy:publish resolver="integration" pubdate="${timestamp}" status="${release.type}"> - <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${libd.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${license.dir}/[artifact].[ext]"/> - </ivy:publish> - </target> - -<!-- Other targets --> - <target name="javadoc.prep"/> - -</project> diff --git a/spring-build/library/common.xml b/spring-build/library/common.xml deleted file mode 100644 index 0f60ceed..00000000 --- a/spring-build/library/common.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="common-library" xmlns:s="antlib:org.springframework.build"> - - <import file="../common/common.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/library/default.xml b/spring-build/library/default.xml deleted file mode 100644 index bf0f150b..00000000 --- a/spring-build/library/default.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="default-library"> - - <import file="common.xml"/> - <import file="artifact.xml"/> - <import file="quality.xml"/> - <import file="package.xml"/> - <import file="publish.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/library/package.xml b/spring-build/library/package.xml deleted file mode 100644 index 45e2b4fe..00000000 --- a/spring-build/library/package.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="package-library"> - - <import file="common.xml"/> - <import file="../common/package.xml"/> - -<!-- Macros --> - <macrodef name="dist-jar"> - <attribute name="output.dir" default="${package.dist.dir}"/> - <sequential> - <mkdir dir="@{output.dir}"/> - <copy file="${libd.output.file}" tofile="@{output.dir}/${package.libd.output.file}"/> - </sequential> - </macrodef> - - <macrodef name="src-jar"> - <attribute name="output.dir" default="${package.src.dir}"/> - <sequential> - </sequential> - </macrodef> - -</project> \ No newline at end of file diff --git a/spring-build/library/publish.xml b/spring-build/library/publish.xml deleted file mode 100644 index adb50554..00000000 --- a/spring-build/library/publish.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="publish-library" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:maven="antlib:org.apache.maven.artifact.ant"> - - <import file="common.xml"/> - <import file="../common/publish.xml"/> - - <target name="publish-ivy" depends="ivy.init, resolve"> - <delete quiet="true" file="${ivy.output.file}"/> - <mkdir dir="${ivy.output.dir}" /> - - <ivy:publish resolver="${publication.resolver.prefix}-library-publish" pubdate="${timestamp}" - status="${release.type}"> - <artifacts pattern="${libd.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${license.dir}/[artifact].[ext]"/> - </ivy:publish> - </target> - - <target name="publish-maven" depends="create.pom, ivy.init, maven.init, resolve" unless="local.build"> - <maven:deploy file="${libd.output.file}"> - <remoteRepository url="s3://${publish.bucket}/maven/libraries/${adjusted.release.type}"> - <authentication username="${accessKey}" passphrase="${secretKey}"/> - </remoteRepository> - <pom file="${pom.output.file}"/> - </maven:deploy> - </target> - - <target name="publish-maven-central" depends="maven.init"> - <property name="maven.central.repository" value="s3://maven.springframework.org/${adjusted.release.type}"/> - <maven:deploy file="${libd.output.file}"> - <remoteRepository url="${maven.central.repository}"> - <authentication username="${accessKey}" passphrase="${secretKey}"/> - </remoteRepository> - <pom file="${local.pom.output.file}"/> - </maven:deploy> - </target> - - <target name="install-maven" depends="create.pom, snapshot.pom, maven.init"> - <maven:install file="${libd.output.file}"> - <pom file="${pom.output.file}"/> - </maven:install> - </target> - - <target name="install-maven-central" depends="maven.init"> - <maven:install file="${libd.output.file}"> - <pom file="${local.pom.output.file}"/> - </maven:install> - </target> - - <target name="create.pom" depends="ivy.init, resolve"> - <delete quiet="true" file="${pom.output.file}"/> - <mkdir dir="${pom.output.dir}"/> - - <ivy:makepom ivyfile="${ivy.output.file}" pomfile="${pom.output.file}"> - <mapping conf="compile" scope="compile"/> - <mapping conf="provided" scope="provided"/> - <mapping conf="dm-server-provided" scope="provided"/> - <mapping conf="runtime" scope="runtime"/> - <mapping conf="test" scope="test"/> - </ivy:makepom> - - <replaceregexp match="<packaging>jar</packaging>" - replace="<packaging>libd</packaging>" - file="${pom.output.file}"/> - </target> - -</project> \ No newline at end of file diff --git a/spring-build/library/quality.xml b/spring-build/library/quality.xml deleted file mode 100644 index 6a7673f0..00000000 --- a/spring-build/library/quality.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="quality-library"> - -<!-- Main targets --> - <target name="test" description="Does nothing."/> - - <target name="clover" description="Does nothing."/> - - <target name="findbugs" description="Does nothing."/> - - <target name="osgi-validate" description="Does nothing."/> - -<!-- Other targets --> - <target name="test.do" description="Does nothing."/> - - <target name="clover.do" description="Does nothing."/> - - <target name="findbugs.do" description="Does nothing."/> - -</project> \ No newline at end of file diff --git a/spring-build/multi-bundle/artifact.xml b/spring-build/multi-bundle/artifact.xml deleted file mode 100644 index aeef1c32..00000000 --- a/spring-build/multi-bundle/artifact.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="artifact-multi-bundle"> - - <import file="common.xml"/> - -<!-- Main targets --> - <target name="javadoc-all" - description="Creates javadoc documentation for all classes."> - <delete dir="${javadoc-all.output.dir}" quiet="true"/> - <mkdir dir="${javadoc-all.output.dir}"/> - <all-bundles target="javadoc.prep"> - <property name="javadoc.prep.dir" value="${javadoc.prep.dir}"/> - </all-bundles> - <path id="global.path"> - <fileset dir="${ivy.cache.dir}" erroronmissingdir="false"> - <exclude name="**/*-sources-*.jar"/> - <include name="**/*.jar"/> - </fileset> - </path> - <java-doc input.dir="${javadoc.prep.dir}" output.dir="${javadoc-all.output.dir}" classpath.id="global.path" - access="private"/> - <delete quiet="true" dir="${javadoc.prep.dir}"/> - </target> - - <target name="javadoc-api" - description="Creates javadoc documentation for all classes."> - <delete dir="${javadoc-api.output.dir}" quiet="true"/> - <mkdir dir="${javadoc-api.output.dir}"/> - <all-bundles target="javadoc.prep"> - <property name="javadoc.prep.dir" value="${javadoc.prep.dir}"/> - </all-bundles> - <path id="global.path"> - <fileset dir="${ivy.cache.dir}" erroronmissingdir="false"> - <exclude name="**/*-sources-*.jar"/> - <include name="**/*.jar"/> - </fileset> - </path> - <java-doc input.dir="${javadoc.prep.dir}" output.dir="${javadoc-api.output.dir}" classpath.id="global.path" - access="protected" exclude.package.names="${javadoc.exclude.package.names}"/> - <delete quiet="true" dir="${javadoc.prep.dir}"/> - </target> - - <target name="jar" - description="Creates a JAR file containing the output of a compilation of the source tree."> - <all-bundles target="jar"/> - </target> - -<!-- Other targets --> - <target name="javadoc.prep"> - <all-bundles target="javadoc.prep"> - <property name="javadoc.prep.dir" value="${javadoc.prep.dir}"/> - </all-bundles> - </target> - -</project> \ No newline at end of file diff --git a/spring-build/multi-bundle/common.xml b/spring-build/multi-bundle/common.xml deleted file mode 100644 index 26b311ac..00000000 --- a/spring-build/multi-bundle/common.xml +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="common-multi-bundle" xmlns:ivy="antlib:org.apache.ivy.ant"> - - <tstamp> - <format property="timestamp" pattern="yyyyMMddHHmmss" timezone="GMT"/> - </tstamp> - -<!-- Properties --> - <dirname property="spring.build.dir" file="${ant.file.common-multi-bundle}/.."/> - <property file="${spring.build.dir}/common/common.properties"/> - -<!-- Global targets --> - <condition property="adjusted.release.type" value="snapshot" else="${release.type}"> - <equals arg1="integration" arg2="${release.type}"/> - </condition> - -<!-- Main targets --> - <target name="clean" - description="Removes the target directory."> - <delete quiet="true" dir="${target.dir}"/> - <all-bundles target="clean"/> - </target> - - <target name="clean-integration" - description="Removes the integration repository directory."> - <fail message="The 'integration.repo.dir' property must be set on this project."> - <condition> - <not> - <isset property="integration.repo.dir"/> - </not> - </condition> - </fail> - <delete quiet="true" dir="${integration.repo.dir}"/> - </target> - - <target name="clean-ivy" depends="ivy.init" - description="Removes the ivy cache directory."> - <fail message="The 'ivy.cache.dir' property must be set on this project."> - <condition> - <not> - <isset property="ivy.cache.dir"/> - </not> - </condition> - </fail> - <delete quiet="true" dir="${ivy.cache.dir}"/> - </target> - -<!-- Other targets --> - <target name="ivy.init" unless="ivy.initialized"> - <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"> - <classpath> - <path location="${ivy.lib.dir}/ivy.jar"/> - <path location="${ivy.lib.dir}/org.springframework.build.aws.ivy.jar"/> - <path location="${ivy.lib.dir}/commons-codec.jar"/> - <path location="${ivy.lib.dir}/commons-httpclient.jar"/> - <path location="${ivy.lib.dir}/commons-logging.jar"/> - <path location="${ivy.lib.dir}/jets3t.jar"/> - <path location="${ivy.lib.dir}"/> - </classpath> - </taskdef> - <ivy:settings file="${ivy.settings.file}"/> - <property name="ivy.initialized" value="true"/> - </target> - -<!-- Macros --> - <macrodef name="all-bundles"> - <attribute name="target"/> - <attribute name="buildpathRef" default="bundles"/> - <element name="inherited-properties" optional="true" implicit="true"/> - <sequential> - <subant target="@{target}" verbose="true" buildpathRef="@{buildpathRef}"> - <inherited-properties/> - <propertyset> - <propertyref builtin="commandline"/> - </propertyset> - <property name="timestamp" value="${timestamp}"/> - </subant> - </sequential> - </macrodef> - - <macrodef name="java-doc"> - <attribute name="input.dir"/> - <attribute name="output.dir"/> - <attribute name="classpath.id"/> - <attribute name="access"/> - <attribute name="exclude.package.names" default=""/> - <sequential> - <delete quiet="true" dir="@{output.dir}"/> - <mkdir dir="@{output.dir}"/> - <javadoc.links sourcepath="@{input.dir}" destdir="@{output.dir}" classpathref="@{classpath.id}" - access="@{access}" excludepackagenames="@{exclude.package.names}" maxmemory="${javadoc.max.memory}" - stylesheetfile="${javadoc.stylesheet.file}" splitindex="true" useexternalfile="true" overview="@{input.dir}/overview.html"> - <header><![CDATA[<!-- Begin Google Analytics code --> <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); </script> <script type="text/javascript"> var pageTracker = _gat._getTracker("UA-2728886-3"); pageTracker._setDomainName("none"); pageTracker._setAllowLinker(true); pageTracker._trackPageview(); </script> <!-- End Google Analytics code -->]]></header> - </javadoc.links> - <copy toDir="@{output.dir}/resources"> - <fileset dir="${javadoc.resources.dir}" erroronmissingdir="false"/> - </copy> - </sequential> - </macrodef> - - <presetdef name="javadoc.links"> - <javadoc/> - </presetdef> - -</project> diff --git a/spring-build/multi-bundle/default.xml b/spring-build/multi-bundle/default.xml deleted file mode 100644 index 67fc181c..00000000 --- a/spring-build/multi-bundle/default.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="default-multi-bundle"> - - <import file="common.xml"/> - <import file="artifact.xml"/> - <import file="quality.xml"/> - <import file="package.xml"/> - <import file="publish.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/multi-bundle/package.xml b/spring-build/multi-bundle/package.xml deleted file mode 100644 index 05550219..00000000 --- a/spring-build/multi-bundle/package.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="package-multi-bundle"> - - <import file="common.xml"/> - -<!-- Main targets --> - <target name="package" - description="Creates a packaged distributable of the project. Unless overridden, delegates to sub-bundles."> - <all-bundles target="package"> - <property name="package.output.dir" value="${package.output.dir}"/> - </all-bundles> - </target> - -</project> \ No newline at end of file diff --git a/spring-build/multi-bundle/publish.xml b/spring-build/multi-bundle/publish.xml deleted file mode 100644 index 012e121e..00000000 --- a/spring-build/multi-bundle/publish.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="publish-multi-bundle" xmlns:ivy="antlib:org.apache.ivy.ant" - xmlns:aws="antlib:org.springframework.build.aws"> - - <import file="common.xml"/> - -<!-- Main targets --> - <target name="publish" - description="Publishes all artifacts to remote repositories"> - <all-bundles target="publish"/> - </target> - - <target name="publish-ivy" - description="Publishes all ivy artifacts to remote repositories"> - <all-bundles target="publish-ivy"/> - </target> - - <target name="publish-maven" - description="Publishes all maven artifacts to remote repositories"> - <all-bundles target="publish-maven"/> - </target> - - <target name="publish-maven-central"> - <all-bundles target="publish-maven-central"/> - </target> - - <target name="install-maven"> - <all-bundles target="install-maven"/> - </target> - - <target name="install-maven-central"> - <all-bundles target="install-maven-central"/> - </target> - - <target name="publish-package" depends="aws.init"> - <fail message="The 'project.name' property must be set on this project."> - <condition> - <not> - <isset property="project.name"/> - </not> - </condition> - </fail> - <checksum file="${package.output.file}" algorithm="sha1"/> - <aws:s3 accessKey="${accessKey}" secretKey="${secretKey}"> - <upload bucketName="dist.${bucket.basename}" file="${package.output.file}" - toFile="${adjusted.release.type}/${project.key}/${package.file.name}" publicRead="true"> - <metadata name="project.name" value="${project.name}"/> - <metadata name="release.type" value="${release.type}"/> - <metadata name="bundle.version" value="${bundle.version}"/> - <metadata name="package.file.name" value="${package.file.name}"/> - </upload> - <upload bucketName="dist.${bucket.basename}" file="${package.output.file}.sha1" - toFile="${adjusted.release.type}/${project.key}/${package.file.name}.sha1" publicRead="true"> - </upload> - </aws:s3> - </target> - -<!-- Other targets --> - <target name="aws.init" depends="ivy.init"> - <ivy:cachepath resolveId="spring.aws.ant.classpath" pathid="spring.aws.ant.classpath" - organisation="org.springframework.build" module="org.springframework.build.aws.ant" - revision="${org.springframework.build.aws.ant.version}" conf="runtime" type="jar" inline="true" - log="download-only"/> - <taskdef resource="org/springframework/build/aws/ant/antlib.xml" uri="antlib:org.springframework.build.aws" - classpathref="spring.aws.ant.classpath" /> - </target> - -</project> \ No newline at end of file diff --git a/spring-build/multi-bundle/quality.xml b/spring-build/multi-bundle/quality.xml deleted file mode 100644 index d0606d38..00000000 --- a/spring-build/multi-bundle/quality.xml +++ /dev/null @@ -1,138 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="quality-multi-bundle" xmlns:ivy="antlib:org.apache.ivy.ant"> - - <import file="common.xml"/> - -<!-- Main targets --> - <target name="test" depends="jar, test.pre, test.do, test.post" - description="Executes all tests resulting from a compilation of the test tree returning test success metrics."/> - - <target name="clover" depends="clover.pre, clover.do, clover.post" - description="Executes all tests resulting from a compilation of the test tree returning test coverage metrics."/> - - <target name="findbugs" depends="findbugs.pre, findbugs.do" - description="Checks all code from the source tree for bugs."/> - - <target name="osgi-validate" - description="Checks all code from the source tree for bugs."> - <all-bundles target="osgi-validate"/> - </target> - -<!-- Other targets --> - <target name="test.pre"> - <delete quiet="true" dir="${test-results.output.dir}"/> - <mkdir dir="${test-results.output.dir}/xml"/> - </target> - - <target name="test.do"> - <all-bundles target="test.do"> - <property name="test-results.output.dir" value="${test-results.output.dir}"/> - </all-bundles> - </target> - - <target name="test.post"> - <mkdir dir="${test-results.output.dir}/html"/> - <junitreport> - <fileset dir="${test-results.output.dir}/xml" erroronmissingdir="false"/> - <report format="frames" todir="${test-results.output.dir}/html"/> - </junitreport> - <delete file="TESTS-TestSuites.xml"/> - </target> - - <target name="clover.init" depends="ivy.init"> - <ivy:cachepath resolveId="clover.classpath" pathid="clover.classpath" organisation="com.atlassian.clover" - module="com.springsource.com.cenqua.clover" revision="${com.springsource.com.cenqua.clover.version}" - conf="runtime" type="jar" inline="true" log="download-only"/> - <taskdef resource="cloverlib.xml" classpathref="clover.classpath"/> - </target> - - <target name="clover.pre" depends="clover.init"> - <delete dir="${clover.output.dir}" quiet="true"/> - <mkdir dir="${clover.db.dir}"/> - </target> - - <target name="clover.do"> - <condition property="has.unit.test.bundles"> - <isreference refid="unit.test.bundles" /> - </condition> - <antcall target="clover.do.unit"/> - <antcall target="clover.do.all" /> - </target> - - <target name="clover.do.unit" if="has.unit.test.bundles"> - <all-bundles target="clover" buildpathRef="unit.test.bundles"/> - </target> - - <target name="clover.do.all" unless="has.unit.test.bundles"> - <all-bundles target="clover" buildpathRef="bundles"/> - </target> - - <target name="clover.post" depends="clover.init"> - <clover-merge initString="${clover.db.file}"> - <cloverDbSet dir="${basedir}/.." span="30m"> - <include name="**/target/clover/db/clover.db"/> - </cloverDbSet> - </clover-merge> - <clover-report initstring="${clover.db.file}"> - <current outfile="${clover.output.dir}/clover.xml" span="30m"> - <format type="xml"/> - <testsources dir=".."> - <include name="**/src/test/java/**/*.java"/> - <include name="**/src/test/java/*.java"/> - </testsources> - </current> - </clover-report> - <clover-report initstring="${clover.db.file}"> - <current outfile="${clover.output.dir}/html" span="30m"> - <format type="html"/> - <testsources dir=".."> - <include name="**/src/test/java/**/*.java"/> - <include name="**/src/test/java/*.java"/> - </testsources> - </current> - </clover-report> - <clover-report initstring="${clover.db.file}"> - <current outfile="${clover.output.dir}/clover.pdf" summary="true" span="30m"> - <format type="pdf"/> - <testsources dir=".."> - <include name="**/src/test/java/**/*.java"/> - <include name="**/src/test/java/*.java"/> - </testsources> - </current> - </clover-report> - <clover-check initstring="${clover.db.file}" target="${clover.coverage}" haltOnFailure="${clover.enforce}" - span="30m"> - <testsources dir=".."> - <include name="**/src/test/java/**/*.java"/> - <include name="**/src/test/java/*.java"/> - </testsources> - </clover-check> - </target> - - <target name="findbugs.pre"> - <delete dir="${findbugs.output.dir}" quiet="true"/> - <mkdir dir="${findbugs.output.dir}"/> - </target> - - <target name="findbugs.do"> - <all-bundles target="findbugs.do"> - <property name="findbugs.output.dir" value="${findbugs.output.dir}"/> - </all-bundles> - </target> - -</project> \ No newline at end of file diff --git a/spring-build/par/artifact.xml b/spring-build/par/artifact.xml deleted file mode 100644 index 3714e91f..00000000 --- a/spring-build/par/artifact.xml +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="artifact-par" xmlns:ivy="antlib:org.apache.ivy.ant"> - - <import file="common.xml"/> - <import file="../multi-bundle/artifact.xml"/> - -<!-- Main targets --> - <target name="jar" depends="ivy.init" - description="Creates a PAR file containing the output of the list of bundles."> - <delete dir="${par.staging.dir}" quiet="true"/> - <mkdir dir="${par.staging.dir}"/> - <delete dir="${par.output.file}" quiet="true"/> - <mkdir dir="${jar.output.dir}"/> - - <all-bundles target="jar"/> - <all-bundles target="copy-dist-jar"> - <property name="copy.to.dir" value="${par.staging.dir}"/> - </all-bundles> - <all-bundles target="copy-ext-jars"> - <property name="copy.to.dir" value="${par.staging.dir}"/> - </all-bundles> - <antcall target="collect-additional"/> - <jar destfile="${par.output.file}" basedir="${par.staging.dir}" index="true" filesetmanifest="merge"> - <manifest> - <attribute name="Application-SymbolicName" value="${ant.project.name}"/> - <attribute name="Application-Version" value="${bundle.version}"/> - <attribute name="Application-Name" value="${application.name}"/> - <attribute name="Application-Description" value="${application.description}"/> - <attribute name="Application-Creator" value="${user.name}"/> - </manifest> - </jar> - </target> - - <target name="collect-additional" depends="ivy.file.exists" if="ivy.file.exists"> - <add-jars output.dir="${par.staging.dir}"/> - </target> - - <target name="collect-provided" - description="Collects all the JARs expected to be provided for a PAR file."> - <delete dir="${par.provided.dir}" quiet="true"/> - <mkdir dir="${par.provided.dir}"/> - - <all-bundles target="copy-provided-jars"> - <property name="copy.to.dir" value="${par.provided.bundles.dir}"/> - </all-bundles> - <all-bundles target="copy-provided-libs"> - <property name="copy.to.dir" value="${par.provided.libraries.dir}"/> - </all-bundles> - </target> - -</project> \ No newline at end of file diff --git a/spring-build/par/common.xml b/spring-build/par/common.xml deleted file mode 100644 index c0447e42..00000000 --- a/spring-build/par/common.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="common-par"> - - <import file="../multi-bundle/common.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/par/default.xml b/spring-build/par/default.xml deleted file mode 100644 index 813a7927..00000000 --- a/spring-build/par/default.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="default-par"> - - <import file="common.xml"/> - <import file="artifact.xml"/> - <import file="quality.xml"/> - <import file="package.xml"/> - <import file="publish.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/par/package.xml b/spring-build/par/package.xml deleted file mode 100644 index 580a0e19..00000000 --- a/spring-build/par/package.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="package-par"> - - <import file="common.xml"/> - <import file="../common/package.xml"/> - -<!-- Macros --> - <macrodef name="dist-jar"> - <attribute name="output.dir" default="${package.dist.dir}"/> - <sequential> - <mkdir dir="@{output.dir}"/> - <copy file="${par.output.file}" tofile="@{output.dir}/${package.par.output.file}"/> - </sequential> - </macrodef> - -</project> \ No newline at end of file diff --git a/spring-build/par/publish.xml b/spring-build/par/publish.xml deleted file mode 100644 index da62d96d..00000000 --- a/spring-build/par/publish.xml +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="publish-par" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:maven="antlib:org.apache.maven.artifact.ant"> - - <import file="common.xml"/> - <import file="../common/publish.xml"/> - - <target name="publish-ivy" depends="ivy.init, resolve"> - <delete quiet="true" file="${ivy.output.file}"/> - <mkdir dir="${ivy.output.dir}" /> - - <ivy:publish resolver="${publication.resolver.prefix}-bundle-publish" pubdate="${timestamp}" - status="${release.type}"> - <artifacts pattern="${par.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${source-jar.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${license.dir}/[artifact].[ext]"/> - </ivy:publish> - </target> - - <target name="publish-maven" depends="create.pom, ivy.init, maven.init, resolve" unless="local.build"> - <maven:deploy file="${par.output.file}"> - <remoteRepository url="s3://${publish.bucket}/maven/bundles/${adjusted.release.type}"> - <authentication username="${accessKey}" passphrase="${secretKey}"/> - </remoteRepository> - <pom file="${pom.output.file}"/> - </maven:deploy> - </target> - - <target name="publish-maven-central" depends="maven.init"> - <property name="maven.central.repository" value="s3://maven.springframework.org/${adjusted.release.type}"/> - <maven:deploy file="${par.output.file}"> - <remoteRepository url="${maven.central.repository}"> - <authentication username="${accessKey}" passphrase="${secretKey}"/> - </remoteRepository> - <pom file="${local.pom.output.file}"/> - </maven:deploy> - </target> - - <target name="install-maven" depends="create.pom, snapshot.pom, maven.init"> - <maven:install file="${par.output.file}"> - <pom file="${pom.output.file}"/> - </maven:install> - </target> - - <target name="install-maven-central" depends="maven.init"> - <maven:install file="${par.output.file}"> - <pom file="${local.pom.output.file}"/> - </maven:install> - </target> - -</project> \ No newline at end of file diff --git a/spring-build/par/quality.xml b/spring-build/par/quality.xml deleted file mode 100644 index 88e52ced..00000000 --- a/spring-build/par/quality.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="quality-par"> - - <import file="common.xml"/> - <import file="../multi-bundle/quality.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/resource/artifact.xml b/spring-build/resource/artifact.xml deleted file mode 100644 index 3ed7d817..00000000 --- a/spring-build/resource/artifact.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="artifact-resource" xmlns:ivy="antlib:org.apache.ivy.ant"> - - <import file="common.xml"/> - -<!-- Main targets --> - <target name="javadoc-all" description="Does nothing"/> - - <target name="javadoc-api" description="Does nothing."/> - - <target name="jar" depends="ivy.init, resolve.compile" - description="Creates a libd file with the proper versions substituted."> - <delete quiet="true" file="${ivy.output.file}"/> - <mkdir dir="${ivy.output.dir}"/> - - <copy toDir="${artifacts.dir}"> - <fileset dir="${resource.src.dir}" erroronmissingdir="false"/> - </copy> - - <ivy:publish resolver="integration" pubdate="${timestamp}" status="${release.type}"> - <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${artifacts.dir}/[artifact].[ext]"/> - <artifacts pattern="${license.dir}/[artifact].[ext]"/> - </ivy:publish> - </target> - -<!-- Other targets --> - <target name="javadoc.prep"/> - -</project> diff --git a/spring-build/resource/common.xml b/spring-build/resource/common.xml deleted file mode 100644 index 26a0181b..00000000 --- a/spring-build/resource/common.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="common-resource" xmlns:s="antlib:org.springframework.build"> - - <import file="../common/common.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/resource/default.xml b/spring-build/resource/default.xml deleted file mode 100644 index be89f701..00000000 --- a/spring-build/resource/default.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="default-resource"> - - <import file="common.xml"/> - <import file="artifact.xml"/> - <import file="quality.xml"/> - <import file="package.xml"/> - <import file="publish.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/resource/package.xml b/spring-build/resource/package.xml deleted file mode 100644 index 97197266..00000000 --- a/spring-build/resource/package.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="package-resource"> - - <import file="common.xml"/> - <import file="../common/package.xml"/> - -<!-- Macros --> - <macrodef name="dist-jar"> - <attribute name="output.dir" default="${package.dist.dir}"/> - <sequential> - <mkdir dir="@{output.dir}"/> - <copy todir="@{output.dir}"> - <fileset dir="${resource.src.dir}" /> - </copy> - </sequential> - </macrodef> - - <macrodef name="src-jar"> - <attribute name="output.dir" default="${package.src.dir}"/> - <sequential> - </sequential> - </macrodef> - -</project> \ No newline at end of file diff --git a/spring-build/resource/publish.xml b/spring-build/resource/publish.xml deleted file mode 100644 index 52a3d994..00000000 --- a/spring-build/resource/publish.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="publish-resource" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:maven="antlib:org.apache.maven.artifact.ant"> - - <import file="common.xml"/> - <import file="../common/publish.xml"/> - - <target name="publish-ivy" depends="ivy.init, resolve"> - <delete quiet="true" file="${ivy.output.file}"/> - <mkdir dir="${ivy.output.dir}" /> - - <ivy:publish resolver="${publication.resolver.prefix}-library-publish" pubdate="${timestamp}" - status="${release.type}"> - <artifacts pattern="${artifacts.dir}/[artifact].[ext]"/> - <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${license.dir}/[artifact].[ext]"/> - </ivy:publish> - </target> - - <target name="publish-maven" depends="create.pom, ivy.init, maven.init, resolve" unless="local.build"> - <maven:deploy> - <remoteRepository url="s3://${publish.bucket}/maven/libraries/${adjusted.release.type}"> - <authentication username="${accessKey}" passphrase="${secretKey}"/> - </remoteRepository> - <pom file="${pom.output.file}"/> - </maven:deploy> - </target> - - <target name="publish-maven-central" depends="maven.init"> - <property name="maven.central.repository" value="s3://maven.springframework.org/${adjusted.release.type}"/> - <maven:deploy> - <remoteRepository url="${maven.central.repository}"> - <authentication username="${accessKey}" passphrase="${secretKey}"/> - </remoteRepository> - <pom file="${local.pom.output.file}"/> - </maven:deploy> - </target> - - <target name="install-maven" depends="create.pom, snapshot.pom, maven.init"> - <maven:install> - <pom file="${pom.output.file}"/> - </maven:install> - </target> - - <target name="install-maven-central" depends="maven.init"> - <maven:install> - <pom file="${local.pom.output.file}"/> - </maven:install> - </target> - - <target name="create.pom" depends="ivy.init, resolve"> - <delete quiet="true" file="${pom.output.file}"/> - <mkdir dir="${pom.output.dir}"/> - - <ivy:makepom ivyfile="${ivy.output.file}" pomfile="${pom.output.file}"> - <mapping conf="compile" scope="compile"/> - <mapping conf="provided" scope="provided"/> - <mapping conf="dm-server-provided" scope="provided"/> - <mapping conf="runtime" scope="runtime"/> - <mapping conf="test" scope="test"/> - </ivy:makepom> - - <replaceregexp match="<packaging>jar</packaging>" - replace="<packaging>pom</packaging>" - file="${pom.output.file}"/> - </target> - -</project> \ No newline at end of file diff --git a/spring-build/resource/quality.xml b/spring-build/resource/quality.xml deleted file mode 100644 index 291d89c1..00000000 --- a/spring-build/resource/quality.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="quality-resource"> - -<!-- Main targets --> - <target name="test" description="Does nothing."/> - - <target name="clover" description="Does nothing."/> - - <target name="findbugs" description="Does nothing."/> - - <target name="osgi-validate" description="Does nothing."/> - -<!-- Other targets --> - <target name="test.do" description="Does nothing."/> - - <target name="clover.do" description="Does nothing."/> - - <target name="findbugs.do" description="Does nothing."/> - -</project> \ No newline at end of file diff --git a/spring-build/standard/artifact.xml b/spring-build/standard/artifact.xml deleted file mode 100644 index 5d6de512..00000000 --- a/spring-build/standard/artifact.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="artifact-standard" xmlns:ivy="antlib:org.apache.ivy.ant"> - - <import file="common.xml"/> - <import file="../common/artifact.xml"/> - - -<!-- Other targets --> - <target name="compile.init" depends="ivy.init"> - <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath" - organisation="org.springframework.build" module="org.springframework.build.ant" - revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true" - log="download-only"/> - <ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt" - module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}" - conf="runtime" type="jar" inline="true" log="download-only"/> - <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build"> - <classpath> - <path refid="spring.ant.classpath"/> - <path refid="ecj.classpath"/> - </classpath> - </taskdef> - </target> - -</project> \ No newline at end of file diff --git a/spring-build/standard/common.xml b/spring-build/standard/common.xml deleted file mode 100644 index 44d9fdb3..00000000 --- a/spring-build/standard/common.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="common-standard" xmlns:s="antlib:org.springframework.build"> - - <import file="../common/common.xml"/> - -<!-- Macros --> - <macrodef name="do-compile"> - <attribute name="classpath.id"/> - <attribute name="input.dir"/> - <attribute name="output.dir"/> - <attribute name="resources.dir"/> - <sequential> - <s:javac destdir="@{output.dir}" source="${source.version}" target="${target.version}" - debug="${compile.debug}" debugLevel="${compile.debug.level}"> - <compilerarg line="${compiler.args}"/> - <src path="@{input.dir}"/> - <include name="**/*.java"/> - <include name="*.java"/> - <classpath refid="@{classpath.id}"/> - </s:javac> - <copy todir="@{output.dir}"> - <fileset dir="@{input.dir}" erroronmissingdir="false"> - <exclude name="**/*.java"/> - <exclude name="*.java"/> - </fileset> - </copy> - <copy todir="@{output.dir}"> - <fileset dir="@{resources.dir}" erroronmissingdir="false"/> - </copy> - </sequential> - </macrodef> - -</project> \ No newline at end of file diff --git a/spring-build/standard/default.xml b/spring-build/standard/default.xml deleted file mode 100644 index b93cc846..00000000 --- a/spring-build/standard/default.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="default-standard"> - - <import file="common.xml"/> - <import file="artifact.xml"/> - <import file="quality.xml"/> - <import file="package.xml"/> - <import file="publish.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/standard/package.xml b/spring-build/standard/package.xml deleted file mode 100644 index 1fc8ed40..00000000 --- a/spring-build/standard/package.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="package-standard"> - - <import file="common.xml"/> - <import file="../common/package.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/standard/publish.xml b/spring-build/standard/publish.xml deleted file mode 100644 index 3fae574a..00000000 --- a/spring-build/standard/publish.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="publish-standard"> - - <import file="common.xml"/> - <import file="../common/publish.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/standard/quality.xml b/spring-build/standard/quality.xml deleted file mode 100644 index b84c71c9..00000000 --- a/spring-build/standard/quality.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="quality-standard"> - - <import file="common.xml"/> - <import file="../common/quality.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/war/artifact.xml b/spring-build/war/artifact.xml deleted file mode 100644 index 8d65ee45..00000000 --- a/spring-build/war/artifact.xml +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="artifact-war" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:bundlor="antlib:com.springsource.bundlor.ant"> - - <import file="common.xml"/> - <import file="../common/artifact.xml"/> - -<!-- Main targets --> - <target name="jar" depends="ivy.init, resolve.compile, compile.init, jar.init" - description="Creates a WAR file containing the output of a compilation of the source tree."> - <delete quiet="true" file="${ivy.output.file}"/> - <mkdir dir="${ivy.output.dir}"/> - <delete quiet="true" file="${war.output.file}"/> - <mkdir dir="${war.output.dir}"/> - <delete quiet="true" file="${source-jar.output.file}"/> - <mkdir dir="${source-jar.output.dir}"/> - - <copy todir="${war.staging.dir}"> - <fileset dir="${main.webapp.dir}" erroronmissingdir="false"/> - </copy> - - <compile classpath.id="compile.classpath" input.dir="${main.java.dir}" output.dir="${war.classes.dir}" - resources.dir="${main.resources.dir}"/> - <ivy:retrieve resolveId="compile.classpath" conf="compile,runtime" type="jar" - pattern="${war.lib.dir}/[artifact]-[revision].[ext]" log="download-only"/> - <antcall target="bundlor"/> - <jar destfile="${war.output.file}" basedir="${war.staging.dir}" index="true" filesetmanifest="merge"> - <manifest> - <attribute name="Bundle-Creator" value="${user.name}"/> - <attribute name="Implementation-Title" value="${implementation.title}"/> - <attribute name="Implementation-Version" value="${implementation.version}"/> - </manifest> - </jar> - <jar destfile="${source-jar.output.file}" basedir="${main.java.dir}" index="true"/> - <ivy:publish resolver="integration" pubdate="${timestamp}" status="${release.type}"> - <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${war.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${source-jar.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${license.dir}/[artifact].[ext]"/> - </ivy:publish> - </target> - -<!-- Other targets --> - <target name="compile.init" depends="ivy.init"> - <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath" - organisation="org.springframework.build" module="org.springframework.build.ant" - revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true" - log="download-only"/> - <ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt" - module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}" - conf="runtime" type="jar" inline="true" log="download-only"/> - <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build"> - <classpath> - <path refid="spring.ant.classpath"/> - <path refid="ecj.classpath"/> - </classpath> - </taskdef> - </target> - - <target name="bundlor" depends="bundlor.init" unless="disable.bundlor"> - <bundlor:bundlor inputPath="${war.staging.dir}" outputPath="${war.staging.dir}" - bundleVersion="${bundle.version}" manifestTemplatePath="${manifest.template.file}" - failOnWarnings="${fail.on.warnings}"> - <propertyset refid="bundlor.properties"/> - <propertyset> - <propertyref builtin="all"/> - </propertyset> - </bundlor:bundlor> - </target> - -</project> \ No newline at end of file diff --git a/spring-build/war/common.xml b/spring-build/war/common.xml deleted file mode 100644 index dbe930ba..00000000 --- a/spring-build/war/common.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="common-war" xmlns:s="antlib:org.springframework.build"> - - <import file="../common/common.xml"/> - -<!-- Macros --> - <macrodef name="do-compile"> - <attribute name="classpath.id"/> - <attribute name="input.dir"/> - <attribute name="output.dir"/> - <attribute name="resources.dir"/> - <sequential> - <s:javac destdir="@{output.dir}" source="${source.version}" target="${target.version}" - debug="${compile.debug}" debugLevel="${compile.debug.level}"> - <compilerarg line="${compiler.args}"/> - <src path="@{input.dir}"/> - <include name="**/*.java"/> - <include name="*.java"/> - <classpath refid="@{classpath.id}"/> - </s:javac> - <copy todir="@{output.dir}"> - <fileset dir="@{input.dir}" erroronmissingdir="false"> - <exclude name="**/*.java"/> - <exclude name="*.java"/> - </fileset> - </copy> - <copy todir="@{output.dir}"> - <fileset dir="@{resources.dir}" erroronmissingdir="false"/> - </copy> - </sequential> - </macrodef> - -</project> \ No newline at end of file diff --git a/spring-build/war/default.xml b/spring-build/war/default.xml deleted file mode 100644 index 8f0965f5..00000000 --- a/spring-build/war/default.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="default-war"> - - <import file="common.xml"/> - <import file="artifact.xml"/> - <import file="quality.xml"/> - <import file="package.xml"/> - <import file="publish.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/war/package.xml b/spring-build/war/package.xml deleted file mode 100644 index 05ea4813..00000000 --- a/spring-build/war/package.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="package-war"> - - <import file="common.xml"/> - <import file="../common/package.xml"/> - -<!-- Macros --> - <macrodef name="dist-jar"> - <attribute name="output.dir" default="${package.dist.dir}"/> - <sequential> - <mkdir dir="@{output.dir}"/> - <copy file="${war.output.file}" tofile="@{output.dir}/${package.war.output.file}"/> - </sequential> - </macrodef> - -</project> \ No newline at end of file diff --git a/spring-build/war/publish.xml b/spring-build/war/publish.xml deleted file mode 100644 index 0d238623..00000000 --- a/spring-build/war/publish.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="publish-war" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:maven="antlib:org.apache.maven.artifact.ant"> - - <import file="common.xml"/> - <import file="../common/publish.xml"/> - - <target name="publish-ivy" depends="ivy.init, resolve"> - <delete quiet="true" file="${ivy.output.file}"/> - <mkdir dir="${ivy.output.dir}" /> - - <ivy:publish resolver="${publication.resolver.prefix}-bundle-publish" pubdate="${timestamp}" - status="${release.type}"> - <artifacts pattern="${war.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${source-jar.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${license.dir}/[artifact].[ext]"/> - </ivy:publish> - </target> - - <target name="publish-maven" depends="create.pom, snapshot.pom, maven.init" unless="local.build"> - <maven:deploy file="${war.output.file}"> - <remoteRepository url="s3://${publish.bucket}/maven/bundles/${adjusted.release.type}"> - <authentication username="${accessKey}" passphrase="${secretKey}"/> - </remoteRepository> - <pom file="${pom.output.file}"/> - <attach file="${source-jar.output.file}" classifier="sources"/> - </maven:deploy> - </target> - - <target name="publish-maven-central" depends="maven.init"> - <property name="maven.central.repository" value="s3://maven.springframework.org/${adjusted.release.type}"/> - <maven:deploy file="${war.output.file}"> - <remoteRepository url="${maven.central.repository}"> - <authentication username="${accessKey}" passphrase="${secretKey}"/> - </remoteRepository> - <pom file="${local.pom.output.file}"/> - <attach file="${source-jar.output.file}" classifier="sources"/> - </maven:deploy> - </target> - - <target name="install-maven" depends="create.pom, snapshot.pom, maven.init"> - <maven:install file="${war.output.file}"> - <pom file="${pom.output.file}"/> - <attach file="${source-jar.output.file}" classifier="sources"/> - </maven:install> - </target> - - <target name="install-maven-central" depends="maven.init"> - <maven:install file="${war.output.file}"> - <pom file="${local.pom.output.file}"/> - <attach file="${source-jar.output.file}" classifier="sources"/> - </maven:install> - </target> - -</project> \ No newline at end of file diff --git a/spring-build/war/quality.xml b/spring-build/war/quality.xml deleted file mode 100644 index 7c673b22..00000000 --- a/spring-build/war/quality.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="quality-war" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:osgi="antlib:org.springframework.build.osgi"> - - <import file="common.xml"/> - <import file="../common/quality.xml"/> - - <target name="osgi-validate" depends="ivy.init, osgi.init" - description="Validates that a bundle can resolve against it's dependencies."> - <ivy:cachepath resolveId="osgi.optional.classpath" pathid="osgi.optional.classpath" - conf="compile,optional,provided,dm-server-provided" type="jar" log="download-only"/> - <osgi:validate bundlePath="${war.output.file}"> - <equinoxPath refid="equinox.classpath"/> - <supportingBundlesPath refid="osgi.optional.classpath"/> - </osgi:validate> - - <ivy:cachepath resolveId="osgi.compile.classpath" pathid="osgi.compile.classpath" - conf="compile,provided,dm-server-provided" type="jar" log="download-only"/> - <osgi:validate bundlePath="${war.output.file}"> - <equinoxPath refid="equinox.classpath"/> - <supportingBundlesPath refid="osgi.compile.classpath"/> - </osgi:validate> - </target> - -<!-- Other targets --> - <target name="test.do" depends="ivy.init, resolve.test, compile.init, test.init" if="test.exists"> - <path id="test.compile.classpath"> - <pathelement location="${war.classes.dir}"/> - <path refid="compile.classpath"/> - <path refid="test.classpath"/> - </path> - <test-compile classpath.id="test.compile.classpath" input.dir="${test.java.dir}" output.dir="${test.output.dir}" - resources.dir="${test.resources.dir}"/> - - <path id="test.run.classpath"> - <pathelement location="${war.classes.dir}"/> - <pathelement location="${test.output.dir}"/> - <path refid="compile.classpath"/> - <path refid="test.classpath"/> - <path refid="runtime.classpath"/> - </path> - <test-run classpath.id="test.run.classpath"/> - </target> - - <target name="findbugs.do" depends="ivy.init, resolve.compile, compile.init, findbugs.init, src.init" if="src.exists"> - <findbugs home="${findbugs.dir}" output="xml" outputFile="${findbugs.output.file}" - excludeFilter="${findbugs.exclude.file}" jvmargs="-Xmx1024M" errorProperty="findbugs.errors" warningsProperty="findbugs.warnings"> - <class location="${war.classes.dir}"/> - <auxClasspath refid="compile.classpath"/> - <sourcepath location="${main.java.dir}"/> - </findbugs> - <antcall target="findbugs.post"/> - </target> - - <target name="findbugs.post" if="findbugs.enforce"> - <fail if="findbugs.errors" message="FindBugs errors found"/> - <fail if="findbugs.warnings" message="FindBugs warnings found"/> - </target> - -</project> \ No newline at end of file diff --git a/spring-build/weaving-external/artifact.xml b/spring-build/weaving-external/artifact.xml deleted file mode 100644 index f0511cf9..00000000 --- a/spring-build/weaving-external/artifact.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="artifact-weaving-external" xmlns:ivy="antlib:org.apache.ivy.ant" - xmlns:bundlor="antlib:com.springsource.bundlor.ant"> - - <import file="common.xml"/> - <import file="../common/artifact.xml"/> - - <target name="javadoc-all" - description="Creates javadoc documentation for all classes."/> - - <target name="jar" depends="ivy.init, resolve.compile, resolve.aspects, resolve.external, compile.init, jar.init" - description="Creates a JAR file containing the output of a compilation of the source tree."> - <delete quiet="true" file="${ivy.output.file}"/> - <mkdir dir="${ivy.output.dir}"/> - <delete quiet="true" file="${jar.output.file}"/> - <mkdir dir="${jar.output.dir}"/> - <delete quiet="true" file="${source-jar.output.file}"/> - <mkdir dir="${source-jar.output.dir}"/> - - <iajc inPathRef="external.classpath" aspectPathRef="aspects.classpath" classpathRef="compile.classpath" - outJar="${jar.output.file}" source="${source.version}" checkRuntimeVersion="false" X="${aspectj.x}"/> - <antcall target="bundlor"/> - <copy tofile="${source-jar.output.file}"> - <path refid="external.srcpath"/> - <flattenmapper/> - </copy> - <ivy:publish resolver="integration" pubdate="${timestamp}" status="${release.type}" overwrite="true"> - <artifacts pattern="${ivy.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${jar.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${source-jar.output.dir}/[artifact].[ext]"/> - <artifacts pattern="${license.dir}/[artifact].[ext]"/> - </ivy:publish> - </target> - -<!-- Other targets --> - <target name="compile.init" depends="ivy.init"> - <ivy:cachepath resolveId="ajc.classpath" pathid="ajc.classpath" organisation="org.aspectj" - module="com.springsource.org.aspectj.tools" revision="${org.aspectj.tools.version}" conf="runtime" - type="jar" inline="true" log="download-only"/> - <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpathref="ajc.classpath"/> - - <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath" - organisation="org.springframework.build" module="org.springframework.build.ant" - revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true" - log="download-only"/> - <ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt" - module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}" - conf="runtime" type="jar" inline="true" log="download-only"/> - <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build"> - <classpath> - <path refid="spring.ant.classpath"/> - <path refid="ecj.classpath"/> - </classpath> - </taskdef> - </target> - - <target name="bundlor" depends="bundlor.init" unless="disable.bundlor"> - <bundlor:bundlor inputPath="${jar.output.file}" outputPath="${jar.output.file}" - bundleVersion="${bundle.version}" manifestTemplatePath="${manifest.template.file}" - failOnWarnings="${fail.on.warnings}"> - <propertyset refid="bundlor.properties"/> - <propertyset> - <propertyref builtin="all"/> - </propertyset> - </bundlor:bundlor> - </target> - -</project> \ No newline at end of file diff --git a/spring-build/weaving-external/common.xml b/spring-build/weaving-external/common.xml deleted file mode 100644 index ada91806..00000000 --- a/spring-build/weaving-external/common.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="common-weaving-external" xmlns:s="antlib:org.springframework.build"> - - <import file="../common/common.xml"/> - -<!-- Macros --> - <macrodef name="do-compile"> - <attribute name="classpath.id"/> - <attribute name="input.dir"/> - <attribute name="output.dir"/> - <attribute name="resources.dir"/> - <sequential> - <s:javac destdir="@{output.dir}" source="${source.version}" target="${target.version}" - debug="${compile.debug}" debugLevel="${compile.debug.level}"> - <compilerarg line="${compiler.args}"/> - <src path="@{input.dir}"/> - <include name="**/*.java"/> - <include name="*.java"/> - <classpath refid="@{classpath.id}"/> - </s:javac> - <copy todir="@{output.dir}"> - <fileset dir="@{input.dir}" erroronmissingdir="false"> - <exclude name="**/*.java"/> - <exclude name="*.java"/> - </fileset> - </copy> - <copy todir="@{output.dir}"> - <fileset dir="@{resources.dir}" erroronmissingdir="false"/> - </copy> - </sequential> - </macrodef> - -</project> \ No newline at end of file diff --git a/spring-build/weaving-external/default.xml b/spring-build/weaving-external/default.xml deleted file mode 100644 index 3b88f098..00000000 --- a/spring-build/weaving-external/default.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="default-weaving-external"> - - <import file="common.xml"/> - <import file="artifact.xml"/> - <import file="quality.xml"/> - <import file="package.xml"/> - <import file="publish.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/weaving-external/package.xml b/spring-build/weaving-external/package.xml deleted file mode 100644 index 09009d69..00000000 --- a/spring-build/weaving-external/package.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="package-weaving-external"> - - <import file="common.xml"/> - <import file="../common/package.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/weaving-external/publish.xml b/spring-build/weaving-external/publish.xml deleted file mode 100644 index fd58c241..00000000 --- a/spring-build/weaving-external/publish.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="publish-weaving-external"> - - <import file="common.xml"/> - <import file="../common/publish.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/weaving-external/quality.xml b/spring-build/weaving-external/quality.xml deleted file mode 100644 index 2b5a0261..00000000 --- a/spring-build/weaving-external/quality.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="quality-weaving-external" xmlns:ivy="antlib:org.apache.ivy.ant"> - - <import file="common.xml"/> - <import file="../common/quality.xml"/> - -<!-- Other targets --> - <target name="test.do" depends="ivy.init, resolve.test, compile.init, test.init" if="test.exists"> - <path id="test.compile.classpath"> - <pathelement location="${jar.output.file}"/> - <path refid="test.classpath"/> - </path> - <test-compile classpath.id="test.compile.classpath" input.dir="${test.java.dir}" output.dir="${test.output.dir}" - resources.dir="${test.resources.dir}"/> - - <path id="test.run.classpath"> - <pathelement location="${jar.output.file}"/> - <pathelement location="${test.output.dir}"/> - <path refid="test.classpath"/> - <path refid="runtime.classpath"/> - </path> - <test-run classpath.id="test.run.classpath"/> - </target> - - <target name="clover.do" depends="ivy.init, resolve.test, compile.init, clover.init, clover.instrument, test.init" - if="test.exists"> - <path id="clover.run.classpath"> - <pathelement location="${jar.output.file}"/> - <pathelement location="${test.output.dir}"/> - <path refid="clover.classpath"/> - <path refid="test.classpath"/> - <path refid="runtime.classpath"/> - </path> - <test-run classpath.id="clover.run.classpath"/> - </target> - - <target name="clover.instrument" depends="ivy.init, resolve.test, compile.init, clover.init"> - <instrument input.dir="${test.java.dir}" output.dir="${test.clover.dir}"/> - <path id="test.compile.classpath"> - <pathelement location="${main.output.dir}"/> - <path refid="test.classpath"/> - <path refid="clover.classpath"/> - </path> - <test-compile classpath.id="test.compile.classpath" input.dir="${test.clover.dir}" output.dir="${test.output.dir}" - resources.dir="${test.resources.dir}"/> - <delete dir="${clover.staging.dir}" quiet="true"/> - </target> -</project> \ No newline at end of file diff --git a/spring-build/weaving/artifact.xml b/spring-build/weaving/artifact.xml deleted file mode 100644 index 478fe06c..00000000 --- a/spring-build/weaving/artifact.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="artifact-weaving" xmlns:ivy="antlib:org.apache.ivy.ant" - xmlns:bundlor="antlib:com.springsource.bundlor.ant"> - - <import file="common.xml"/> - <import file="../common/artifact.xml"/> - - <target name="jar" depends="ivy.init, resolve.aspects, artifact-common.jar" - description="Creates a JAR file containing the output of a compilation of the source tree."/> - -<!-- Other targets --> - <target name="compile.init" depends="ivy.init"> - <ivy:cachepath resolveId="ajc.classpath" pathid="ajc.classpath" organisation="org.aspectj" - module="com.springsource.org.aspectj.tools" revision="${org.aspectj.tools.version}" conf="runtime" - type="jar" inline="true" log="download-only"/> - <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpathref="ajc.classpath"/> - - <ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath" - organisation="org.springframework.build" module="org.springframework.build.ant" - revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true" - log="download-only"/> - <ivy:cachepath resolveId="ecj.classpath" pathid="ecj.classpath" organisation="org.eclipse.jdt" - module="com.springsource.org.eclipse.jdt.core.compiler.batch" revision="${org.eclipse.jdt.core.compiler.batch.version}" - conf="runtime" type="jar" inline="true" log="download-only"/> - <taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build"> - <classpath> - <path refid="spring.ant.classpath"/> - <path refid="ecj.classpath"/> - </classpath> - </taskdef> - </target> - - <target name="bundlor" depends="bundlor.init" unless="disable.bundlor"> - <bundlor:bundlor inputPath="${main.output.dir}" outputPath="${main.output.dir}" - bundleVersion="${bundle.version}" manifestTemplatePath="${manifest.template.file}" - failOnWarnings="${fail.on.warnings}"> - <propertyset refid="bundlor.properties"/> - <propertyset> - <propertyref builtin="all"/> - </propertyset> - </bundlor:bundlor> - </target> - -</project> \ No newline at end of file diff --git a/spring-build/weaving/common.xml b/spring-build/weaving/common.xml deleted file mode 100644 index 9d277677..00000000 --- a/spring-build/weaving/common.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="common-weaving" xmlns:s="antlib:org.springframework.build"> - - <import file="../common/common.xml"/> - -<!-- Macros --> - <macrodef name="do-compile"> - <attribute name="classpath.id"/> - <attribute name="input.dir"/> - <attribute name="output.dir"/> - <attribute name="resources.dir"/> - <sequential> - <s:javac destdir="@{output.dir}" source="${source.version}" target="${target.version}" - debug="${compile.debug}" debugLevel="${compile.debug.level}"> - <compilerarg line="${compiler.args}"/> - <src path="@{input.dir}"/> - <include name="**/*.java"/> - <include name="*.java"/> - <classpath refid="@{classpath.id}"/> - </s:javac> - <copy todir="@{output.dir}"> - <fileset dir="@{input.dir}" erroronmissingdir="false"> - <exclude name="**/*.java"/> - <exclude name="*.java"/> - </fileset> - </copy> - <copy todir="@{output.dir}"> - <fileset dir="@{resources.dir}" erroronmissingdir="false"/> - </copy> - <iajc inPath="${main.output.dir}" aspectPathRef="aspects.classpath" classpathRef="compile.classpath" - destDir="${main.output.dir}" source="${source.version}" checkRuntimeVersion="false" X="${aspectj.x}"/> - </sequential> - </macrodef> - -</project> \ No newline at end of file diff --git a/spring-build/weaving/default.xml b/spring-build/weaving/default.xml deleted file mode 100644 index c4dc8ed9..00000000 --- a/spring-build/weaving/default.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="default-weaving"> - - <import file="common.xml"/> - <import file="artifact.xml"/> - <import file="quality.xml"/> - <import file="package.xml"/> - <import file="publish.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/weaving/package.xml b/spring-build/weaving/package.xml deleted file mode 100644 index 764a5f14..00000000 --- a/spring-build/weaving/package.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="package-weaving"> - - <import file="common.xml"/> - <import file="../common/package.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/weaving/publish.xml b/spring-build/weaving/publish.xml deleted file mode 100644 index 42f3bd05..00000000 --- a/spring-build/weaving/publish.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="publish-weaving"> - - <import file="common.xml"/> - <import file="../common/publish.xml"/> - -</project> \ No newline at end of file diff --git a/spring-build/weaving/quality.xml b/spring-build/weaving/quality.xml deleted file mode 100644 index 20cae52b..00000000 --- a/spring-build/weaving/quality.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2010 SpringSource - - 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. ---> -<project name="quality-weaving" xmlns:ivy="antlib:org.apache.ivy.ant"> - - <import file="common.xml"/> - <import file="../common/quality.xml"/> - - <target name="clover.instrument" depends="ivy.init, resolve.aspects, quality-common.clover.instrument" - description="Creates a JAR file containing the output of a compilation of the source tree."/> - - <target name="test.do" depends="ivy.init, resolve.test, resolve.aspects, compile.init, test.init" if="test.exists"> - <path id="test.compile.classpath"> - <pathelement location="${jar.output.file}"/> - <path refid="compile.classpath"/> - <path refid="test.classpath"/> - </path> - <test-compile classpath.id="test.compile.classpath" input.dir="${test.java.dir}" output.dir="${test.output.dir}" - resources.dir="${test.resources.dir}"/> - - <path id="test.run.classpath"> - <pathelement location="${jar.output.file}"/> - <pathelement location="${test.output.dir}"/> - <path refid="compile.classpath"/> - <path refid="test.classpath"/> - <path refid="runtime.classpath"/> - <path refid="aspects.classpath"/> - </path> - <test-run classpath.id="test.run.classpath"/> - </target> - -</project> \ No newline at end of file diff --git a/spring-faces/.classpath b/spring-faces/.classpath deleted file mode 100644 index 38aad0e8..00000000 --- a/spring-faces/.classpath +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/main/resources" including="META-INF/spring.*" excluding="**/*.java"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.0/el-api-1.0.jar" sourcepath="M2_REPO/javax/el/el-api/1.0/el-api-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/portlet/portlet-api/2.0/portlet-api-2.0.jar" sourcepath="M2_REPO/javax/portlet/portlet-api/2.0/portlet-api-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"> - <attributes> - <attribute value="jar:file:/home/rossen/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" name="javadoc_location"/> - </attributes> - </classpathentry> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.2.1.RELEASE/spring-beans-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-beans/3.2.1.RELEASE/spring-beans-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.2.1.RELEASE/spring-core-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-core/3.2.1.RELEASE/spring-core-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.2.1.RELEASE/spring-context-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context/3.2.1.RELEASE/spring-context-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.2.1.RELEASE/spring-aop-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-aop/3.2.1.RELEASE/spring-aop-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.2.1.RELEASE/spring-expression-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-expression/3.2.1.RELEASE/spring-expression-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.2.1.RELEASE/spring-web-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-web/3.2.1.RELEASE/spring-web-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/3.2.1.RELEASE/spring-webmvc-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-webmvc/3.2.1.RELEASE/spring-webmvc-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc-portlet/3.2.1.RELEASE/spring-webmvc-portlet-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-webmvc-portlet/3.2.1.RELEASE/spring-webmvc-portlet-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="src" path="/spring-binding"/> - <classpathentry kind="src" path="/spring-js"/> - <classpathentry kind="src" path="/spring-js-resources"/> - <classpathentry kind="src" path="/spring-webflow"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/security/spring-security-core/3.1.3.RELEASE/spring-security-core-3.1.3.RELEASE.jar" sourcepath="M2_REPO/org/springframework/security/spring-security-core/3.1.3.RELEASE/spring-security-core-3.1.3.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/security/spring-security-web/3.1.3.RELEASE/spring-security-web-3.1.3.RELEASE.jar" sourcepath="M2_REPO/org/springframework/security/spring-security-web/3.1.3.RELEASE/spring-security-web-3.1.3.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-jdbc/3.0.7.RELEASE/spring-jdbc-3.0.7.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-jdbc/3.0.7.RELEASE/spring-jdbc-3.0.7.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/3.0.7.RELEASE/spring-tx-3.0.7.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-tx/3.0.7.RELEASE/spring-tx-3.0.7.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/richfaces/framework/richfaces-api/3.1.4.GA/richfaces-api-3.1.4.GA.jar" sourcepath="M2_REPO/org/richfaces/framework/richfaces-api/3.1.4.GA/richfaces-api-3.1.4.GA-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/sun/faces/jsf-api/2.1.7/jsf-api-2.1.7.jar" sourcepath="M2_REPO/com/sun/faces/jsf-api/2.1.7/jsf-api-2.1.7-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/sun/faces/jsf-impl/2.1.7/jsf-impl-2.1.7.jar" sourcepath="M2_REPO/com/sun/faces/jsf-impl/2.1.7/jsf-impl-2.1.7-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.jar" sourcepath="M2_REPO/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.5.2/easymock-2.5.2.jar" sourcepath="M2_REPO/org/easymock/easymock/2.5.2/easymock-2.5.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.2.1.RELEASE/spring-test-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-test/3.2.1.RELEASE/spring-test-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/el/jboss-el/2.0.1.GA/jboss-el-2.0.1.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/myfaces/test/myfaces-test20/1.0.0-beta/myfaces-test20-1.0.0-beta.jar" sourcepath="M2_REPO/org/apache/myfaces/test/myfaces-test20/1.0.0-beta/myfaces-test20-1.0.0-beta-sources.jar"/> -</classpath> diff --git a/spring-faces/.project b/spring-faces/.project deleted file mode 100644 index c9a73088..00000000 --- a/spring-faces/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>spring-faces</name> - <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> - <projects> - <project>spring-binding</project> - <project>spring-js</project> - <project>spring-js-resources</project> - <project>spring-webflow</project> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.common.project.facet.core.builder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> - </natures> -</projectDescription> \ No newline at end of file diff --git a/spring-faces/.settings/org.eclipse.jdt.core.prefs b/spring-faces/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ae652523..00000000 --- a/spring-faces/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,336 +0,0 @@ -#Fri May 14 17:56:46 BST 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes= -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=120 -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=8 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/spring-faces/.settings/org.eclipse.jdt.ui.prefs b/spring-faces/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 77e40833..00000000 --- a/spring-faces/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,58 +0,0 @@ -#Tue Sep 25 14:14:24 EDT 2007 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_Spring Java Conventions -formatter_settings_version=11 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=false -org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright 2004-2007 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\nthrow new UnsupportedOperationException("Auto-generated method stub");</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.format_source_code=true -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/spring-faces/.settings/org.eclipse.wst.validation.prefs b/spring-faces/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 68bb37d5..00000000 --- a/spring-faces/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Fri May 05 18:13:37 EDT 2006 -DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator; -USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator; -USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator; -USER_PREFERENCE=overrideGlobalPreferencesfalse -eclipse.preferences.version=1 diff --git a/spring-faces/build.xml b/spring-faces/build.xml deleted file mode 100644 index 14c93d5d..00000000 --- a/spring-faces/build.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="org.springframework.faces"> - - <property file="${basedir}/../build.properties"/> - <import file="${basedir}/../build-spring-webflow/package-bundle.xml"/> - <import file="${basedir}/../build-spring-webflow/publish-artifact.xml"/> - <import file="${basedir}/../spring-build/standard/default.xml"/> - -</project> \ No newline at end of file diff --git a/spring-faces/ivy.xml b/spring-faces/ivy.xml deleted file mode 100644 index f37f7c15..00000000 --- a/spring-faces/ivy.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> -<ivy-module - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" - version="1.3"> - - <info organisation="org.springframework.webflow" module="${ant.project.name}"> - <license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/> - </info> - - <configurations> - <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/> - <conf name="mojarra21" visibility="public"/> - <conf name="mojarra20" visibility="public"/> - <conf name="myfaces20" visibility="public"/> - <conf name="mojarra12" visibility="public"/> - <conf name="myfaces12" visibility="public"/> - <conf name="jsf11" visibility="public"/> - </configurations> - - <publications> - <artifact name="${ant.project.name}"/> - <artifact name="${ant.project.name}-sources" type="src" ext="jar"/> - </publications> - - <dependencies> - <!-- core dependencies --> - <dependency org="com.sun.facelets" name="com.springsource.com.sun.facelets" rev="1.1.14" conf="optional->runtime" /> - <dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="provided->runtime" /> - <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->runtime" /> - <dependency org="javax.portlet" name="com.springsource.javax.portlet" rev="2.0.0" conf="provided->runtime" /> - <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime"/> - <dependency org="org.richfaces" name="com.springsource.org.richfaces" rev="3.1.4.GA" conf="optional->runtime" /> - <dependency org="org.springframework" name="org.springframework.beans" rev="3.2.1.RELEASE" conf="compile->runtime"/> - <dependency org="org.springframework" name="org.springframework.context" rev="3.2.1.RELEASE" conf="compile->runtime"/> - <dependency org="org.springframework" name="org.springframework.core" rev="3.2.1.RELEASE" conf="compile->runtime"/> - <dependency org="org.springframework" name="org.springframework.expression" rev="3.2.1.RELEASE" conf="compile->runtime" /> - <dependency org="org.springframework" name="org.springframework.web" rev="3.2.1.RELEASE" conf="compile->runtime"/> - <dependency org="org.springframework" name="org.springframework.web.portlet" rev="3.2.1.RELEASE" conf="optional->runtime" /> - <dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.2.1.RELEASE" conf="compile->runtime"/> - <dependency org="org.springframework.security" name="org.springframework.security.core" rev="3.1.3.RELEASE" conf="optional->runtime" /> - <dependency org="org.springframework.security" name="org.springframework.security.web" rev="3.1.3.RELEASE" conf="optional->runtime" /> - <dependency org="org.springframework.webflow" name="org.springframework.binding" rev="latest.integration" conf="compile->runtime"/> - <dependency org="org.springframework.webflow" name="org.springframework.js" rev="latest.integration" conf="compile->runtime"/> - <dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="compile->runtime"/> - - <!-- JSF 2.1 Mojarra dependencies --> - <dependency org="com.sun.faces" name="jsf-api" rev="2.1.7" conf="provided, mojarra21->default" /> - <dependency org="com.sun.faces" name="jsf-impl" rev="2.1.7" conf="provided, mojarra21->default" /> - - <!-- JSF 2.0 Mojarra dependencies --> - <dependency org="com.sun.faces" name="jsf-api" rev="2.0.6" conf="provided, mojarra20->default" /> - <dependency org="com.sun.faces" name="jsf-impl" rev="2.0.6" conf="provided, mojarra20->default" /> - - <!-- JSF 2.0 MyFaces dependencies --> - <dependency org="org.apache.myfaces.core" name="myfaces-api" rev="2.0.1-SNAPSHOT" conf="myfaces20->default" /> - <dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="2.0.1-SNAPSHOT" conf="myfaces20->default" /> - - <!-- JSF 1.2 Mojarra dependencies --> - <dependency org="javax.faces" name="com.springsource.javax.faces" rev="1.2.0.09" conf="mojarra12->runtime" /> - <dependency org="com.sun.faces" name="com.springsource.com.sun.faces" rev="1.2.0.09" conf="mojarra12->runtime" /> - - <!-- JSF 1.2 MyFaces dependencies --> - <dependency org="org.apache.myfaces.core" name="myfaces-api" rev="1.2.9" conf="myfaces12->default" /> - <dependency org="org.apache.myfaces.core" name="myfaces-impl" rev="1.2.9" conf="myfaces12->default" /> - - <!-- JSF 1.1 MyFaces dependencies --> - <dependency org="org.apache.myfaces" name="com.springsource.org.apache.myfaces.javax.faces" rev="1.1.5" conf="jsf11->runtime" /> - <dependency org="org.apache.myfaces" name="com.springsource.org.apache.myfaces" rev="1.1.5" conf="jsf11->runtime" /> - - <!-- test time only dependencies --> - <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime" /> - <dependency org="org.apache.myfaces.test" name="myfaces-test20" rev="1.0.0-beta" conf="test->default" /> - <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.2" conf="test->runtime" /> - <dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->runtime" /> - <dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="test->runtime"/> - <dependency org="org.springframework" name="org.springframework.test" rev="3.2.1.RELEASE" conf="test->runtime" /> - - </dependencies> - -</ivy-module> diff --git a/spring-faces/pom.xml b/spring-faces/pom.xml deleted file mode 100644 index 9a75d6fd..00000000 --- a/spring-faces/pom.xml +++ /dev/null @@ -1,233 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.springframework.webflow</groupId> - <artifactId>spring-faces</artifactId> - <packaging>jar</packaging> - <name>Spring Faces</name> - <version>2.3.3.BUILD-SNAPSHOT</version> - <dependencies> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-expression</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc-portlet</artifactId> - <version>${spring.version}</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.springframework.webflow</groupId> - <artifactId>spring-binding</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.springframework.webflow</groupId> - <artifactId>spring-js</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.springframework.webflow</groupId> - <artifactId>spring-webflow</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-core</artifactId> - <version>3.1.3.RELEASE</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-web</artifactId> - <version>3.1.3.RELEASE</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-api</artifactId> - <version>3.1.4.GA</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.1.7</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>2.1.7</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.14</version> - <optional>true</optional> - </dependency> - <!-- Test --> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.5.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.el</groupId> - <artifactId>jboss-el</artifactId> - <version>2.0.1.GA</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.myfaces.test</groupId> - <artifactId>myfaces-test20</artifactId> - <version>1.0.0-beta</version> - <scope>test</scope> - </dependency> - </dependencies> - <repositories> - <repository> - <id>jboss repository</id> - <url>https://repository.jboss.org/nexus/content/repositories/releases</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <junitArtifactName>junit:junit</junitArtifactName> - <includes> - <include>**/*Tests.java</include> - </includes> - </configuration> - </plugin> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/java</directory> - <includes> - <include>**/*.xsd</include> - </includes> - <excludes> - <exclude>**/.svn/**</exclude> - </excludes> - </resource> - <resource> - <filtering>false</filtering> - <directory>src/main/resources</directory> - <includes> - <include>META-INF/spring.*</include> - </includes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/java</directory> - <includes> - <include>**/*.xml</include> - </includes> - </testResource> - </testResources> - </build> - <properties> - <spring.version>3.2.1.RELEASE</spring.version> - </properties> -</project> diff --git a/spring-faces/src/test/java/org/springframework/faces/ui/AjaxViewRootTests.java b/spring-faces/src/test/java/org/springframework/faces/ui/AjaxViewRootTests.java index 5f709753..442d453c 100644 --- a/spring-faces/src/test/java/org/springframework/faces/ui/AjaxViewRootTests.java +++ b/spring-faces/src/test/java/org/springframework/faces/ui/AjaxViewRootTests.java @@ -26,8 +26,10 @@ public class AjaxViewRootTests extends TestCase { protected void setUp() throws Exception { jsf.setUp(); - jsf.facesContext().getApplication().setViewHandler(new MockViewHandler()); - jsf.facesContext().setResponseWriter(new MockResponseWriter(output, null, null)); + jsf.facesContext().getApplication() + .setViewHandler(new MockViewHandler()); + jsf.facesContext().setResponseWriter( + new MockResponseWriter(output, null, null)); UIForm form = new UIForm(); form.setId("foo"); @@ -49,7 +51,7 @@ public class AjaxViewRootTests extends TestCase { } public void testProcessDecodes() { - jsf.externalContext().getRequestParameterMap().put("processIds", "foo:bar, foo:baz"); + jsf.request().addParameter("processIds", "foo:bar, foo:baz"); AjaxViewRoot ajaxRoot = new AjaxViewRoot(testTree); @@ -59,7 +61,7 @@ public class AjaxViewRootTests extends TestCase { } public void testEncodeAll_NoRenderIds() throws IOException { - jsf.externalContext().getRequestParameterMap().put("processIds", "foo:bar, foo:baz"); + jsf.request().addParameter("processIds", "foo:bar, foo:baz"); AjaxViewRoot ajaxRoot = new AjaxViewRoot(testTree); @@ -67,14 +69,20 @@ public class AjaxViewRootTests extends TestCase { assertEquals(1, ajaxRoot.getProcessIds().length); assertEquals(1, ajaxRoot.getRenderIds().length); - assertEquals(StringUtils.arrayToCommaDelimitedString(ajaxRoot.getProcessIds()), StringUtils - .arrayToCommaDelimitedString(ajaxRoot.getRenderIds())); + assertEquals( + StringUtils.arrayToCommaDelimitedString(ajaxRoot + .getProcessIds()), + StringUtils.arrayToCommaDelimitedString(ajaxRoot.getRenderIds())); } + @SuppressWarnings("unchecked") public void testEncodeAll_RenderIdsExpr() throws IOException { - jsf.externalContext().getRequestMap().put(View.RENDER_FRAGMENTS_ATTRIBUTE, - StringUtils.delimitedListToStringArray("foo:bar,foo:baz", ",", " ")); + jsf.externalContext() + .getRequestMap() + .put(View.RENDER_FRAGMENTS_ATTRIBUTE, + StringUtils.delimitedListToStringArray( + "foo:bar,foo:baz", ",", " ")); AjaxViewRoot ajaxRoot = new AjaxViewRoot(testTree); @@ -82,6 +90,8 @@ public class AjaxViewRootTests extends TestCase { assertEquals(1, ajaxRoot.getRenderIds().length); - assertEquals("foo:bar", StringUtils.arrayToCommaDelimitedString(ajaxRoot.getRenderIds())); + assertEquals( + "foo:bar", + StringUtils.arrayToCommaDelimitedString(ajaxRoot.getRenderIds())); } } diff --git a/spring-faces/template.mf b/spring-faces/template.mf deleted file mode 100644 index 3b5a3513..00000000 --- a/spring-faces/template.mf +++ /dev/null @@ -1,21 +0,0 @@ -Bundle-SymbolicName: org.springframework.faces -Bundle-Name: Spring Faces -Bundle-Vendor: SpringSource -Bundle-ManifestVersion: 2 -Import-Package: - org.springframework.webflow.engine.builder.support;version="[2.3.3, 2.4.0)" -Import-Template: - org.springframework.binding.*;version="[2.3.3, 2.4.0)", - org.springframework.js.*;version="[2.3.3, 2.4.0)", - org.springframework.webflow.*;version="[2.3.3, 2.4.0)", - org.springframework.*;version="[3.1.0.RELEASE, 3.3.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - javax.el;version="[1.0.0, 2.0.0)", - javax.portlet;version="[2.0.0, 3.0.0)";resolution:=optional, - javax.servlet;version="[2.4.0, 3.0.0)", - javax.servlet.http;version="[2.4.0, 3.0.0)", - javax.faces.*;version="[1.2.0, 3.0.0)", - org.ajax4jsf.*;version="[1.1.1, 2.0.0)";resolution:=optional, - com.sun.faces.*;version="[2.0.0, 3.0.0)";resolution:=optional, - com.sun.facelets.*;version="[1.1.0, 2.0.0)";resolution:=optional, - org.w3c.dom;version="0" diff --git a/spring-js-resources/.classpath b/spring-js-resources/.classpath deleted file mode 100644 index 05399527..00000000 --- a/spring-js-resources/.classpath +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> - <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> - <classpathentry kind="src" path="src/main/java" including="**/*.java"/> - <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> -</classpath> \ No newline at end of file diff --git a/spring-js-resources/.project b/spring-js-resources/.project deleted file mode 100644 index cef8ce87..00000000 --- a/spring-js-resources/.project +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>spring-js-resources</name> - <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> - <projects/> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.common.project.facet.core.builder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> - </natures> -</projectDescription> \ No newline at end of file diff --git a/spring-js-resources/.settings/org.eclipse.jdt.core.prefs b/spring-js-resources/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 473ff55e..00000000 --- a/spring-js-resources/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,340 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes= -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=120 -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=8 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/spring-js-resources/.settings/org.eclipse.jdt.ui.prefs b/spring-js-resources/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 77e40833..00000000 --- a/spring-js-resources/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,58 +0,0 @@ -#Tue Sep 25 14:14:24 EDT 2007 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_Spring Java Conventions -formatter_settings_version=11 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=false -org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright 2004-2007 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\nthrow new UnsupportedOperationException("Auto-generated method stub");</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.format_source_code=true -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/spring-js-resources/.settings/org.eclipse.wst.validation.prefs b/spring-js-resources/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 68bb37d5..00000000 --- a/spring-js-resources/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Fri May 05 18:13:37 EDT 2006 -DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator; -USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator; -USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator; -USER_PREFERENCE=overrideGlobalPreferencesfalse -eclipse.preferences.version=1 diff --git a/spring-js-resources/build.xml b/spring-js-resources/build.xml deleted file mode 100644 index 396d115c..00000000 --- a/spring-js-resources/build.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="org.springframework.js.resources"> - - <property file="${basedir}/../build.properties"/> - <import file="${basedir}/../build-spring-webflow/package-bundle.xml"/> - <import file="${basedir}/../build-spring-webflow/publish-artifact.xml"/> - <import file="${basedir}/../build-spring-webflow/package-artifact.xml"/> - <import file="${basedir}/../spring-build/standard/default.xml"/> - -</project> diff --git a/spring-js-resources/ivy.xml b/spring-js-resources/ivy.xml deleted file mode 100644 index b3b12a7a..00000000 --- a/spring-js-resources/ivy.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> -<ivy-module - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" - version="1.3"> - - <info organisation="org.springframework.webflow" module="${ant.project.name}"> - <license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/> - </info> - - <configurations> - <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/> - </configurations> - - <publications> - <artifact name="${ant.project.name}"/> - <artifact name="${ant.project.name}-sources" type="src" ext="jar"/> - </publications> - - <dependencies /> - -</ivy-module> diff --git a/spring-js-resources/pom.xml b/spring-js-resources/pom.xml deleted file mode 100644 index 9f5159d6..00000000 --- a/spring-js-resources/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.springframework.webflow</groupId> - <artifactId>spring-js-resources</artifactId> - <packaging>jar</packaging> - <name>Spring JavaScript Resources</name> - <version>2.3.3.BUILD-SNAPSHOT</version> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>process-test-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <unzip src="${basedir}/dojo-build/dojo-build.zip" dest="target/classes/META-INF/web-resources" overwrite="true" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> -</build> -</project> diff --git a/spring-js-resources/spring-js-resources.gradle b/spring-js-resources/spring-js-resources.gradle new file mode 100644 index 00000000..26e79392 --- /dev/null +++ b/spring-js-resources/spring-js-resources.gradle @@ -0,0 +1,42 @@ +configurations { + shrinksafe +} + +dependencies { + shrinksafe "org.dojotoolkit:dojo-shrinksafe:1.7.2" +} + +task prepareResources(type: Jar) { jar -> + doLast() { + minify("Spring.js") + minify("Spring-Dojo.js") + ant.unzip(src: "${projectDir}/dojo-build/dojo-build.zip", + dest: "${buildDir}/resources/main/META-INF/web-resources") + } +} + +void minify(fileName) { + + project.ant { + def sourceDir = "${basedir}/src/main/resources/META-INF/web-resources/spring/" + def outputDir = "${buildDir}/resources/main/META-INF/web-resources/spring/" + + copy(file: "${outputDir}/${fileName}", tofile: "${outputDir}/${fileName}.uncompressed.js") + + java(classname: "org.dojotoolkit.shrinksafe.Main", + classpath: configurations.shrinksafe.asPath, fork: true, + output: "${outputDir}/${fileName}.TMP.js") { + arg(value: "${sourceDir}/${fileName}") + } + + move(file: "${outputDir}/${fileName}.TMP.js", toFile: "${outputDir}/${fileName}") { + filterchain { + filterreader(classname: "org.apache.tools.ant.filters.StripLineBreaks") + } + filterchain { + concatfilter(prepend: "${basedir}/../src/dist/javascript-copyright.txt") + } + } + } +} + diff --git a/spring-js-resources/template.mf b/spring-js-resources/template.mf deleted file mode 100644 index b55f6de2..00000000 --- a/spring-js-resources/template.mf +++ /dev/null @@ -1,4 +0,0 @@ -Bundle-SymbolicName: org.springframework.js.resources -Bundle-Name: Spring JS Resources -Bundle-Vendor: SpringSource -Bundle-ManifestVersion: 2 diff --git a/spring-js/.classpath b/spring-js/.classpath deleted file mode 100644 index 11ade04a..00000000 --- a/spring-js/.classpath +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> - <classpathentry kind="src" path="src/main/java" including="**/*.java"/> - <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.2/jstl-1.2.jar" sourcepath="M2_REPO/javax/servlet/jstl/1.2/jstl-1.2-sources.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"> - <attributes> - <attribute value="jar:file:/home/rossen/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" name="javadoc_location"/> - </attributes> - </classpathentry> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/3.2.1.RELEASE/spring-beans-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-beans/3.2.1.RELEASE/spring-beans-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/3.2.1.RELEASE/spring-core-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-core/3.2.1.RELEASE/spring-core-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/3.2.1.RELEASE/spring-context-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-context/3.2.1.RELEASE/spring-context-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-aop/3.2.1.RELEASE/spring-aop-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-aop/3.2.1.RELEASE/spring-aop-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-expression/3.2.1.RELEASE/spring-expression-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-expression/3.2.1.RELEASE/spring-expression-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="src" path="/spring-js-resources"/> - <classpathentry kind="var" path="M2_REPO/org/apache/tiles/tiles-api/2.1.2/tiles-api-2.1.2.jar" sourcepath="M2_REPO/org/apache/tiles/tiles-api/2.1.2/tiles-api-2.1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/tiles/tiles-core/2.1.2/tiles-core-2.1.2.jar" sourcepath="M2_REPO/org/apache/tiles/tiles-core/2.1.2/tiles-core-2.1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.8.1/commons-digester-1.8.1.jar" sourcepath="M2_REPO/commons-digester/commons-digester/1.8.1/commons-digester-1.8.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0-sources.jar"> - <attributes> - <attribute value="jar:file:/home/rossen/.m2/repository/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0-javadoc.jar!/" name="javadoc_location"/> - </attributes> - </classpathentry> - <classpathentry kind="var" path="M2_REPO/org/apache/tiles/tiles-jsp/2.1.2/tiles-jsp-2.1.2.jar" sourcepath="M2_REPO/org/apache/tiles/tiles-jsp/2.1.2/tiles-jsp-2.1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/tiles/tiles-servlet/2.1.2/tiles-servlet-2.1.2.jar" sourcepath="M2_REPO/org/apache/tiles/tiles-servlet/2.1.2/tiles-servlet-2.1.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/3.2.1.RELEASE/spring-web-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-web/3.2.1.RELEASE/spring-web-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/3.2.1.RELEASE/spring-webmvc-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-webmvc/3.2.1.RELEASE/spring-webmvc-3.2.1.RELEASE-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.5.2/easymock-2.5.2.jar" sourcepath="M2_REPO/org/easymock/easymock/2.5.2/easymock-2.5.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/springframework/spring-test/3.2.1.RELEASE/spring-test-3.2.1.RELEASE.jar" sourcepath="M2_REPO/org/springframework/spring-test/3.2.1.RELEASE/spring-test-3.2.1.RELEASE-sources.jar"/> -</classpath> diff --git a/spring-js/.project b/spring-js/.project deleted file mode 100644 index b470d90f..00000000 --- a/spring-js/.project +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>spring-js</name> - <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> - <projects> - <project>spring-js-resources</project> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.common.project.facet.core.builder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> - </natures> -</projectDescription> \ No newline at end of file diff --git a/spring-js/.settings/org.eclipse.jdt.core.prefs b/spring-js/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 2fdeadfc..00000000 --- a/spring-js/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,336 +0,0 @@ -#Wed Jun 09 09:15:58 BST 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes= -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=120 -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=8 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/spring-js/.settings/org.eclipse.jdt.ui.prefs b/spring-js/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 77e40833..00000000 --- a/spring-js/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,58 +0,0 @@ -#Tue Sep 25 14:14:24 EDT 2007 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_Spring Java Conventions -formatter_settings_version=11 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=false -org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=false -org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright 2004-2007 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http\://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\nthrow new UnsupportedOperationException("Auto-generated method stub");</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates> -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.format_source_code=true -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/spring-js/.settings/org.eclipse.wst.validation.prefs b/spring-js/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 68bb37d5..00000000 --- a/spring-js/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Fri May 05 18:13:37 EDT 2006 -DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator; -USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator; -USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator; -USER_PREFERENCE=overrideGlobalPreferencesfalse -eclipse.preferences.version=1 diff --git a/spring-js/build.xml b/spring-js/build.xml deleted file mode 100644 index c1bbcd67..00000000 --- a/spring-js/build.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="org.springframework.js"> - - <property file="${basedir}/../build.properties"/> - <import file="${basedir}/../build-spring-webflow/package-bundle.xml"/> - <import file="${basedir}/../build-spring-webflow/publish-artifact.xml"/> - <import file="${basedir}/../spring-build/standard/default.xml"/> - -</project> diff --git a/spring-js/ivy.xml b/spring-js/ivy.xml deleted file mode 100644 index b6521120..00000000 --- a/spring-js/ivy.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> -<ivy-module - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" - version="1.3"> - - <info organisation="org.springframework.webflow" module="${ant.project.name}"> - <license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/> - </info> - - <configurations> - <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/> - </configurations> - - <publications> - <artifact name="${ant.project.name}"/> - <artifact name="${ant.project.name}-sources" type="src" ext="jar"/> - </publications> - - <dependencies> - <!-- core dependencies --> - <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->runtime" /> - <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime"/> - <dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles" rev="2.1.2.osgi" conf="optional->runtime"/> - <dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.core" rev="2.1.2.osgi" conf="optional->runtime"/> - <dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.jsp" rev="2.1.2" conf="optional->runtime"/> - <dependency org="org.apache.tiles" name="com.springsource.org.apache.tiles.servlet" rev="2.1.2" conf="optional->runtime"/> - <dependency org="org.springframework" name="org.springframework.beans" rev="3.2.1.RELEASE" conf="compile->runtime"/> - <dependency org="org.springframework" name="org.springframework.context" rev="3.2.1.RELEASE" conf="compile->runtime"/> - <dependency org="org.springframework" name="org.springframework.core" rev="3.2.1.RELEASE" conf="compile->runtime"/> - <dependency org="org.springframework" name="org.springframework.web" rev="3.2.1.RELEASE" conf="compile->runtime"/> - <dependency org="org.springframework" name="org.springframework.web.servlet" rev="3.2.1.RELEASE" conf="compile->runtime"/> - <dependency org="org.springframework.webflow" name="org.springframework.js.resources" rev="latest.integration" conf="compile->runtime"/> - - <!-- test time only dependencies --> - <dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/> - <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.2" conf="test->runtime" /> - <dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="test->runtime" /> - <dependency org="org.springframework" name="org.springframework.test" rev="3.2.1.RELEASE" conf="test->runtime" /> - <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.digester" rev="1.8.0" conf="test->runtime"/> - <dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.2.0" conf="test->runtime"/> - <dependency org="org.springframework.webflow" name="org.springframework.binding" rev="latest.integration" conf="test->runtime"/> - - </dependencies> - -</ivy-module> diff --git a/spring-js/pom.xml b/spring-js/pom.xml deleted file mode 100644 index 4681952e..00000000 --- a/spring-js/pom.xml +++ /dev/null @@ -1,148 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.springframework.webflow</groupId> - <artifactId>spring-js</artifactId> - <packaging>jar</packaging> - <name>Spring JavaScript</name> - <version>2.3.3.BUILD-SNAPSHOT</version> - <dependencies> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${spring.version}</version> - </dependency> - <dependency> - <groupId>org.springframework.webflow</groupId> - <artifactId>spring-js-resources</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.tiles</groupId> - <artifactId>tiles-api</artifactId> - <version>2.1.2</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.tiles</groupId> - <artifactId>tiles-core</artifactId> - <version>2.1.2</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.tiles</groupId> - <artifactId>tiles-jsp</artifactId> - <version>2.1.2</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.tiles</groupId> - <artifactId>tiles-servlet</artifactId> - <version>2.1.2</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${spring.version}</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc</artifactId> - <version>${spring.version}</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.2</version> - <optional>true</optional> - </dependency> - <!-- Test --> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.5.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <junitArtifactName>junit:junit</junitArtifactName> - <includes> - <include>**/*Tests.java</include> - </includes> - </configuration> - </plugin> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - <testResources> - <testResource> - <directory>src/test/java</directory> - <includes> - <include>**/*.xml</include> - <include>**/*.js</include> - </includes> - </testResource> - </testResources> - </build> - <properties> - <spring.version>3.2.1.RELEASE</spring.version> - </properties> -</project> diff --git a/spring-js/template.mf b/spring-js/template.mf deleted file mode 100644 index 9b13e7a8..00000000 --- a/spring-js/template.mf +++ /dev/null @@ -1,15 +0,0 @@ -Bundle-SymbolicName: org.springframework.js -Bundle-Name: Spring JS -Bundle-Vendor: SpringSource -Bundle-ManifestVersion: 2 -Import-Template: - org.springframework.*;version="[3.1.0.RELEASE, 3.3.0)", - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - javax.servlet;version="[2.4.0, 3.0.0)", - javax.servlet.http;version="[2.4.0, 3.0.0)", - org.apache.tiles;version="[2.1.2, 3.0.0)";resolution:=optional, - org.apache.tiles.access;version="[2.1.2, 3.0.0)";resolution:=optional, - org.apache.tiles.context;version="[2.1.2.osgi, 3.0.0)";resolution:=optional, - org.apache.tiles.definition;version="[2.1.2.osgi, 3.0.0)";resolution:=optional, - org.apache.tiles.impl;version="[2.1.2.osgi, 3.0.0)";resolution:=optional, - org.apache.tiles.servlet.context;version="[2.1.2, 3.0.0)";resolution:=optional diff --git a/spring-webflow-library/.project b/spring-webflow-library/.project deleted file mode 100644 index 83754bc0..00000000 --- a/spring-webflow-library/.project +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>spring-webflow-library</name> - <comment></comment> - <projects> - <project>spring-binding</project> - <project>spring-webflow</project> - <project>spring-js</project> - <project>spring-faces</project> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> -</projectDescription> diff --git a/spring-webflow-library/build.xml b/spring-webflow-library/build.xml deleted file mode 100644 index 5f8f79b7..00000000 --- a/spring-webflow-library/build.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="org.springframework.webflow-library"> - - <property file="${basedir}/../build.properties"/> - <import file="${basedir}/../spring-build/library/default.xml"/> - - <target name="publish-maven-central"/> - - <target name="publish-maven-central-local"/> - - <target name="install-maven-central"/> - -</project> diff --git a/spring-webflow-library/ivy.xml b/spring-webflow-library/ivy.xml deleted file mode 100644 index 598d2760..00000000 --- a/spring-webflow-library/ivy.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> -<ivy-module - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" - version="1.3"> - - <info organisation="org.springframework.webflow" module="${ant.project.name}"> - <license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/> - </info> - - <configurations> - <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/> - </configurations> - - <publications> - <artifact name="${ant.project.name}" type="library" ext="libd"/> - </publications> - - <dependencies> - <dependency org="org.springframework.webflow" name="org.springframework.binding" rev="latest.integration" conf="compile->runtime"/> - <dependency org="org.springframework.webflow" name="org.springframework.webflow" rev="latest.integration" conf="compile->runtime"/> - <dependency org="org.springframework.webflow" name="org.springframework.js" rev="latest.integration" conf="optional->runtime"/> - <dependency org="org.springframework.webflow" name="org.springframework.faces" rev="latest.integration" conf="optional->runtime"/> - <dependency org="org.jboss.el" name="com.springsource.org.jboss.el" rev="2.0.0.GA" conf="optional->runtime"/> - </dependencies> - -</ivy-module> diff --git a/spring-webflow-library/org.springframework.webflow-library.libd b/spring-webflow-library/org.springframework.webflow-library.libd deleted file mode 100644 index 69575c8a..00000000 --- a/spring-webflow-library/org.springframework.webflow-library.libd +++ /dev/null @@ -1,10 +0,0 @@ -Library-SymbolicName: org.springframework.webflow -Library-Version: @bundle.version@ -Library-Name: Spring Web Flow -Import-Bundle: - org.springframework.binding;version="[@bundle.version@, @bundle.version@]", - org.springframework.webflow;version="[@bundle.version@, @bundle.version@]", - org.springframework.js;version="[@bundle.version@, @bundle.version@]";resolution:="optional", - org.springframework.js.resources;version="[@bundle.version@, @bundle.version@]";resolution:="optional", - org.springframework.faces;version="[@bundle.version@, @bundle.version@]";resolution:="optional", - com.springsource.org.jboss.el;version="[2.0.0.GA, 2.1.0)";resolution:="optional" diff --git a/spring-webflow-reference/.project b/spring-webflow-reference/.project deleted file mode 100644 index 41e5191a..00000000 --- a/spring-webflow-reference/.project +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>spring-webflow-reference</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> -</projectDescription> diff --git a/spring-webflow-reference/build.xml b/spring-webflow-reference/build.xml deleted file mode 100644 index eadeda28..00000000 --- a/spring-webflow-reference/build.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="spring-webflow-reference"> - - <property name="doc.type" value="reference"/> - <property file="${basedir}/../build.properties"/> - <import file="${basedir}/../spring-build/docbook/default.xml"/> - -</project> diff --git a/spring-webflow-reference/css/html/highlight.css b/spring-webflow-reference/css/html/highlight.css deleted file mode 100644 index ffefef72..00000000 --- a/spring-webflow-reference/css/html/highlight.css +++ /dev/null @@ -1,35 +0,0 @@ -/* - code highlight CSS resemblign the Eclipse IDE default color schema - @author Costin Leau -*/ - -.hl-keyword { - color: #7F0055; - font-weight: bold; -} - -.hl-comment { - color: #3F5F5F; - font-style: italic; -} - -.hl-multiline-comment { - color: #3F5FBF; - font-style: italic; -} - -.hl-tag { - color: #3F7F7F; -} - -.hl-attribute { - color: #7F007F; -} - -.hl-value { - color: #2A00FF; -} - -.hl-string { - color: #2A00FF; -} \ No newline at end of file diff --git a/spring-webflow-reference/css/html/stylesheet.css b/spring-webflow-reference/css/html/stylesheet.css deleted file mode 100644 index 4314f6b3..00000000 --- a/spring-webflow-reference/css/html/stylesheet.css +++ /dev/null @@ -1,59 +0,0 @@ -@IMPORT url("highlight.css"); - -html { - padding: 0pt; - margin: 0pt; -} - -body { - margin-left: 10%; - margin-right: 10%; - font-family: Arial, Sans-serif; -} - -div { - margin: 0pt; -} - -p { - text-align: justify; -} - -hr { - border: 1px solid gray; - background: gray; -} - -h1,h2,h3,h4 { - color: #234623; - font-family: Arial, Sans-serif; -} - -pre { - line-height: 1.0; - color: black; -} - -pre.programlisting { - font-size: 10pt; - padding: 7pt 3pt; - border: 1pt solid black; - background: #eeeeee; - clear: both; -} - -div.table { - margin: 1em; - padding: 0.5em; - text-align: center; -} - -div.table table { - display: table; - width: 100%; -} - -div.table td { - padding-left: 7px; - padding-right: 7px; -} diff --git a/spring-webflow-reference/ivy.xml b/spring-webflow-reference/ivy.xml deleted file mode 100644 index 81eb5cd1..00000000 --- a/spring-webflow-reference/ivy.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?> -<ivy-module - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" - version="1.3"> - - <info organisation="org.springframework.webflow" module="${ant.project.name}"> - <license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/> - </info> - - <configurations> - <include file="${spring.build.dir}/common/default-ivy-configurations.xml"/> - </configurations> - - <publications> - <artifact name="${ant.project.name}" ext="pdf" type="pdf"/> - <artifact name="${ant.project.name}" ext="zip" type="zip"/> - <artifact name="${ant.project.name}-single" ext="zip" type="zip"/> - </publications> - -</ivy-module> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/.project b/spring-webflow-samples/booking-faces/.project deleted file mode 100644 index 0b3f958c..00000000 --- a/spring-webflow-samples/booking-faces/.project +++ /dev/null @@ -1,22 +0,0 @@ -<projectDescription> - <name>booking-faces</name> - <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> - <projects/> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.common.project.facet.core.builder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> - </natures> -</projectDescription> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/build.xml b/spring-webflow-samples/booking-faces/build.xml deleted file mode 100755 index f1d81986..00000000 --- a/spring-webflow-samples/booking-faces/build.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="swf-booking-faces"> - - <property name="source.version" value="1.5"/> - <property name="ivy.cache.dir" value="${basedir}/../../ivy-cache"/> - <property name="integration.repo.dir" value="${basedir}/../../integration-repo"/> - <property name="ivy.settings.file" value="${basedir}/../../build-spring-webflow/ivysettings.xml"/> - - <property file="${basedir}/../../build.properties"/> - <import file="${basedir}/../../spring-build/war/default.xml"/> - - <target name="publish"/> - - <target name="publish-maven-central"/> - - <target name="install-maven-central"/> - -</project> diff --git a/spring-webflow-samples/booking-faces/pom.xml b/spring-webflow-samples/booking-faces/pom.xml deleted file mode 100644 index 657b9413..00000000 --- a/spring-webflow-samples/booking-faces/pom.xml +++ /dev/null @@ -1,242 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.springframework.webflow.samples</groupId> - <artifactId>booking-faces</artifactId> - <packaging>war</packaging> - <name>Hotel Booking : Spring MVC + Web Flow + JSF/PrimeFaces</name> - <version>2.3.3.BUILD-SNAPSHOT</version> - <properties> - <org.springframework-version>3.2.1.RELEASE</org.springframework-version> - <org.springsecurity-version>3.1.3.RELEASE</org.springsecurity-version> - <org.slf4j-version>1.5.10</org.slf4j-version> - <jsf-version>2.1.7</jsf-version> - <primefaces-version>3.1.1</primefaces-version> - </properties> - <dependencies> - <!-- Spring --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${org.springframework-version}</version> - <exclusions> - <!-- Exclude Commons Logging in favor of SLF4j --> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - <version>${org.springframework-version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-orm</artifactId> - <version>${org.springframework-version}</version> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc</artifactId> - <version>${org.springframework-version}</version> - </dependency> - <dependency> - <groupId>org.springframework.webflow</groupId> - <artifactId>spring-webflow</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.springframework.webflow</groupId> - <artifactId>spring-faces</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-web</artifactId> - <version>${org.springsecurity-version}</version> - <exclusions> - <!-- Exclude Commons Logging in favor of SLF4j --> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-config</artifactId> - <version>${org.springsecurity-version}</version> - <exclusions> - <!-- Exclude Commons Logging in favor of SLF4j --> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- Database, JPA --> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.10</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.5.0-Final</version> - </dependency> - <!-- JSF: Mojarra, PrimeFaces --> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>${jsf-version}</version> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>${jsf-version}</version> - </dependency> - <dependency> - <groupId>org.primefaces</groupId> - <artifactId>primefaces</artifactId> - <version>${primefaces-version}</version> - </dependency> - <!-- Logging --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${org.slf4j-version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${org.slf4j-version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${org.slf4j-version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.15</version> - <exclusions> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> - <scope>runtime</scope> - </dependency> - <!-- Servlet --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <!-- JSR 303 with Hibernate Validator --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.0.2.GA</version> - </dependency> - <!-- - JAXB is needed when running on Java 5. In this environment these dependencies have to be added - (unless xml configuration is explicitly disabled via Configuration.ignoreXmlConfiguration) - On Java 6 jaxb is part of the runtime environment. - --> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - </dependency> - <!-- Test --> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.5.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${org.springframework-version}</version> - <scope>test</scope> - </dependency> - </dependencies> - <repositories> - <repository> - <id>spring-repository</id> - <name>Spring project snapshots, milestones, and releases</name> - <url>http://repo.springsource.org/snapshot</url> - </repository> - <repository> - <id>primefaces-repository</id> - <name>Prime Technology Maven Repository</name> - <url>http://repository.primefaces.org</url> - <layout>default</layout> - </repository> - </repositories> - <build> - <finalName>swf-booking-faces</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <junitArtifactName>junit:junit</junitArtifactName> - <includes> - <include>**/*Tests.java</include> - </includes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.8</version> - <configuration> - <downloadSources>true</downloadSources> - <downloadJavadocs>false</downloadJavadocs> - <wtpversion>2.0</wtpversion> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Amenity.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Amenity.java deleted file mode 100644 index 9b1c2255..00000000 --- a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Amenity.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.springframework.webflow.samples.booking; - -public enum Amenity { - OCEAN_VIEW, LATE_CHECKOUT, MINIBAR; -} diff --git a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Booking.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Booking.java deleted file mode 100755 index 5bbc7f06..00000000 --- a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Booking.java +++ /dev/null @@ -1,226 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.text.DateFormat; -import java.util.Calendar; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; -import javax.validation.constraints.Future; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; - -import org.hibernate.validator.constraints.NotEmpty; -import org.springframework.binding.message.MessageBuilder; -import org.springframework.binding.message.MessageContext; -import org.springframework.binding.validation.ValidationContext; - -/** - * A Hotel Booking made by a User. - */ -@Entity -public class Booking implements Serializable { - - private static final long serialVersionUID = 1171567558348174963L; - - private Long id; - - private User user; - - private Hotel hotel; - - private Date checkinDate; - - private Date checkoutDate; - - private String creditCard; - - private String creditCardName; - - private int creditCardExpiryMonth; - - private int creditCardExpiryYear; - - private boolean smoking; - - private int beds; - - private Amenity[] amenities; - - public Booking() { - } - - public Booking(Hotel hotel, User user) { - this.hotel = hotel; - this.user = user; - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.DAY_OF_MONTH, 1); - setCheckinDate(calendar.getTime()); - calendar.add(Calendar.DAY_OF_MONTH, 1); - setCheckoutDate(calendar.getTime()); - } - - @Transient - public BigDecimal getTotal() { - return hotel.getPrice().multiply(new BigDecimal(getNights())); - } - - @Transient - public int getNights() { - if (checkinDate == null || checkoutDate == null) { - return 0; - } else { - return (int) (checkoutDate.getTime() - checkinDate.getTime()) / 1000 / 60 / 60 / 24; - } - } - - @Id - @GeneratedValue(strategy = GenerationType.TABLE) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - @Basic - @Temporal(TemporalType.DATE) - @Future - @NotNull - public Date getCheckinDate() { - return checkinDate; - } - - public void setCheckinDate(Date datetime) { - this.checkinDate = datetime; - } - - @ManyToOne - public Hotel getHotel() { - return hotel; - } - - public void setHotel(Hotel hotel) { - this.hotel = hotel; - } - - @ManyToOne - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - - @Basic - @Temporal(TemporalType.DATE) - @Future - @NotNull - public Date getCheckoutDate() { - return checkoutDate; - } - - public void setCheckoutDate(Date checkoutDate) { - this.checkoutDate = checkoutDate; - } - - @Pattern(regexp = "[0-9]{16}", message = "{invalidCreditCardPattern}") - public String getCreditCard() { - return creditCard; - } - - public void setCreditCard(String creditCard) { - this.creditCard = creditCard; - } - - @Transient - public String getDescription() { - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM); - return hotel == null ? null : hotel.getName() + ", " + df.format(getCheckinDate()) + " to " - + df.format(getCheckoutDate()); - } - - public boolean isSmoking() { - return smoking; - } - - public void setSmoking(boolean smoking) { - this.smoking = smoking; - } - - public int getBeds() { - return beds; - } - - public void setBeds(int beds) { - this.beds = beds; - } - - @NotEmpty - public String getCreditCardName() { - return creditCardName; - } - - public void setCreditCardName(String creditCardName) { - this.creditCardName = creditCardName; - } - - public int getCreditCardExpiryMonth() { - return creditCardExpiryMonth; - } - - public void setCreditCardExpiryMonth(int creditCardExpiryMonth) { - this.creditCardExpiryMonth = creditCardExpiryMonth; - } - - public int getCreditCardExpiryYear() { - return creditCardExpiryYear; - } - - public void setCreditCardExpiryYear(int creditCardExpiryYear) { - this.creditCardExpiryYear = creditCardExpiryYear; - } - - @Transient - public Amenity[] getAmenities() { - return amenities; - } - - public void setAmenities(Amenity[] amenities) { - this.amenities = amenities; - } - - public void validateEnterBookingDetails(ValidationContext context) { - MessageContext messages = context.getMessageContext(); - if (checkinDate.before(today())) { - messages.addMessage(new MessageBuilder().error().source("checkinDate") - .code("booking.checkinDate.beforeToday").build()); - } else if (checkoutDate.before(checkinDate)) { - messages.addMessage(new MessageBuilder().error().source("checkoutDate") - .code("booking.checkoutDate.beforeCheckinDate").build()); - } - } - - private Date today() { - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.DAY_OF_MONTH, -1); - return calendar.getTime(); - } - - @Override - public String toString() { - return "Booking(" + user + "," + hotel + ")"; - } - -} diff --git a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/BookingService.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/BookingService.java deleted file mode 100755 index dc60e9f3..00000000 --- a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/BookingService.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.util.List; - -/** - * A service interface for retrieving hotels and bookings from a backing repository. Also supports the ability to cancel - * a booking. - */ -public interface BookingService { - - /** - * Find bookings made by the given user - * @param username the user's name - * @return their bookings - */ - public List<Booking> findBookings(String username); - - /** - * Find hotels available for booking by some criteria. - * @param criteria the search criteria - * @param firstResult the index of the first result to return - * @param sortBy the field to sort by - * @param ascending true if the sorting should be in ascending order, false for descending - * @return a list of hotels meeting the criteria - */ - public List<Hotel> findHotels(SearchCriteria criteria, int firstResult, String sortBy, boolean ascending); - - /** - * Find hotels by their identifier. - * @param id the hotel id - * @return the hotel - */ - public Hotel findHotelById(Long id); - - /** - * Create a new, transient hotel booking instance for the given user. - * @param hotelId the hotelId - * @param userName the user name - * @return the new transient booking instance - */ - public Booking createBooking(Long hotelId, String userName); - - /** - * Persist the booking to the database - * @param booking the booking - */ - public void persistBooking(Booking booking); - - /** - * Cancel an existing booking. - * @param id the booking id - */ - public void cancelBooking(Booking booking); - - /** - * Return the total number of hotels for the given criteria. - * @param criteria the criteria to use - * @return the number of matching hotels - */ - int getNumberOfHotels(SearchCriteria criteria); - -} diff --git a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Hotel.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Hotel.java deleted file mode 100755 index 3715a98a..00000000 --- a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Hotel.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; -import java.math.BigDecimal; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -/** - * A hotel where users may book stays. - */ -@Entity -public class Hotel implements Serializable { - - private static final long serialVersionUID = 4011346719502656269L; - - private Long id; - - private String name; - - private String address; - - private String city; - - private String state; - - private String zip; - - private String country; - - private BigDecimal price; - - @Id - @GeneratedValue - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getZip() { - return zip; - } - - public void setZip(String zip) { - this.zip = zip; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public String getCountry() { - return country; - } - - public void setCountry(String country) { - this.country = country; - } - - @Column(precision = 6, scale = 2) - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - public Booking createBooking(User user) { - return new Booking(this, user); - } - - @Override - public String toString() { - return "Hotel(" + name + "," + address + "," + city + "," + zip + ")"; - } -} diff --git a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/HotelLazyDataModel.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/HotelLazyDataModel.java deleted file mode 100644 index cdcb2cbf..00000000 --- a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/HotelLazyDataModel.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * - */ -package org.springframework.webflow.samples.booking; - -import java.util.List; -import java.util.Map; - -import org.primefaces.model.LazyDataModel; -import org.primefaces.model.SortOrder; - -public class HotelLazyDataModel extends LazyDataModel<Hotel> { - - private static final long serialVersionUID = -8832831134966938627L; - - SearchCriteria searchCriteria; - - BookingService bookingService; - - private Hotel selected; - - public HotelLazyDataModel(SearchCriteria searchCriteria, BookingService bookingService) { - this.searchCriteria = searchCriteria; - this.bookingService = bookingService; - } - - @Override - public List<Hotel> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, String> filters) { - searchCriteria.setCurrentPage(first / pageSize + 1); - return bookingService.findHotels(searchCriteria, first, sortField, sortOrder.equals(SortOrder.ASCENDING)); - } - - @Override - public int getRowCount() { - return bookingService.getNumberOfHotels(searchCriteria); - } - - public Hotel getSelected() { - return selected; - } - - public void setSelected(Hotel selected) { - this.selected = selected; - } - - public int getCurrentPage() { - return this.searchCriteria.getCurrentPage(); - } - - public int getPageSize() { - return this.searchCriteria.getPageSize(); - } - -} \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java deleted file mode 100755 index 3f23df10..00000000 --- a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - -import org.springframework.stereotype.Repository; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - -/** - * A JPA-based implementation of the Booking Service. Delegates to a JPA entity manager to issue data access calls - * against the backing repository. The EntityManager reference is provided by the managing container (Spring) - * automatically. - */ -@Service("bookingService") -@Repository -public class JpaBookingService implements BookingService, Serializable { - - private static final long serialVersionUID = 1L; - - private EntityManager em; - - @PersistenceContext - public void setEntityManager(EntityManager em) { - this.em = em; - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public List<Booking> findBookings(String username) { - if (username != null) { - return em.createQuery("select b from Booking b where b.user.username = :username order by b.checkinDate") - .setParameter("username", username).getResultList(); - } else { - return null; - } - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public List<Hotel> findHotels(SearchCriteria criteria, int firstResult, String orderBy, boolean ascending) { - String pattern = getSearchPattern(criteria); - orderBy = (orderBy != null) ? orderBy : "name"; - String orderDirection = (ascending) ? " ASC" : " DESC"; - return em - .createQuery( - "select h from Hotel h where lower(h.name) like :pattern or lower(h.city) like :pattern " - + "or lower(h.zip) like :pattern or lower(h.address) like :pattern order by h." - + orderBy + orderDirection).setParameter("pattern", pattern) - .setMaxResults(criteria.getPageSize()).setFirstResult(firstResult).getResultList(); - } - - @Transactional(readOnly = true) - public int getNumberOfHotels(SearchCriteria criteria) { - String pattern = getSearchPattern(criteria); - Long count = (Long) em - .createQuery( - "select count(h.id) from Hotel h where lower(h.name) like :pattern or lower(h.city) like :pattern " - + "or lower(h.zip) like :pattern or lower(h.address) like :pattern") - .setParameter("pattern", pattern).getSingleResult(); - return count.intValue(); - } - - @Transactional(readOnly = true) - public Hotel findHotelById(Long id) { - return em.find(Hotel.class, id); - } - - @Transactional(readOnly = true) - public Booking createBooking(Long hotelId, String username) { - Hotel hotel = em.find(Hotel.class, hotelId); - User user = findUser(username); - Booking booking = new Booking(hotel, user); - return booking; - } - - @Transactional - public void persistBooking(Booking booking) { - em.persist(booking); - } - - @Transactional - public void cancelBooking(Booking booking) { - booking = em.find(Booking.class, booking.getId()); - if (booking != null) { - em.remove(booking); - } - } - - // helpers - - private String getSearchPattern(SearchCriteria criteria) { - if (StringUtils.hasText(criteria.getSearchString())) { - return "%" + criteria.getSearchString().toLowerCase().replace('*', '%') + "%"; - } else { - return "%"; - } - } - - private User findUser(String username) { - return (User) em.createQuery("select u from User u where u.username = :username") - .setParameter("username", username).getSingleResult(); - } - -} \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/ReferenceData.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/ReferenceData.java deleted file mode 100644 index 4c499aaf..00000000 --- a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/ReferenceData.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.util.ArrayList; -import java.util.List; - -import javax.faces.model.SelectItem; - -import org.springframework.stereotype.Service; - -@Service -public class ReferenceData { - - private List<SelectItem> bedOptions; - - private List<SelectItem> smokingOptions; - - private List<SelectItem> creditCardExpMonths; - - private List<SelectItem> creditCardExpYears; - - private List<SelectItem> pageSizeOptions; - - public List<SelectItem> getBedOptions() { - if (bedOptions == null) { - bedOptions = new ArrayList<SelectItem>(); - bedOptions.add(new SelectItem(new Integer(1), "One king-size bed")); - bedOptions.add(new SelectItem(new Integer(2), "Two double beds")); - bedOptions.add(new SelectItem(new Integer(3), "Three beds")); - } - return bedOptions; - } - - public List<SelectItem> getSmokingOptions() { - if (smokingOptions == null) { - smokingOptions = new ArrayList<SelectItem>(); - smokingOptions.add(new SelectItem(Boolean.TRUE, "Smoking")); - smokingOptions.add(new SelectItem(Boolean.FALSE, "Non-Smoking")); - } - return smokingOptions; - } - - public List<SelectItem> getCreditCardExpMonths() { - if (creditCardExpMonths == null) { - creditCardExpMonths = new ArrayList<SelectItem>(); - creditCardExpMonths.add(new SelectItem(new Integer(1), "Jan")); - creditCardExpMonths.add(new SelectItem(new Integer(2), "Feb")); - creditCardExpMonths.add(new SelectItem(new Integer(3), "Mar")); - creditCardExpMonths.add(new SelectItem(new Integer(4), "Apr")); - creditCardExpMonths.add(new SelectItem(new Integer(5), "May")); - creditCardExpMonths.add(new SelectItem(new Integer(6), "Jun")); - creditCardExpMonths.add(new SelectItem(new Integer(7), "Jul")); - creditCardExpMonths.add(new SelectItem(new Integer(8), "Aug")); - creditCardExpMonths.add(new SelectItem(new Integer(9), "Sep")); - creditCardExpMonths.add(new SelectItem(new Integer(10), "Oct")); - creditCardExpMonths.add(new SelectItem(new Integer(11), "Nov")); - creditCardExpMonths.add(new SelectItem(new Integer(12), "Dec")); - } - return creditCardExpMonths; - } - - public List<SelectItem> getCreditCardExpYears() { - if (creditCardExpYears == null) { - creditCardExpYears = new ArrayList<SelectItem>(); - creditCardExpYears.add(new SelectItem(new Integer(2008), "2008")); - creditCardExpYears.add(new SelectItem(new Integer(2009), "2009")); - creditCardExpYears.add(new SelectItem(new Integer(2010), "2010")); - creditCardExpYears.add(new SelectItem(new Integer(2010), "2011")); - creditCardExpYears.add(new SelectItem(new Integer(2010), "2012")); - } - return creditCardExpYears; - } - - public List<SelectItem> getPageSizeOptions() { - if (pageSizeOptions == null) { - pageSizeOptions = new ArrayList<SelectItem>(); - pageSizeOptions.add(new SelectItem(new Integer(5), "5")); - pageSizeOptions.add(new SelectItem(new Integer(10), "10")); - pageSizeOptions.add(new SelectItem(new Integer(20), "20")); - } - return pageSizeOptions; - } - -} diff --git a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java deleted file mode 100755 index ddae0954..00000000 --- a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; - -import javax.faces.model.DataModel; - -/** - * A backing bean for the main hotel search form. Encapsulates the criteria needed to perform a hotel search. - */ -public class SearchCriteria implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * The user-provided search criteria for finding Hotels. - */ - private String searchString = ""; - - /** - * The maximum page size of the Hotel result list - */ - private int pageSize = 5; - - /** - * The page the user is currently on. - */ - private int currentPage = 1; - - /** - * Returns a {@link DataModel} based on the search criteria. - * @param bookingService the service to use to retrieve hotels. - */ - public DataModel<Hotel> getDataModel(BookingService bookingService) { - return new HotelLazyDataModel(this, bookingService); - } - - public String getSearchString() { - return searchString; - } - - public void setSearchString(String searchString) { - this.searchString = searchString; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getCurrentPage() { - return currentPage; - } - - public void setCurrentPage(int currentPage) { - this.currentPage = currentPage; - } - - public String toString() { - return "[Search Criteria searchString = '" + searchString + "'"; - } - -} \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/User.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/User.java deleted file mode 100755 index 494e9ddd..00000000 --- a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/User.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -/** - * A user who can book hotels. - */ -@Entity -@Table(name = "Customer") -public class User implements Serializable { - - private static final long serialVersionUID = -3652559447682574722L; - - private String username; - - private String password; - - private String name; - - public User() { - } - - public User(String username, String password, String name) { - this.username = username; - this.password = password; - this.name = name; - } - - @Id - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public String toString() { - return "User(" + username + ")"; - } -} diff --git a/spring-webflow-samples/booking-faces/src/main/resources/JsfMessageResources.properties b/spring-webflow-samples/booking-faces/src/main/resources/JsfMessageResources.properties deleted file mode 100644 index 497baf8c..00000000 --- a/spring-webflow-samples/booking-faces/src/main/resources/JsfMessageResources.properties +++ /dev/null @@ -1,6 +0,0 @@ -# -# Overrides default pattern in JSF for Bean Validation messages from "{0}" to "{1} {0}" where -# the {0} is the Bean Validation constraint message (e.g. "may not be empty") and {1} is the -# field name or the field label if defined (e.g. "First name"). -# -javax.faces.validator.BeanValidator.MESSAGE={1} {0} \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/resources/META-INF/persistence.xml b/spring-webflow-samples/booking-faces/src/main/resources/META-INF/persistence.xml deleted file mode 100755 index f4e3d6a7..00000000 --- a/spring-webflow-samples/booking-faces/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<persistence xmlns="http://java.sun.com/xml/ns/persistence" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> - <persistence-unit name="bookingDatabase"> - <provider>org.hibernate.ejb.HibernatePersistence</provider> - <class>org.springframework.webflow.samples.booking.User</class> - <class>org.springframework.webflow.samples.booking.Booking</class> - <class>org.springframework.webflow.samples.booking.Hotel</class> - <properties> - <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> - <property name="hibernate.hbm2ddl.auto" value="create-drop" /> - <property name="hibernate.show_sql" value="true"/> - <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> - </properties> - </persistence-unit> -</persistence> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/resources/ValidationMessages.properties b/spring-webflow-samples/booking-faces/src/main/resources/ValidationMessages.properties deleted file mode 100644 index 0909702d..00000000 --- a/spring-webflow-samples/booking-faces/src/main/resources/ValidationMessages.properties +++ /dev/null @@ -1,2 +0,0 @@ -# Custom messages for JSR-303 validation -invalidCreditCardPattern=is not a valid 16 digit card number. diff --git a/spring-webflow-samples/booking-faces/src/main/resources/import.sql b/spring-webflow-samples/booking-faces/src/main/resources/import.sql deleted file mode 100755 index 9a7ed4a9..00000000 --- a/spring-webflow-samples/booking-faces/src/main/resources/import.sql +++ /dev/null @@ -1,27 +0,0 @@ -insert into Customer (username, name) values ('keith', 'Keith') -insert into Customer (username, name) values ('erwin', 'Erwin') -insert into Customer (username, name) values ('jeremy', 'Jeremy') -insert into Customer (username, name) values ('scott', 'Scott') -insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 199, 'Westin Diplomat', '3555 S. Ocean Drive', 'Hollywood', 'FL', '33019', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 60, 'Jameson Inn', '890 Palm Bay Rd NE', 'Palm Bay', 'FL', '32905', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 199, 'Chilworth Manor', 'The Cottage, Southampton Business Park', 'Southampton', 'Hants', 'SO16 7JF', 'UK') -insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (7, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 130, 'Hotel Beaulac', ' Esplanade Léopold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (22, 250, 'Meliá White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (23, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/resources/log4j.xml b/spring-webflow-samples/booking-faces/src/main/resources/log4j.xml deleted file mode 100644 index 4c3ff1c0..00000000 --- a/spring-webflow-samples/booking-faces/src/main/resources/log4j.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> - - <!-- Appenders --> - <appender name="console" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out" /> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%-5p: %c - %m%n" /> - </layout> - </appender> - - <logger name="org.springframework.beans"> - <level value="warn" /> - </logger> - - <logger name="org.springframework.binding"> - <level value="debug" /> - </logger> - - <logger name="org.springframework.jdbc"> - <level value="warn" /> - </logger> - - <logger name="org.springframework.transaction"> - <level value="warn" /> - </logger> - - <logger name="org.springframework.orm"> - <level value="warn" /> - </logger> - - <logger name="org.springframework.web"> - <level value="debug" /> - </logger> - - <logger name="org.springframework.faces"> - <level value="debug" /> - </logger> - - <logger name="org.springframework.webflow"> - <level value="debug" /> - </logger> - - <!-- Root Logger --> - <root> - <priority value="warn" /> - <appender-ref ref="console" /> - </root> - -</log4j:configuration> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/META-INF/MANIFEST.MF b/spring-webflow-samples/booking-faces/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/classes/log4j.properties b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/classes/log4j.properties deleted file mode 100755 index 992d816d..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,11 +0,0 @@ -log4j.rootCategory=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n - -# Enable web flow logging -log4j.category.org.springframework.webflow=DEBUG -log4j.category.org.springframework.faces=DEBUG -log4j.category.org.springframework.binding=DEBUG -log4j.category.org.springframework.transaction=DEBUG \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/data-access-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/data-access-config.xml deleted file mode 100644 index 581e73bd..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/data-access-config.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:tx="http://www.springframework.org/schema/tx" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd"> - - <!-- Instructs Spring to perfrom declarative transaction management on annotated classes --> - <tx:annotation-driven /> - - <!-- Drives transactions using local JPA APIs --> - <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager"> - <property name="entityManagerFactory" ref="entityManagerFactory" /> - </bean> - - <!-- Creates a EntityManagerFactory for use with the Hibernate JPA provider and a simple in-memory data source populated with test data --> - <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> - <property name="dataSource" ref="dataSource" /> - <property name="jpaVendorAdapter"> - <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" /> - </property> - </bean> - - <!-- Deploys a in-memory "booking" datasource populated --> - <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:mem:booking" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </bean> - -</beans> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml deleted file mode 100644 index 09e44dc9..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:security="http://www.springframework.org/schema/security" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd"> - - <!-- Configure Spring Security --> - <security:http auto-config="true" use-expressions="true"> - <security:form-login login-page="/spring/login" login-processing-url="/spring/loginProcess" - default-target-url="/spring/main" authentication-failure-url="/spring/login?login_error=1" /> - <security:logout logout-url="/spring/logout" logout-success-url="/spring/logoutSuccess" /> - <security:intercept-url pattern="/secure" method="POST" access="hasRole('ROLE_SUPERVISOR')"/> - </security:http> - - <!-- - Define local authentication provider, a real app would use an external provider (JDBC, LDAP, CAS, etc) - - usernames/passwords are: - keith/melbourne - erwin/leuven - jeremy/atlanta - scott/rochester - --> - <security:authentication-manager> - <security:authentication-provider> - <security:password-encoder hash="md5" /> - <security:user-service> - <security:user name="keith" password="417c7382b16c395bc25b5da1398cf076" authorities="ROLE_USER, ROLE_SUPERVISOR" /> - <security:user name="erwin" password="12430911a8af075c6f41c6976af22b09" authorities="ROLE_USER, ROLE_SUPERVISOR" /> - <security:user name="jeremy" password="57c6cbff0d421449be820763f03139eb" authorities="ROLE_USER" /> - <security:user name="scott" password="942f2339bf50796de535a384f0d1af3e" authorities="ROLE_USER" /> - </security:user-service> - </security:authentication-provider> - </security:authentication-manager> - -</beans> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/web-application-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/web-application-config.xml deleted file mode 100644 index 942c9c19..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/web-application-config.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - - <!-- Scans for application @Components to deploy --> - <context:component-scan base-package="org.springframework.webflow.samples.booking" /> - - <!-- Imports the configurations of the different infrastructure systems of the application --> - <import resource="webmvc-config.xml" /> - <import resource="webflow-config.xml" /> - <import resource="data-access-config.xml" /> - <import resource="security-config.xml" /> - -</beans> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webflow-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webflow-config.xml deleted file mode 100644 index 73b3f04a..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webflow-config.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:webflow="http://www.springframework.org/schema/webflow-config" - xmlns:faces="http://www.springframework.org/schema/faces" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd - http://www.springframework.org/schema/faces http://www.springframework.org/schema/faces/spring-faces-2.2.xsd"> - - <!-- Executes flows: the central entry point into the Spring Web Flow system --> - <webflow:flow-executor id="flowExecutor"> - <webflow:flow-execution-listeners> - <webflow:listener ref="facesContextListener"/> - <webflow:listener ref="securityFlowExecutionListener" /> - </webflow:flow-execution-listeners> - </webflow:flow-executor> - - <!-- The registry of executable flow definitions --> - <webflow:flow-registry id="flowRegistry" flow-builder-services="facesFlowBuilderServices" base-path="/WEB-INF/flows"> - <webflow:flow-location-pattern value="/**/*-flow.xml" /> - </webflow:flow-registry> - - <!-- Configures the Spring Web Flow JSF integration --> - <faces:flow-builder-services id="facesFlowBuilderServices" development="true" /> - - <!-- Installs a listener that creates and releases the FacesContext for each request. --> - <bean id="facesContextListener" class="org.springframework.faces.webflow.FlowFacesContextLifecycleListener"/> - - <!-- Installs a listener to apply Spring Security authorities --> - <bean id="securityFlowExecutionListener" class="org.springframework.webflow.security.SecurityFlowExecutionListener" /> - -</beans> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml deleted file mode 100644 index 571e501d..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:faces="http://www.springframework.org/schema/faces" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/faces http://www.springframework.org/schema/faces/spring-faces-2.2.xsd"> - - <faces:resources /> - - <!-- Maps request paths to flows in the flowRegistry; e.g. a path of /hotels/booking looks for a flow with id "hotels/booking" --> - <bean class="org.springframework.webflow.mvc.servlet.FlowHandlerMapping"> - <property name="order" value="1"/> - <property name="flowRegistry" ref="flowRegistry" /> - <property name="defaultHandler"> - <!-- If no flow match, map path to a view to render; e.g. the "/intro" path would map to the view named "intro" --> - <bean class="org.springframework.web.servlet.mvc.UrlFilenameViewController" /> - </property> - </bean> - - <!-- Maps logical view names to Facelet templates in /WEB-INF (e.g. 'search' to '/WEB-INF/search.xhtml' --> - <bean id="faceletsViewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver"> - <property name="viewClass" value="org.springframework.faces.mvc.JsfView"/> - <property name="prefix" value="/WEB-INF/" /> - <property name="suffix" value=".xhtml" /> - </bean> - - <!-- Dispatches requests mapped to org.springframework.web.servlet.mvc.Controller implementations --> - <bean class="org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter" /> - - <!-- Dispatches requests mapped to flows to FlowHandler implementations --> - <bean class="org.springframework.faces.webflow.JsfFlowHandlerAdapter"> - <property name="flowExecutor" ref="flowExecutor" /> - </bean> - -</beans> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/faces-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/faces-config.xml deleted file mode 100644 index 28932364..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/faces-config.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" - version="2.0"> - - <application> - <message-bundle>JsfMessageResources</message-bundle> - </application> - -</faces-config> diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/booking-flow.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/booking-flow.xml deleted file mode 100755 index 5deff5b6..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/booking-flow.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<flow xmlns="http://www.springframework.org/schema/webflow" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" - http://www.springframework.org/schema/webflow - http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd"> - - <secured attributes="ROLE_USER" /> - - <input name="hotelId" required="true" /> - - <on-start> - <evaluate expression="bookingService.createBooking(hotelId, currentUser.name)" result="flowScope.booking" /> - </on-start> - - <view-state id="enterBookingDetails" model="booking"> - <transition on="proceed" to="reviewBooking" /> - <transition on="cancel" to="bookingCancelled" bind="false" /> - </view-state> - - <view-state id="reviewBooking"> - <transition on="confirm" to="bookingConfirmed"> - <evaluate expression="bookingService.persistBooking(booking)" /> - </transition> - <transition on="revise" to="enterBookingDetails" /> - <transition on="cancel" to="bookingCancelled" /> - </view-state> - - <end-state id="bookingConfirmed" /> - - <end-state id="bookingCancelled" /> - -</flow> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml deleted file mode 100644 index fe286ec7..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml +++ /dev/null @@ -1,141 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:p="http://primefaces.org/ui" - template="/WEB-INF/layouts/standard.xhtml"> -<ui:define name="notes"> - <p> - Check the calendar widget and the tooltips on the credit card fields. - The form uses Ajax-based validations to redisplay server-side errors without refreshing the entire page. - The booking bean backing the form is a flow-scoped object (see <strong>booking-flow.xml</strong>). - </p> -</ui:define> -<ui:define name="content"> - <h:form id="bookingForm"> - <p:fieldset legend="Hotel Reservation Form"> - <p:messages /> - <div class="large"> - ${booking.hotel.name}, - ${booking.hotel.address} - ${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip} - ${booking.hotel.country} - </div> - <hr/> - <div> - <div class="span-4 label"> - <h:outputLabel for="price">Nightly Rate:</h:outputLabel> - </div> - <div class="span-14 last"> - <p> - <h:outputText id="price" value="#{booking.hotel.price}"> - <f:convertNumber type="currency" currencySymbol="$"/> - </h:outputText> - </p> - </div> - </div> - <div class="field"> - <div class="span-4"> - <h:outputLabel for="checkinDate">Check In:</h:outputLabel> - </div> - <div class="span-5"> - <p> - <p:calendar id="checkinDate" label="Check in date" - value="#{booking.checkinDate}" pattern="MM-dd-yyyy" timeZone="EST" required="true" /> - </p> - </div> - <div class="span-4"> - <h:outputLabel for="checkoutDate">Check Out:</h:outputLabel> - </div> - <div class="span-5 last"> - <p> - <p:calendar id="checkoutDate" label="Check out date" - value="#{booking.checkoutDate}" pattern="MM-dd-yyyy" timeZone="EST" required="true" /> - </p> - </div> - </div> - <div class="field"> - <div class="span-4"> - <h:outputLabel for="beds">Room Preference:</h:outputLabel> - </div> - <div class="span-5"> - <p> - <h:selectOneMenu id="beds" value="#{booking.beds}"> - <f:selectItems value="#{referenceData.bedOptions}"/> - </h:selectOneMenu> - </p> - </div> - <div class="span-4"> - <h:outputLabel for="smoking">Smoking:</h:outputLabel> - </div> - <div id="radio" class="span-5 last"> - <h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection"> - <f:selectItems value="#{referenceData.smokingOptions}"/> - </h:selectOneRadio> - </div> - </div> - <!-- - The "amenities" section commented out due to the following issue: - - https://issues.apache.org/jira/browse/MYFACES-2739 - https://javaserverfaces-spec-public.dev.java.net/issues/show_bug.cgi?id=817 - https://javaserverfaces.dev.java.net/issues/show_bug.cgi?id=1694 - - <div class="field"> - <div class="span-4"> - <h:outputLabel for="amenities">Amenities:</h:outputLabel> - </div> - <div class="span-11 last"> - <h:selectManyCheckbox id="amenities" value="#{booking.amenities}" layout="pageDirection"> - <f:selectItem itemValue="OCEAN_VIEW" itemLabel="Ocean View" /> - <f:selectItem itemValue="LATE_CHECKOUT" itemLabel="Late Checkout" /> - <f:selectItem itemValue="MINIBAR" itemLabel="Minibar" /> - </h:selectManyCheckbox> - </div> - </div> - - --> - <div class="field"> - <div class="span-4"> - <h:outputLabel for="creditCard">Credit Card Number:</h:outputLabel> - </div> - <div class="span-5"> - <p> - <h:inputText id="creditCard" label="Credit card number" value="#{booking.creditCard}" /> - <p:tooltip for="creditCard" value="16-digit credit card number." style="cream" position="bottomLeft" /> - </p> - </div> - <div class="span-4"> - <h:outputLabel for="creditCardName">Credit Card Name:</h:outputLabel> - </div> - <div class="span-5 last"> - <p> - <h:inputText id="creditCardName" label="Credit card name" value="#{booking.creditCardName}"/> - <p:tooltip for="creditCardName" value="The name as it appears on the credit card" style="cream" /> - </p> - </div> - </div> - <div class="field"> - <div class="span-4"> - <h:outputLabel for="creditCardExpiryMonth">Expiration Date:</h:outputLabel> - </div> - <div class="span-14 last"> - <p> - <h:selectOneMenu id="creditCardExpiryMonth" value="#{booking.creditCardExpiryMonth}"> - <f:selectItems value="#{referenceData.creditCardExpMonths}" /> - </h:selectOneMenu>  - <h:selectOneMenu id="creditCardExpiryYear" value="#{booking.creditCardExpiryYear}"> - <f:selectItems value="#{referenceData.creditCardExpYears}"/> - </h:selectOneMenu> - </p> - </div> - </div> - <div> - <p:commandButton id="proceed" action="proceed" value="Proceed" update="@form" /> - <p:commandButton id="cancel" value="Cancel" action="cancel" immediate="true" /> - </div> - </p:fieldset> - </h:form> -</ui:define> -</ui:composition> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/messages.properties b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/messages.properties deleted file mode 100644 index cbae4eb3..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/messages.properties +++ /dev/null @@ -1,2 +0,0 @@ -booking.checkinDate.beforeToday=The Check In Date must be a future date -booking.checkoutDate.beforeCheckinDate=The Check Out Date must be later than the Check In Date diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/reviewBooking.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/reviewBooking.xhtml deleted file mode 100755 index 1f150988..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/reviewBooking.xhtml +++ /dev/null @@ -1,83 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:p="http://primefaces.org/ui" - template="/WEB-INF/layouts/standard.xhtml"> -<ui:define name="notes"> - <p> - Note that the command button actions raise events (e.g. "revise") instead of specifying method expressions. - The events result in transitions on the server side (see reviewBooking state in <strong>booking-flow.xml</strong>). - </p> -</ui:define> -<ui:define name="content"> - <div class="span-5"> - <h3>${booking.hotel.name}</h3> - <address> - ${booking.hotel.address} - <br/> - ${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip} - <br/> - ${booking.hotel.country} - </address> - </div> - <div class="span-12 last"> - <h:form> - <p:fieldset legend="Confirm Booking Details"> - <div> - <div class="span-3">Check In:</div> - <div class="span-8 last"> - <p> - <h:outputText value="#{booking.checkinDate}"> - <f:convertDateTime dateStyle="short"/> - </h:outputText> - </p> - </div> - </div> - <div> - <div class="span-3">Check Out:</div> - <div class="span-8 last"> - <p> - <h:outputText value="#{booking.checkoutDate}"> - <f:convertDateTime dateStyle="short"/> - </h:outputText> - </p> - </div> - </div> - <div> - <div class="span-3">Nights:</div> - <div class="span-8 last"> - <p> - <h:outputText value="#{booking.nights}"/> - </p> - </div> - </div> - <div> - <div class="span-3">Total payment:</div> - <div class="span-8 last"> - <p> - <h:outputText value="#{booking.total}"> - <f:convertNumber type="currency" currencySymbol="$"/> - </h:outputText> - </p> - </div> - </div> - <div> - <div class="span-3">Credit Card:</div> - <div class="span-8 last"> - <p> - #{booking.creditCard} - </p> - </div> - </div> - <div> - <p:commandButton id="confirm" value="Confirm" action="confirm"/>  - <p:commandButton id="revise" value="Revise" action="revise"/>  - <p:commandButton id="cancel" value="Cancel" action="cancel" /> - </div> - </p:fieldset> - </h:form> - </div> -</ui:define> -</ui:composition> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml deleted file mode 100644 index 1d8e38b0..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml +++ /dev/null @@ -1,74 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:p="http://primefaces.org/ui" - template="/WEB-INF/layouts/standard.xhtml"> - -<ui:define name="notes"> - <p> - This page uses the PrimeFaces panel component to display a search form. - Mouse over the "Search String" field to see its tooltip. - If you are logged a second panel will show your current bookings. - Both panels can be toggled on and off. - </p> -</ui:define> - -<ui:define name="content"> - - <p:panel header="Search Hotels" toggleable="true" toggleSpeed="100"> - <h:form> - <p:messages globalOnly="true" /> - <h:panelGrid columns="2"> - <h:outputLabel for="searchString">Search String: </h:outputLabel> - <h:inputText id="searchString" value="#{searchCriteria.searchString}" /> - <h:outputLabel for="pageSize">Maximum Results: </h:outputLabel> - <h:selectOneMenu id="pageSize" value="#{searchCriteria.pageSize}"> - <f:selectItems value="#{referenceData.pageSizeOptions}" /> - </h:selectOneMenu> - <p:commandButton id="findHotels" value="Find Hotels" action="search" update="@form" /> - </h:panelGrid> - <p:tooltip for="searchString" targetPosition="topRight" position="bottomLeft" - value="Search hotels by name, address, city, or zip." style="cream" /> - </h:form> - </p:panel> - - <p:panel id="bookings" header="Your Hotel Bookings" rendered="#{currentUser!=null}" toggleable="true" toggleSpeed="100" style="margin-top: 10px"> - <h:outputText value="No Bookings Found" rendered="#{bookings.rowCount==0}"/> - <h:form rendered="#{bookings.rowCount > 0}"> - <p:outputPanel id="bookingsContent"> - <p:dataTable value="#{bookings}" var="booking"> - <p:column> - <f:facet name="header">Hotel</f:facet> - #{booking.hotel.name}<br/> - #{booking.hotel.address}<br/> - #{booking.hotel.city}, #{booking.hotel.state} - </p:column> - <p:column> - <f:facet name="header">Check in</f:facet> - <h:outputText value="#{booking.checkinDate}"> - <f:convertDateTime dateStyle="short"/> - </h:outputText> - </p:column> - <p:column> - <f:facet name="header">Check out</f:facet> - <h:outputText value="#{booking.checkoutDate}"> - <f:convertDateTime dateStyle="short"/> - </h:outputText> - </p:column> - <p:column> - <f:facet name="header">Confirmation #</f:facet> - #{booking.id} - </p:column> - <p:column> - <f:facet name="header">Action</f:facet> - <p:commandButton id="cancel" value="Cancel" action="cancelBooking" update=":bookings"/> - </p:column> - </p:dataTable> - </p:outputPanel> - </h:form> - </p:panel> - -</ui:define> -</ui:composition> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main-flow.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main-flow.xml deleted file mode 100755 index 0ad4cc84..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main-flow.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<flow xmlns="http://www.springframework.org/schema/webflow" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation=" - http://www.springframework.org/schema/webflow - http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd"> - - <var name="searchCriteria" class="org.springframework.webflow.samples.booking.SearchCriteria" /> - - <view-state id="enterSearchCriteria"> - <on-render> - <evaluate expression="bookingService.findBookings(currentUser?.name)" result="viewScope.bookings" result-type="dataModel" /> - </on-render> - <transition on="search" to="reviewHotels"/> - <transition on="cancelBooking"> - <evaluate expression="bookingService.cancelBooking(bookings.selectedRow)" /> - </transition> - </view-state> - - <view-state id="reviewHotels"> - <on-entry> - <set name="viewScope.hotels" value="searchCriteria.getDataModel(bookingService)" /> - </on-entry> - <transition on="select" to="reviewHotel"> - <set name="flowScope.hotel" value="hotels.selected" /> - </transition> - <transition on="changeSearch" to="enterSearchCriteria" /> - </view-state> - - <view-state id="reviewHotel"> - <transition on="book" to="bookHotel" /> - <transition on="cancel" to="reviewHotels" /> - </view-state> - - <subflow-state id="bookHotel" subflow="booking"> - <input name="hotelId" value="hotel.id" /> - <transition on="bookingConfirmed" to="finish" /> - <transition on="bookingCancelled" to="enterSearchCriteria" /> - </subflow-state> - - <end-state id="finish" /> - -</flow> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml deleted file mode 100644 index cbe13aa2..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml +++ /dev/null @@ -1,43 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:p="http://primefaces.org/ui" - template="/WEB-INF/layouts/standard.xhtml"> -<ui:define name="notes"> - <p> - Clicking "Book" will launch the booking sub-flow (see the subflow state in <strong>main-flow.xml</strong>). - </p> - <p> - The booking flow is protected with Spring Security (see the secured attribute in <strong>booking-flow.xml</strong>). - </p> - <p> - Clicking "Back to Search" will take you to the stateful search results. - </p> -</ui:define> -<ui:define name="content"> - <h1>${hotel.name}</h1> - <address> - ${hotel.address} - <br /> - ${hotel.city} - <br /> - ${hotel.state} ${hotel.zip} - <br /> - ${hotel.country} - </address> - <h:form id="hotel"> - <div> - Nightly Rate:  - <h:outputText value="#{hotel.price}"> - <f:convertNumber type="currency" currencySymbol="$"/> - </h:outputText> - </div> - <div> - <p:commandButton id="book" action="book" value="Book Hotel" ajax="false" /> - <p:commandButton id="cancel" action="cancel" value="Back to Search"/> - </div> - </h:form> -</ui:define> -</ui:composition> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml deleted file mode 100644 index 8a79fe30..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml +++ /dev/null @@ -1,52 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:p="http://primefaces.org/ui" - template="/WEB-INF/layouts/standard.xhtml"> -<ui:define name="notes"> - <p> - This page uses the PrimeFaces data table backed by a lazily loaded DataModel (see <strong>HotelLazyDataModel.java</strong>). - Page navigation is Ajax-based and uses JSF 2 partial rendering. - The name and city columns support forward and reverse sorting. - </p> - <p> - The DataModel is created and stored in view scope when the view is first entered (see <strong>main-flow.xml</strong>). - When the user makes a selection, the selection is stored in a flow-scoped "hotel" variable before transitioning to the detail page. - </p> -</ui:define> -<ui:define name="content"> -<h:form> - <p:dataTable id="hotels" var="h" value="#{hotels}" paginator="true" dynamic="true" - rows="#{hotels.pageSize}" page="#{hotels.currentPage}"> - <f:facet name="header"> - Hotel Search Results<br/> - <p:commandLink value="Modify or start search again" action="changeSearch" styleClass="alt" /> - </f:facet> - <p:column sortBy="#{h.name}"> - <f:facet name="header">Name</f:facet> - #{h.name} - </p:column> - <p:column> - <f:facet name="header">Address</f:facet> - #{h.address} - </p:column> - <p:column sortBy="#{h.city}"> - <f:facet name="header">City, State</f:facet> - #{h.city}, #{h.state}, #{h.country} - </p:column> - <p:column> - <f:facet name="header">Zip</f:facet> - #{h.zip} - </p:column> - <p:column> - <f:facet name="header">Action</f:facet> - <p:commandButton id="viewHotelLink" value="View" action="select" icon="ui-icon-search"> - <f:setPropertyActionListener value="#{h}" target="#{hotels.selected}" /> - </p:commandButton> - </p:column> - </p:dataTable> -</h:form> -</ui:define> -</ui:composition> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/intro.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/intro.xhtml deleted file mode 100755 index d9e3852a..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/intro.xhtml +++ /dev/null @@ -1,44 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:sf="http://www.springframework.org/tags/faces" - template="layouts/standard.xhtml"> - -<ui:define name="notes"> - <p> - This is a simple standalone JSF page. - </p> - <p> - Clicking the "Start" link below will launch the main to search for hotels (see <strong>main-flow.xml</strong>). - The main flow in turn launches the booking sub-flow to book the hotel (see <strong>booking-flow.xml</strong>). - </p> - <p> - The main flow is accessible without logging in while the booking flow requires authentication. - </p> -</ui:define> - -<ui:define name="content"> -<div> - <h1>Welcome to Spring Travel</h1> - <h3 class="alt">Spring Web Flow and JSF 2 with PrimeFaces components</h3> - <hr /> - <p> - Key features illustrated in this sample: - </p> - <ul> - <li>A declarative navigation model enabling full browser button support and dynamic navigation rules</li> - <li>A fine-grained state management model, including support for conversation, view, and flash scopes</li> - <li>Partial page rendering via Ajax with JSF 2</li> - <li>Modularization of web application functionality by domain use case, illustrating project structure best-practices</li> - <li>Spring Security integration</li> - <li>Page layout with Blueprint CSS</li> - <li>Exception handling support across all layers of the application</li> - </ul> - <p> - <a href="main">Start your Spring Travel experience</a> - </p> -</div> -</ui:define> -</ui:composition> \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml deleted file mode 100644 index bb14d6b4..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml +++ /dev/null @@ -1,63 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:p="http://primefaces.org/ui"> - -<f:view contentType="text/html"> - -<h:head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>Spring Faces: Hotel Booking Sample Application - - - - - - - - -
-
-

- - Welcome, ${currentUser.name} | Logout - - - Login - -

-
-
- Spring Travel -
-
-
-
-

Comments:

- -
-
- -
-
-
-
- - Powered by Spring - -
-
- - - diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/login.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/login.xhtml deleted file mode 100755 index b37fb945..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/login.xhtml +++ /dev/null @@ -1,58 +0,0 @@ - - - -

- Form-based authentication with Spring Security. - Spring Security is first enabled in web.xml via DelegatingFilterProxy. - It's configuration is located in security-config.xml. - Flow definitions can further be protected using the secured attribute (see booking-flow.xml). -

- - -
-

Valid username/passwords are:

-
    -
  • keith/melbourne
    • -
  • erwin/leuven
    • -
  • jeremy/atlanta
    • -
  • scott/rochester
    • -
-
-
- -
- Your login attempt was not successful, try again.
- Reason: #{sessionScope.SPRING_SECURITY_LAST_EXCEPTION.message} -
- -
-
- Login Information -

- User: -
- - - - -

-

- Password: -
- -

-

- - Don't ask for my password for two weeks: -

-

- -

-
-
-
- - \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/logoutSuccess.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/logoutSuccess.xhtml deleted file mode 100755 index 618425ae..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/logoutSuccess.xhtml +++ /dev/null @@ -1,14 +0,0 @@ - - - - -
-

Logout

-

You have successfully logged out.

-
-

Continue

-
- - \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/springsecurity.taglib.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/springsecurity.taglib.xml deleted file mode 100644 index ea37d89f..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/springsecurity.taglib.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - http://www.springframework.org/security/tags - - authorize - org.springframework.faces.security.FaceletsAuthorizeTagHandler - - - areAllGranted - org.springframework.faces.security.FaceletsAuthorizeTagUtils - boolean areAllGranted(java.lang.String) - - - areAnyGranted - org.springframework.faces.security.FaceletsAuthorizeTagUtils - boolean areAnyGranted(java.lang.String) - - - areNotGranted - org.springframework.faces.security.FaceletsAuthorizeTagUtils - boolean areNotGranted(java.lang.String) - - - isAllowed - org.springframework.faces.security.FaceletsAuthorizeTagUtils - boolean isAllowed(java.lang.String, java.lang.String) - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web.xml deleted file mode 100755 index d9678838..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - contextConfigLocation - - /WEB-INF/config/web-application-config.xml - - - - - - javax.faces.DEFAULT_SUFFIX - .xhtml - - - - - javax.faces.PROJECT_STAGE - Development - - - - - javax.faces.FACELETS_REFRESH_PERIOD - 1 - - - - - - - - javax.faces.FACELETS_LIBRARIES - /WEB-INF/springsecurity.taglib.xml - - - - - charEncodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - forceEncoding - true - - - - - charEncodingFilter - /* - - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - springSecurityFilterChain - /* - - - - - org.springframework.web.context.ContextLoaderListener - - - - - Spring MVC Dispatcher Servlet - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - - - 2 - - - - - Spring MVC Dispatcher Servlet - /spring/* - - - - - Faces Servlet - javax.faces.webapp.FacesServlet - 1 - - - - - Faces Servlet - *.faces - - - - index.html - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/images/bg.gif b/spring-webflow-samples/booking-faces/src/main/webapp/images/bg.gif deleted file mode 100644 index 013cfa6f..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/images/bg.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/images/btn.bg.gif b/spring-webflow-samples/booking-faces/src/main/webapp/images/btn.bg.gif deleted file mode 100644 index 83516847..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/images/btn.bg.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/images/diplomat.jpg b/spring-webflow-samples/booking-faces/src/main/webapp/images/diplomat.jpg deleted file mode 100644 index e1d0c9cd..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/images/diplomat.jpg and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/images/header.jpg b/spring-webflow-samples/booking-faces/src/main/webapp/images/header.jpg deleted file mode 100644 index 6893bd89..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/images/header.jpg and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/images/input.bg.gif b/spring-webflow-samples/booking-faces/src/main/webapp/images/input.bg.gif deleted file mode 100644 index 8ebf87e3..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/images/input.bg.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/images/powered-by-spring.png b/spring-webflow-samples/booking-faces/src/main/webapp/images/powered-by-spring.png deleted file mode 100644 index e773b170..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/images/powered-by-spring.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/images/springone2gx.jpeg b/spring-webflow-samples/booking-faces/src/main/webapp/images/springone2gx.jpeg deleted file mode 100644 index b43bcb28..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/images/springone2gx.jpeg and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/images/th.bg.gif b/spring-webflow-samples/booking-faces/src/main/webapp/images/th.bg.gif deleted file mode 100644 index 4663cf51..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/images/th.bg.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/images/tse.gif b/spring-webflow-samples/booking-faces/src/main/webapp/images/tse.gif deleted file mode 100644 index b1fa98cf..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/images/tse.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/index.html b/spring-webflow-samples/booking-faces/src/main/webapp/index.html deleted file mode 100755 index fce35507..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/index.html +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/icons/cross.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/icons/cross.png deleted file mode 100755 index 1514d51a..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/icons/cross.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/icons/key.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/icons/key.png deleted file mode 100755 index a9d5e4f8..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/icons/key.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/icons/tick.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/icons/tick.png deleted file mode 100755 index a9925a06..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/icons/tick.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/ie.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/ie.css deleted file mode 100755 index bbc1e5c1..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/ie.css +++ /dev/null @@ -1,36 +0,0 @@ -/* ----------------------------------------------------------------------- - - - Blueprint CSS Framework 0.9 - http://blueprintcss.org - - * Copyright (c) 2007-Present. See LICENSE for more info. - * See README for instructions on how to use Blueprint. - * For credits and origins, see AUTHORS. - * This is a compressed file. See the sources in the 'src' directory. - ------------------------------------------------------------------------ */ - -/* ie.css */ -body {text-align:center;} -.container {text-align:left;} -* html .column, * html div.span-1, * html div.span-2, * html div.span-3, * html div.span-4, * html div.span-5, * html div.span-6, * html div.span-7, * html div.span-8, * html div.span-9, * html div.span-10, * html div.span-11, * html div.span-12, * html div.span-13, * html div.span-14, * html div.span-15, * html div.span-16, * html div.span-17, * html div.span-18, * html div.span-19, * html div.span-20, * html div.span-21, * html div.span-22, * html div.span-23, * html div.span-24 {display:inline;overflow-x:hidden;} -* html legend {margin:0px -8px 16px 0;padding:0;} -ol {margin-left:2em;} -sup {vertical-align:text-top;} -sub {vertical-align:text-bottom;} -html>body p code {*white-space:normal;} -hr {margin:-8px auto 11px;} -img {-ms-interpolation-mode:bicubic;} -.clearfix, .container {display:inline-block;} -* html .clearfix, * html .container {height:1%;} -fieldset {padding-top:0;} -textarea {overflow:auto;} -input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;} -input.text:focus, input.title:focus {border-color:#666;} -input.text, input.title, textarea, select {margin:0.5em 0;} -input.checkbox, input.radio {position:relative;top:.25em;} -form.inline div, form.inline p {vertical-align:middle;} -form.inline label {position:relative;top:-0.25em;} -form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;} -button, input.button {position:relative;top:0.25em;} \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/icons/cross.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/icons/cross.png deleted file mode 100755 index 1514d51a..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/icons/cross.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/icons/key.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/icons/key.png deleted file mode 100755 index a9d5e4f8..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/icons/key.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/icons/tick.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/icons/tick.png deleted file mode 100755 index a9925a06..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/icons/tick.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/readme.txt b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/readme.txt deleted file mode 100755 index a8c2b570..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/readme.txt +++ /dev/null @@ -1,32 +0,0 @@ -Buttons - -* Gives you great looking CSS buttons, for both and - - - Change Password - - - - Cancel - diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/screen.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/screen.css deleted file mode 100755 index bb66b215..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/buttons/screen.css +++ /dev/null @@ -1,97 +0,0 @@ -/* -------------------------------------------------------------- - - buttons.css - * Gives you some great CSS-only buttons. - - Created by Kevin Hale [particletree.com] - * particletree.com/features/rediscovering-the-button-element - - See Readme.txt in this folder for instructions. - --------------------------------------------------------------- */ - -a.button, button { - display:block; - float:left; - margin: 0.7em 0.5em 0.7em 0; - padding:5px 10px 5px 7px; /* Links */ - - border:1px solid #dedede; - border-top:1px solid #eee; - border-left:1px solid #eee; - - background-color:#f5f5f5; - font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif; - font-size:100%; - line-height:130%; - text-decoration:none; - font-weight:bold; - color:#565656; - cursor:pointer; -} -button { - width:auto; - overflow:visible; - padding:4px 10px 3px 7px; /* IE6 */ -} -button[type] { - padding:4px 10px 4px 7px; /* Firefox */ - line-height:17px; /* Safari */ -} -*:first-child+html button[type] { - padding:4px 10px 3px 7px; /* IE7 */ -} -button img, a.button img{ - margin:0 3px -3px 0 !important; - padding:0; - border:none; - width:16px; - height:16px; - float:none; -} - - -/* Button colors --------------------------------------------------------------- */ - -/* Standard */ -button:hover, a.button:hover{ - background-color:#dff4ff; - border:1px solid #c2e1ef; - color:#336699; -} -a.button:active{ - background-color:#6299c5; - border:1px solid #6299c5; - color:#fff; -} - -/* Positive */ -body .positive { - color:#529214; -} -a.positive:hover, button.positive:hover { - background-color:#E6EFC2; - border:1px solid #C6D880; - color:#529214; -} -a.positive:active { - background-color:#529214; - border:1px solid #529214; - color:#fff; -} - -/* Negative */ -body .negative { - color:#d12f19; -} -a.negative:hover, button.negative:hover { - background-color:#fbe3e4; - border:1px solid #fbc2c4; - color:#d12f19; -} -a.negative:active { - background-color:#d12f19; - border:1px solid #d12f19; - color:#fff; -} diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/fancy-type/readme.txt b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/fancy-type/readme.txt deleted file mode 100755 index 85f24915..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/fancy-type/readme.txt +++ /dev/null @@ -1,14 +0,0 @@ -Fancy Type - -* Gives you classes to use if you'd like some - extra fancy typography. - -Credits and instructions are specified above each class -in the fancy-type.css file in this directory. - - -Usage ----------------------------------------------------------------- - -1) Add this plugin to lib/settings.yml. - See compress.rb for instructions. diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/fancy-type/screen.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/fancy-type/screen.css deleted file mode 100755 index 028e05bb..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/fancy-type/screen.css +++ /dev/null @@ -1,71 +0,0 @@ -/* -------------------------------------------------------------- - - fancy-type.css - * Lots of pretty advanced classes for manipulating text. - - See the Readme file in this folder for additional instructions. - --------------------------------------------------------------- */ - -/* Indentation instead of line shifts for sibling paragraphs. */ - p + p { text-indent:2em; margin-top:-1.5em; } - form p + p { text-indent: 0; } /* Don't want this in forms. */ - - -/* For great looking type, use this code instead of asdf: - asdf - Best used on prepositions and ampersands. */ - -.alt { - color: #666; - font-family: "Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua", Georgia, serif; - font-style: italic; - font-weight: normal; -} - - -/* For great looking quote marks in titles, replace "asdf" with: - “asdf” - (That is, when the title starts with a quote mark). - (You may have to change this value depending on your font size). */ - -.dquo { margin-left: -.5em; } - - -/* Reduced size type with incremental leading - (http://www.markboulton.co.uk/journal/comments/incremental_leading/) - - This could be used for side notes. For smaller type, you don't necessarily want to - follow the 1.5x vertical rhythm -- the line-height is too much. - - Using this class, it reduces your font size and line-height so that for - every four lines of normal sized type, there is five lines of the sidenote. eg: - - New type size in em's: - 10px (wanted side note size) / 12px (existing base size) = 0.8333 (new type size in ems) - - New line-height value: - 12px x 1.5 = 18px (old line-height) - 18px x 4 = 72px - 72px / 5 = 14.4px (new line height) - 14.4px / 10px = 1.44 (new line height in em's) */ - -p.incr, .incr p { - font-size: 10px; - line-height: 1.44em; - margin-bottom: 1.5em; -} - - -/* Surround uppercase words and abbreviations with this class. - Based on work by Jørgen Arnor GÃ¥rdsø Lom [http://twistedintellect.com/] */ - -.caps { - font-variant: small-caps; - letter-spacing: 1px; - text-transform: lowercase; - font-size:1.2em; - line-height:1%; - font-weight:bold; - padding:0 2px; -} diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/doc.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/doc.png deleted file mode 100755 index 834cdfaf..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/doc.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/email.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/email.png deleted file mode 100755 index 7348aed7..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/email.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/external.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/external.png deleted file mode 100755 index cf1cfb42..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/external.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/feed.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/feed.png deleted file mode 100755 index 315c4f4f..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/feed.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/im.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/im.png deleted file mode 100755 index 79f35ccb..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/im.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/pdf.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/pdf.png deleted file mode 100755 index 8f8095e4..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/pdf.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/visited.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/visited.png deleted file mode 100755 index ebf206de..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/visited.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/xls.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/xls.png deleted file mode 100755 index b977d7e5..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/icons/xls.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/readme.txt b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/readme.txt deleted file mode 100755 index 3cb1b2ce..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/readme.txt +++ /dev/null @@ -1,18 +0,0 @@ -Link Icons -* Icons for links based on protocol or file type. - -This is not supported in IE versions < 7. - - -Credits ----------------------------------------------------------------- - -* Marc Morgan -* Olav Bjorkoy [bjorkoy.com] - - -Usage ----------------------------------------------------------------- - -1) Add this line to your HTML: - \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/screen.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/screen.css deleted file mode 100755 index 6d3d47fa..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/link-icons/screen.css +++ /dev/null @@ -1,40 +0,0 @@ -/* -------------------------------------------------------------- - - link-icons.css - * Icons for links based on protocol or file type. - - See the Readme file in this folder for additional instructions. - --------------------------------------------------------------- */ - -/* Use this class if a link gets an icon when it shouldn't. */ -body a.noicon { - background:transparent none !important; - padding:0 !important; - margin:0 !important; -} - -/* Make sure the icons are not cut */ -a[href^="http:"], a[href^="mailto:"], a[href^="http:"]:visited, -a[href$=".pdf"], a[href$=".doc"], a[href$=".xls"], a[href$=".rss"], -a[href$=".rdf"], a[href^="aim:"] { - padding:2px 22px 2px 0; - margin:-2px 0; - background-repeat: no-repeat; - background-position: right center; -} - -/* External links */ -a[href^="http:"] { background-image: url(icons/external.png); } -a[href^="mailto:"] { background-image: url(icons/email.png); } -a[href^="http:"]:visited { background-image: url(icons/visited.png); } - -/* Files */ -a[href$=".pdf"] { background-image: url(icons/pdf.png); } -a[href$=".doc"] { background-image: url(icons/doc.png); } -a[href$=".xls"] { background-image: url(icons/xls.png); } - -/* Misc */ -a[href$=".rss"], -a[href$=".rdf"] { background-image: url(icons/feed.png); } -a[href^="aim:"] { background-image: url(icons/im.png); } \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/rtl/readme.txt b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/rtl/readme.txt deleted file mode 100755 index 4c465352..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/rtl/readme.txt +++ /dev/null @@ -1,10 +0,0 @@ -RTL -* Mirrors Blueprint, so it can be used with Right-to-Left languages. - -By Ran Yaniv Hartstein, ranh.co.il - -Usage ----------------------------------------------------------------- - -1) Add this line to your HTML: - \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/rtl/screen.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/rtl/screen.css deleted file mode 100755 index 7e7ccdb8..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/plugins/rtl/screen.css +++ /dev/null @@ -1,110 +0,0 @@ -/* -------------------------------------------------------------- - - rtl.css - * Mirrors Blueprint for left-to-right languages - - By Ran Yaniv Hartstein [ranh.co.il] - --------------------------------------------------------------- */ - -body .container { direction: rtl; } -body .column, body div.span-1, body div.span-2, body div.span-3, body div.span-4, body div.span-5, body div.span-6, body div.span-7, body div.span-8, body div.span-9, body div.span-10, body div.span-11, body div.span-12, body div.span-13, body div.span-14, body div.span-15, body div.span-16, body div.span-17, body div.span-18, body div.span-19, body div.span-20, body div.span-21, body div.span-22, body div.span-23, body div.span-24 { - float: right; - margin-right: 0; - margin-left: 10px; - text-align:right; -} - -body div.last { margin-left: 0; } -body table .last { padding-left: 0; } - -body .append-1 { padding-right: 0; padding-left: 40px; } -body .append-2 { padding-right: 0; padding-left: 80px; } -body .append-3 { padding-right: 0; padding-left: 120px; } -body .append-4 { padding-right: 0; padding-left: 160px; } -body .append-5 { padding-right: 0; padding-left: 200px; } -body .append-6 { padding-right: 0; padding-left: 240px; } -body .append-7 { padding-right: 0; padding-left: 280px; } -body .append-8 { padding-right: 0; padding-left: 320px; } -body .append-9 { padding-right: 0; padding-left: 360px; } -body .append-10 { padding-right: 0; padding-left: 400px; } -body .append-11 { padding-right: 0; padding-left: 440px; } -body .append-12 { padding-right: 0; padding-left: 480px; } -body .append-13 { padding-right: 0; padding-left: 520px; } -body .append-14 { padding-right: 0; padding-left: 560px; } -body .append-15 { padding-right: 0; padding-left: 600px; } -body .append-16 { padding-right: 0; padding-left: 640px; } -body .append-17 { padding-right: 0; padding-left: 680px; } -body .append-18 { padding-right: 0; padding-left: 720px; } -body .append-19 { padding-right: 0; padding-left: 760px; } -body .append-20 { padding-right: 0; padding-left: 800px; } -body .append-21 { padding-right: 0; padding-left: 840px; } -body .append-22 { padding-right: 0; padding-left: 880px; } -body .append-23 { padding-right: 0; padding-left: 920px; } - -body .prepend-1 { padding-left: 0; padding-right: 40px; } -body .prepend-2 { padding-left: 0; padding-right: 80px; } -body .prepend-3 { padding-left: 0; padding-right: 120px; } -body .prepend-4 { padding-left: 0; padding-right: 160px; } -body .prepend-5 { padding-left: 0; padding-right: 200px; } -body .prepend-6 { padding-left: 0; padding-right: 240px; } -body .prepend-7 { padding-left: 0; padding-right: 280px; } -body .prepend-8 { padding-left: 0; padding-right: 320px; } -body .prepend-9 { padding-left: 0; padding-right: 360px; } -body .prepend-10 { padding-left: 0; padding-right: 400px; } -body .prepend-11 { padding-left: 0; padding-right: 440px; } -body .prepend-12 { padding-left: 0; padding-right: 480px; } -body .prepend-13 { padding-left: 0; padding-right: 520px; } -body .prepend-14 { padding-left: 0; padding-right: 560px; } -body .prepend-15 { padding-left: 0; padding-right: 600px; } -body .prepend-16 { padding-left: 0; padding-right: 640px; } -body .prepend-17 { padding-left: 0; padding-right: 680px; } -body .prepend-18 { padding-left: 0; padding-right: 720px; } -body .prepend-19 { padding-left: 0; padding-right: 760px; } -body .prepend-20 { padding-left: 0; padding-right: 800px; } -body .prepend-21 { padding-left: 0; padding-right: 840px; } -body .prepend-22 { padding-left: 0; padding-right: 880px; } -body .prepend-23 { padding-left: 0; padding-right: 920px; } - -body .border { - padding-right: 0; - padding-left: 4px; - margin-right: 0; - margin-left: 5px; - border-right: none; - border-left: 1px solid #eee; -} - -body .colborder { - padding-right: 0; - padding-left: 24px; - margin-right: 0; - margin-left: 25px; - border-right: none; - border-left: 1px solid #eee; -} - -body .pull-1 { margin-left: 0; margin-right: -40px; } -body .pull-2 { margin-left: 0; margin-right: -80px; } -body .pull-3 { margin-left: 0; margin-right: -120px; } -body .pull-4 { margin-left: 0; margin-right: -160px; } - -body .push-0 { margin: 0 18px 0 0; } -body .push-1 { margin: 0 18px 0 -40px; } -body .push-2 { margin: 0 18px 0 -80px; } -body .push-3 { margin: 0 18px 0 -120px; } -body .push-4 { margin: 0 18px 0 -160px; } -body .push-0, body .push-1, body .push-2, -body .push-3, body .push-4 { float: left; } - - -/* Typography with RTL support */ -body h1,body h2,body h3, -body h4,body h5,body h6 { font-family: Arial, sans-serif; } -html body { font-family: Arial, sans-serif; } -body pre,body code,body tt { font-family: monospace; } - -/* Mirror floats and margins on typographic elements */ -body p img { float: right; margin: 1.5em 0 1.5em 1.5em; } -body dd, body ul, body ol { margin-left: 0; margin-right: 1.5em;} -body td, body th { text-align:right; } \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/print.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/print.css deleted file mode 100755 index fdb82208..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/print.css +++ /dev/null @@ -1,29 +0,0 @@ -/* ----------------------------------------------------------------------- - - - Blueprint CSS Framework 0.9 - http://blueprintcss.org - - * Copyright (c) 2007-Present. See LICENSE for more info. - * See README for instructions on how to use Blueprint. - * For credits and origins, see AUTHORS. - * This is a compressed file. See the sources in the 'src' directory. - ------------------------------------------------------------------------ */ - -/* print.css */ -body {line-height:1.5;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;color:#000;background:none;font-size:10pt;} -.container {background:none;} -hr {background:#ccc;color:#ccc;width:100%;height:2px;margin:2em 0;padding:0;border:none;} -hr.space {background:#fff;color:#fff;visibility:hidden;} -h1, h2, h3, h4, h5, h6 {font-family:"Helvetica Neue", Arial, "Lucida Grande", sans-serif;} -code {font:.9em "Courier New", Monaco, Courier, monospace;} -a img {border:none;} -p img.top {margin-top:0;} -blockquote {margin:1.5em;padding:1em;font-style:italic;font-size:.9em;} -.small {font-size:.9em;} -.large {font-size:1.1em;} -.quiet {color:#999;} -.hide {display:none;} -a:link, a:visited {background:transparent;font-weight:700;text-decoration:underline;} -a:link:after, a:visited:after {content:" (" attr(href) ")";font-size:90%;} \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/screen.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/screen.css deleted file mode 100755 index c18b9a57..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/screen.css +++ /dev/null @@ -1,280 +0,0 @@ -/* ----------------------------------------------------------------------- - - - Blueprint CSS Framework 0.9 - http://blueprintcss.org - - * Copyright (c) 2007-Present. See LICENSE for more info. - * See README for instructions on how to use Blueprint. - * For credits and origins, see AUTHORS. - * This is a compressed file. See the sources in the 'src' directory. - ------------------------------------------------------------------------ */ - -/* reset.css */ -html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;} -body {line-height:1.5;} -table {border-collapse:separate;border-spacing:0;} -caption, th, td {text-align:left;font-weight:normal;} -table, td, th {vertical-align:middle;} -blockquote:before, blockquote:after, q:before, q:after {content:"";} -blockquote, q {quotes:"" "";} -a img {border:none;} - -/* typography.css */ -html {font-size:100.01%;} -body {font-size:75%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;} -h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;} -h1 {font-size:3em;line-height:1;margin-bottom:0.5em;} -h2 {font-size:2em;margin-bottom:0.75em;} -h3 {font-size:1.5em;line-height:1;margin-bottom:1em;} -h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;} -h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;} -h6 {font-size:1em;font-weight:bold;} -h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;} -p {margin:0 0 1.5em;} -p img.left {float:left;margin:1.5em 1.5em 1.5em 0;padding:0;} -p img.right {float:right;margin:1.5em 0 1.5em 1.5em;} -a:focus, a:hover {color:#000;} -a {color:#009;text-decoration:underline;} -blockquote {margin:1.5em;color:#666;font-style:italic;} -strong {font-weight:bold;} -em, dfn {font-style:italic;} -dfn {font-weight:bold;} -sup, sub {line-height:0;} -abbr, acronym {border-bottom:1px dotted #666;} -address {margin:0 0 1.5em;font-style:italic;} -del {color:#666;} -pre {margin:1.5em 0;white-space:pre;} -pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;} -li ul, li ol {margin:0 1.5em;} -ul, ol {margin:0 1.5em 1.5em 1.5em;} -ul {list-style-type:disc;} -ol {list-style-type:decimal;} -dl {margin:0 0 1.5em 0;} -dl dt {font-weight:bold;} -dd {margin-left:1.5em;} -table {margin-bottom:1.4em;width:100%;} -th {font-weight:bold;} -thead th {background:#c3d9ff;} -th, td, caption {padding:4px 10px 4px 5px;} -tr.even td {background:#e5ecf9;} -tfoot {font-style:italic;} -caption {background:#eee;} -.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;} -.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;} -.hide {display:none;} -.quiet {color:#666;} -.loud {color:#000;} -.highlight {background:#ff0;} -.added {background:#060;color:#fff;} -.removed {background:#900;color:#fff;} -.first {margin-left:0;padding-left:0;} -.last {margin-right:0;padding-right:0;} -.top {margin-top:0;padding-top:0;} -.bottom {margin-bottom:0;padding-bottom:0;} - -/* forms.css */ -label {font-weight:bold;} -fieldset {padding:1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;} -legend {font-weight:bold;font-size:1.2em;} -input[type=text], input[type=password], input.text, input.title, textarea, select {background-color:#fff;border:1px solid #bbb;} -input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus, select:focus {border-color:#666;} -input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;} -input.text, input.title {width:300px;padding:5px;} -input.title {font-size:1.5em;} -textarea {width:390px;height:250px;padding:5px;} -input[type=checkbox], input[type=radio], input.checkbox, input.radio {position:relative;top:.25em;} -form.inline {line-height:3;} -form.inline p {margin-bottom:0;} -.error, .notice, .success {padding:.8em;margin-bottom:1em;border:2px solid #ddd;} -.error {background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;} -.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;} -.success {background:#E6EFC2;color:#264409;border-color:#C6D880;} -.error a {color:#8a1f11;} -.notice a {color:#514721;} -.success a {color:#264409;} - -/* grid.css */ -.container {width:950px;margin:0 auto;} -.showgrid {background:url(src/grid.png);} -.column, div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24 {float:left;margin-right:10px;} -.last, div.last {margin-right:0;} -.span-1 {width:30px;} -.span-2 {width:70px;} -.span-3 {width:110px;} -.span-4 {width:150px;} -.span-5 {width:190px;} -.span-6 {width:230px;} -.span-7 {width:270px;} -.span-8 {width:310px;} -.span-9 {width:350px;} -.span-10 {width:390px;} -.span-11 {width:430px;} -.span-12 {width:470px;} -.span-13 {width:510px;} -.span-14 {width:550px;} -.span-15 {width:590px;} -.span-16 {width:630px;} -.span-17 {width:670px;} -.span-18 {width:710px;} -.span-19 {width:750px;} -.span-20 {width:790px;} -.span-21 {width:830px;} -.span-22 {width:870px;} -.span-23 {width:910px;} -.span-24, div.span-24 {width:950px;margin-right:0;} -input.span-1, textarea.span-1, input.span-2, textarea.span-2, input.span-3, textarea.span-3, input.span-4, textarea.span-4, input.span-5, textarea.span-5, input.span-6, textarea.span-6, input.span-7, textarea.span-7, input.span-8, textarea.span-8, input.span-9, textarea.span-9, input.span-10, textarea.span-10, input.span-11, textarea.span-11, input.span-12, textarea.span-12, input.span-13, textarea.span-13, input.span-14, textarea.span-14, input.span-15, textarea.span-15, input.span-16, textarea.span-16, input.span-17, textarea.span-17, input.span-18, textarea.span-18, input.span-19, textarea.span-19, input.span-20, textarea.span-20, input.span-21, textarea.span-21, input.span-22, textarea.span-22, input.span-23, textarea.span-23, input.span-24, textarea.span-24 {border-left-width:1px!important;border-right-width:1px!important;padding-left:5px!important;padding-right:5px!important;} -input.span-1, textarea.span-1 {width:18px!important;} -input.span-2, textarea.span-2 {width:58px!important;} -input.span-3, textarea.span-3 {width:98px!important;} -input.span-4, textarea.span-4 {width:138px!important;} -input.span-5, textarea.span-5 {width:178px!important;} -input.span-6, textarea.span-6 {width:218px!important;} -input.span-7, textarea.span-7 {width:258px!important;} -input.span-8, textarea.span-8 {width:298px!important;} -input.span-9, textarea.span-9 {width:338px!important;} -input.span-10, textarea.span-10 {width:378px!important;} -input.span-11, textarea.span-11 {width:418px!important;} -input.span-12, textarea.span-12 {width:458px!important;} -input.span-13, textarea.span-13 {width:498px!important;} -input.span-14, textarea.span-14 {width:538px!important;} -input.span-15, textarea.span-15 {width:578px!important;} -input.span-16, textarea.span-16 {width:618px!important;} -input.span-17, textarea.span-17 {width:658px!important;} -input.span-18, textarea.span-18 {width:698px!important;} -input.span-19, textarea.span-19 {width:738px!important;} -input.span-20, textarea.span-20 {width:778px!important;} -input.span-21, textarea.span-21 {width:818px!important;} -input.span-22, textarea.span-22 {width:858px!important;} -input.span-23, textarea.span-23 {width:898px!important;} -input.span-24, textarea.span-24 {width:938px!important;} -.append-1 {padding-right:40px;} -.append-2 {padding-right:80px;} -.append-3 {padding-right:120px;} -.append-4 {padding-right:160px;} -.append-5 {padding-right:200px;} -.append-6 {padding-right:240px;} -.append-7 {padding-right:280px;} -.append-8 {padding-right:320px;} -.append-9 {padding-right:360px;} -.append-10 {padding-right:400px;} -.append-11 {padding-right:440px;} -.append-12 {padding-right:480px;} -.append-13 {padding-right:520px;} -.append-14 {padding-right:560px;} -.append-15 {padding-right:600px;} -.append-16 {padding-right:640px;} -.append-17 {padding-right:680px;} -.append-18 {padding-right:720px;} -.append-19 {padding-right:760px;} -.append-20 {padding-right:800px;} -.append-21 {padding-right:840px;} -.append-22 {padding-right:880px;} -.append-23 {padding-right:920px;} -.prepend-1 {padding-left:40px;} -.prepend-2 {padding-left:80px;} -.prepend-3 {padding-left:120px;} -.prepend-4 {padding-left:160px;} -.prepend-5 {padding-left:200px;} -.prepend-6 {padding-left:240px;} -.prepend-7 {padding-left:280px;} -.prepend-8 {padding-left:320px;} -.prepend-9 {padding-left:360px;} -.prepend-10 {padding-left:400px;} -.prepend-11 {padding-left:440px;} -.prepend-12 {padding-left:480px;} -.prepend-13 {padding-left:520px;} -.prepend-14 {padding-left:560px;} -.prepend-15 {padding-left:600px;} -.prepend-16 {padding-left:640px;} -.prepend-17 {padding-left:680px;} -.prepend-18 {padding-left:720px;} -.prepend-19 {padding-left:760px;} -.prepend-20 {padding-left:800px;} -.prepend-21 {padding-left:840px;} -.prepend-22 {padding-left:880px;} -.prepend-23 {padding-left:920px;} -div.border {padding-right:4px;margin-right:5px;border-right:1px solid #eee;} -div.colborder {padding-right:24px;margin-right:25px;border-right:1px solid #eee;} -.pull-1 {margin-left:-40px;} -.pull-2 {margin-left:-80px;} -.pull-3 {margin-left:-120px;} -.pull-4 {margin-left:-160px;} -.pull-5 {margin-left:-200px;} -.pull-6 {margin-left:-240px;} -.pull-7 {margin-left:-280px;} -.pull-8 {margin-left:-320px;} -.pull-9 {margin-left:-360px;} -.pull-10 {margin-left:-400px;} -.pull-11 {margin-left:-440px;} -.pull-12 {margin-left:-480px;} -.pull-13 {margin-left:-520px;} -.pull-14 {margin-left:-560px;} -.pull-15 {margin-left:-600px;} -.pull-16 {margin-left:-640px;} -.pull-17 {margin-left:-680px;} -.pull-18 {margin-left:-720px;} -.pull-19 {margin-left:-760px;} -.pull-20 {margin-left:-800px;} -.pull-21 {margin-left:-840px;} -.pull-22 {margin-left:-880px;} -.pull-23 {margin-left:-920px;} -.pull-24 {margin-left:-960px;} -.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {float:left;position:relative;} -.push-1 {margin:0 -40px 1.5em 40px;} -.push-2 {margin:0 -80px 1.5em 80px;} -.push-3 {margin:0 -120px 1.5em 120px;} -.push-4 {margin:0 -160px 1.5em 160px;} -.push-5 {margin:0 -200px 1.5em 200px;} -.push-6 {margin:0 -240px 1.5em 240px;} -.push-7 {margin:0 -280px 1.5em 280px;} -.push-8 {margin:0 -320px 1.5em 320px;} -.push-9 {margin:0 -360px 1.5em 360px;} -.push-10 {margin:0 -400px 1.5em 400px;} -.push-11 {margin:0 -440px 1.5em 440px;} -.push-12 {margin:0 -480px 1.5em 480px;} -.push-13 {margin:0 -520px 1.5em 520px;} -.push-14 {margin:0 -560px 1.5em 560px;} -.push-15 {margin:0 -600px 1.5em 600px;} -.push-16 {margin:0 -640px 1.5em 640px;} -.push-17 {margin:0 -680px 1.5em 680px;} -.push-18 {margin:0 -720px 1.5em 720px;} -.push-19 {margin:0 -760px 1.5em 760px;} -.push-20 {margin:0 -800px 1.5em 800px;} -.push-21 {margin:0 -840px 1.5em 840px;} -.push-22 {margin:0 -880px 1.5em 880px;} -.push-23 {margin:0 -920px 1.5em 920px;} -.push-24 {margin:0 -960px 1.5em 960px;} -.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {float:right;position:relative;} -.prepend-top {margin-top:1.5em;} -.append-bottom {margin-bottom:1.5em;} -.box {padding:1.5em;margin-bottom:1.5em;background:#E5ECF9;} -hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:.1em;margin:0 0 1.45em;border:none;} -hr.space {background:#fff;color:#fff;visibility:hidden;} -.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;} -.clearfix, .container {display:block;} -.clear {clear:both;} - -/* fancy-type */ -p + p {text-indent:2em;margin-top:-1.5em;} -form p + p {text-indent:0;} -.alt {color:#666;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua", Georgia, serif;font-style:italic;font-weight:normal;} -.dquo {margin-left:-.5em;} -p.incr, .incr p {font-size:10px;line-height:1.44em;margin-bottom:1.5em;} -.caps {font-variant:small-caps;letter-spacing:1px;text-transform:lowercase;font-size:1.2em;line-height:1%;font-weight:bold;padding:0 2px;} - -/* buttons */ -a.button, button {display:block;float:left;margin:0.7em 0.5em 0.7em 0;padding:5px 10px 5px 7px;border:1px solid #dedede;border-top:1px solid #eee;border-left:1px solid #eee;background-color:#f5f5f5;font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;font-size:100%;line-height:130%;text-decoration:none;font-weight:bold;color:#565656;cursor:pointer;} -button {width:auto;overflow:visible;padding:4px 10px 3px 7px;} -button[type] {padding:4px 10px 4px 7px;line-height:17px;} -*:first-child+html button[type] {padding:4px 10px 3px 7px;} -button img, a.button img {margin:0 3px -3px 0 !important;padding:0;border:none;width:16px;height:16px;float:none;} -button:hover, a.button:hover {background-color:#dff4ff;border:1px solid #c2e1ef;color:#336699;} -a.button:active {background-color:#6299c5;border:1px solid #6299c5;color:#fff;} -body .positive {color:#529214;} -a.positive:hover, button.positive:hover {background-color:#E6EFC2;border:1px solid #C6D880;color:#529214;} -a.positive:active {background-color:#529214;border:1px solid #529214;color:#fff;} -body .negative {color:#d12f19;} -a.negative:hover, button.negative:hover {background-color:#fbe3e4;border:1px solid #fbc2c4;color:#d12f19;} -a.negative:active {background-color:#d12f19;border:1px solid #d12f19;color:#fff;} \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/forms.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/forms.css deleted file mode 100755 index b4911340..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/forms.css +++ /dev/null @@ -1,65 +0,0 @@ -/* -------------------------------------------------------------- - - forms.css - * Sets up some default styling for forms - * Gives you classes to enhance your forms - - Usage: - * For text fields, use class .title or .text - * For inline forms, use .inline (even when using columns) - --------------------------------------------------------------- */ - -label { font-weight: bold; } -fieldset { padding:1.4em; margin: 0 0 1.5em 0; border: 1px solid #ccc; } -legend { font-weight: bold; font-size:1.2em; } - - -/* Form fields --------------------------------------------------------------- */ - -input[type=text], input[type=password], -input.text, input.title, -textarea, select { - background-color:#fff; - border:1px solid #bbb; -} -input[type=text]:focus, input[type=password]:focus, -input.text:focus, input.title:focus, -textarea:focus, select:focus { - border-color:#666; -} - -input[type=text], input[type=password], -input.text, input.title, -textarea, select { - margin:0.5em 0; -} - -input.text, -input.title { width: 300px; padding:5px; } -input.title { font-size:1.5em; } -textarea { width: 390px; height: 250px; padding:5px; } - -input[type=checkbox], input[type=radio], -input.checkbox, input.radio { - position:relative; top:.25em; -} - -form.inline { line-height:3; } -form.inline p { margin-bottom:0; } - - -/* Success, notice and error boxes --------------------------------------------------------------- */ - -.error, -.notice, -.success { padding: .8em; margin-bottom: 1em; border: 2px solid #ddd; } - -.error { background: #FBE3E4; color: #8a1f11; border-color: #FBC2C4; } -.notice { background: #FFF6BF; color: #514721; border-color: #FFD324; } -.success { background: #E6EFC2; color: #264409; border-color: #C6D880; } -.error a { color: #8a1f11; } -.notice a { color: #514721; } -.success a { color: #264409; } diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/grid.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/grid.css deleted file mode 100755 index 352e0e2a..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/grid.css +++ /dev/null @@ -1,281 +0,0 @@ -/* -------------------------------------------------------------- - grid.css - * Sets up an easy-to-use grid of 24 columns. - - By default, the grid is 950px wide, with 24 columns - spanning 30px, and a 10px margin between columns. - - If you need fewer or more columns, namespaces or semantic - element names, use the compressor script (lib/compress.rb) - - Note: Changes made in this file will not be applied when - using the compressor: make changes in lib/blueprint/grid.css.rb --------------------------------------------------------------- */ - -/* A container should group all your columns. */ -.container { - width: 950px; - margin: 0 auto; -} - -/* Use this class on any div.span / container to see the grid. */ -.showgrid { - background: url(src/grid.png); -} - - -/* Columns --------------------------------------------------------------- */ - -/* Sets up basic grid floating and margin. */ -.column, div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24 { - float: left; - margin-right: 10px; -} - -/* The last column in a row needs this class. */ -.last, div.last { margin-right: 0; } - -/* Use these classes to set the width of a column. */ -.span-1 {width: 30px;} - -.span-2 {width: 70px;} -.span-3 {width: 110px;} -.span-4 {width: 150px;} -.span-5 {width: 190px;} -.span-6 {width: 230px;} -.span-7 {width: 270px;} -.span-8 {width: 310px;} -.span-9 {width: 350px;} -.span-10 {width: 390px;} -.span-11 {width: 430px;} -.span-12 {width: 470px;} -.span-13 {width: 510px;} -.span-14 {width: 550px;} -.span-15 {width: 590px;} -.span-16 {width: 630px;} -.span-17 {width: 670px;} -.span-18 {width: 710px;} -.span-19 {width: 750px;} -.span-20 {width: 790px;} -.span-21 {width: 830px;} -.span-22 {width: 870px;} -.span-23 {width: 910px;} -.span-24, div.span-24 { width:950px; margin-right:0; } - -/* Use these classes to set the width of an input. */ -input.span-1, textarea.span-1, input.span-2, textarea.span-2, input.span-3, textarea.span-3, input.span-4, textarea.span-4, input.span-5, textarea.span-5, input.span-6, textarea.span-6, input.span-7, textarea.span-7, input.span-8, textarea.span-8, input.span-9, textarea.span-9, input.span-10, textarea.span-10, input.span-11, textarea.span-11, input.span-12, textarea.span-12, input.span-13, textarea.span-13, input.span-14, textarea.span-14, input.span-15, textarea.span-15, input.span-16, textarea.span-16, input.span-17, textarea.span-17, input.span-18, textarea.span-18, input.span-19, textarea.span-19, input.span-20, textarea.span-20, input.span-21, textarea.span-21, input.span-22, textarea.span-22, input.span-23, textarea.span-23, input.span-24, textarea.span-24 { - border-left-width: 1px!important; - border-right-width: 1px!important; - padding-left: 5px!important; - padding-right: 5px!important; -} - -input.span-1, textarea.span-1 { width: 18px!important; } -input.span-2, textarea.span-2 { width: 58px!important; } -input.span-3, textarea.span-3 { width: 98px!important; } -input.span-4, textarea.span-4 { width: 138px!important; } -input.span-5, textarea.span-5 { width: 178px!important; } -input.span-6, textarea.span-6 { width: 218px!important; } -input.span-7, textarea.span-7 { width: 258px!important; } -input.span-8, textarea.span-8 { width: 298px!important; } -input.span-9, textarea.span-9 { width: 338px!important; } -input.span-10, textarea.span-10 { width: 378px!important; } -input.span-11, textarea.span-11 { width: 418px!important; } -input.span-12, textarea.span-12 { width: 458px!important; } -input.span-13, textarea.span-13 { width: 498px!important; } -input.span-14, textarea.span-14 { width: 538px!important; } -input.span-15, textarea.span-15 { width: 578px!important; } -input.span-16, textarea.span-16 { width: 618px!important; } -input.span-17, textarea.span-17 { width: 658px!important; } -input.span-18, textarea.span-18 { width: 698px!important; } -input.span-19, textarea.span-19 { width: 738px!important; } -input.span-20, textarea.span-20 { width: 778px!important; } -input.span-21, textarea.span-21 { width: 818px!important; } -input.span-22, textarea.span-22 { width: 858px!important; } -input.span-23, textarea.span-23 { width: 898px!important; } -input.span-24, textarea.span-24 { width: 938px!important; } - -/* Add these to a column to append empty cols. */ - -.append-1 { padding-right: 40px;} -.append-2 { padding-right: 80px;} -.append-3 { padding-right: 120px;} -.append-4 { padding-right: 160px;} -.append-5 { padding-right: 200px;} -.append-6 { padding-right: 240px;} -.append-7 { padding-right: 280px;} -.append-8 { padding-right: 320px;} -.append-9 { padding-right: 360px;} -.append-10 { padding-right: 400px;} -.append-11 { padding-right: 440px;} -.append-12 { padding-right: 480px;} -.append-13 { padding-right: 520px;} -.append-14 { padding-right: 560px;} -.append-15 { padding-right: 600px;} -.append-16 { padding-right: 640px;} -.append-17 { padding-right: 680px;} -.append-18 { padding-right: 720px;} -.append-19 { padding-right: 760px;} -.append-20 { padding-right: 800px;} -.append-21 { padding-right: 840px;} -.append-22 { padding-right: 880px;} -.append-23 { padding-right: 920px;} - -/* Add these to a column to prepend empty cols. */ - -.prepend-1 { padding-left: 40px;} -.prepend-2 { padding-left: 80px;} -.prepend-3 { padding-left: 120px;} -.prepend-4 { padding-left: 160px;} -.prepend-5 { padding-left: 200px;} -.prepend-6 { padding-left: 240px;} -.prepend-7 { padding-left: 280px;} -.prepend-8 { padding-left: 320px;} -.prepend-9 { padding-left: 360px;} -.prepend-10 { padding-left: 400px;} -.prepend-11 { padding-left: 440px;} -.prepend-12 { padding-left: 480px;} -.prepend-13 { padding-left: 520px;} -.prepend-14 { padding-left: 560px;} -.prepend-15 { padding-left: 600px;} -.prepend-16 { padding-left: 640px;} -.prepend-17 { padding-left: 680px;} -.prepend-18 { padding-left: 720px;} -.prepend-19 { padding-left: 760px;} -.prepend-20 { padding-left: 800px;} -.prepend-21 { padding-left: 840px;} -.prepend-22 { padding-left: 880px;} -.prepend-23 { padding-left: 920px;} - - -/* Border on right hand side of a column. */ -div.border { - padding-right: 4px; - margin-right: 5px; - border-right: 1px solid #eee; -} - -/* Border with more whitespace, spans one column. */ -div.colborder { - padding-right: 24px; - margin-right: 25px; - border-right: 1px solid #eee; -} - - -/* Use these classes on an element to push it into the -next column, or to pull it into the previous column. */ - - -.pull-1 { margin-left: -40px; } -.pull-2 { margin-left: -80px; } -.pull-3 { margin-left: -120px; } -.pull-4 { margin-left: -160px; } -.pull-5 { margin-left: -200px; } -.pull-6 { margin-left: -240px; } -.pull-7 { margin-left: -280px; } -.pull-8 { margin-left: -320px; } -.pull-9 { margin-left: -360px; } -.pull-10 { margin-left: -400px; } -.pull-11 { margin-left: -440px; } -.pull-12 { margin-left: -480px; } -.pull-13 { margin-left: -520px; } -.pull-14 { margin-left: -560px; } -.pull-15 { margin-left: -600px; } -.pull-16 { margin-left: -640px; } -.pull-17 { margin-left: -680px; } -.pull-18 { margin-left: -720px; } -.pull-19 { margin-left: -760px; } -.pull-20 { margin-left: -800px; } -.pull-21 { margin-left: -840px; } -.pull-22 { margin-left: -880px; } -.pull-23 { margin-left: -920px; } -.pull-24 { margin-left: -960px; } - -.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {float: left; position:relative;} - - -.push-1 { margin: 0 -40px 1.5em 40px; } -.push-2 { margin: 0 -80px 1.5em 80px; } -.push-3 { margin: 0 -120px 1.5em 120px; } -.push-4 { margin: 0 -160px 1.5em 160px; } -.push-5 { margin: 0 -200px 1.5em 200px; } -.push-6 { margin: 0 -240px 1.5em 240px; } -.push-7 { margin: 0 -280px 1.5em 280px; } -.push-8 { margin: 0 -320px 1.5em 320px; } -.push-9 { margin: 0 -360px 1.5em 360px; } -.push-10 { margin: 0 -400px 1.5em 400px; } -.push-11 { margin: 0 -440px 1.5em 440px; } -.push-12 { margin: 0 -480px 1.5em 480px; } -.push-13 { margin: 0 -520px 1.5em 520px; } -.push-14 { margin: 0 -560px 1.5em 560px; } -.push-15 { margin: 0 -600px 1.5em 600px; } -.push-16 { margin: 0 -640px 1.5em 640px; } -.push-17 { margin: 0 -680px 1.5em 680px; } -.push-18 { margin: 0 -720px 1.5em 720px; } -.push-19 { margin: 0 -760px 1.5em 760px; } -.push-20 { margin: 0 -800px 1.5em 800px; } -.push-21 { margin: 0 -840px 1.5em 840px; } -.push-22 { margin: 0 -880px 1.5em 880px; } -.push-23 { margin: 0 -920px 1.5em 920px; } -.push-24 { margin: 0 -960px 1.5em 960px; } - -.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {float: right; position:relative;} - - -/* Misc classes and elements --------------------------------------------------------------- */ - -/* In case you need to add a gutter above/below an element */ -.prepend-top { - margin-top:1.5em; -} -.append-bottom { - margin-bottom:1.5em; -} - -/* Use a .box to create a padded box inside a column. */ -.box { - padding: 1.5em; - margin-bottom: 1.5em; - background: #E5ECF9; -} - -/* Use this to create a horizontal ruler across a column. */ -hr { - background: #ddd; - color: #ddd; - clear: both; - float: none; - width: 100%; - height: .1em; - margin: 0 0 1.45em; - border: none; -} - -hr.space { - background: #fff; - color: #fff; - visibility: hidden; -} - - -/* Clearing floats without extra markup - Based on How To Clear Floats Without Structural Markup by PiE - [http://www.positioniseverything.net/easyclearing.html] */ - -.clearfix:after, .container:after { - content: "\0020"; - display: block; - height: 0; - clear: both; - visibility: hidden; - overflow:hidden; -} -.clearfix, .container {display: block;} - -/* Regular clearing - apply to column that should drop below previous ones. */ - -.clear { clear:both; } diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/grid.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/grid.png deleted file mode 100755 index b7539f67..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/grid.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/ie.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/ie.css deleted file mode 100755 index 214b8790..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/ie.css +++ /dev/null @@ -1,76 +0,0 @@ -/* -------------------------------------------------------------- - - ie.css - - Contains every hack for Internet Explorer, - so that our core files stay sweet and nimble. - --------------------------------------------------------------- */ - -/* Make sure the layout is centered in IE5 */ -body { text-align: center; } -.container { text-align: left; } - -/* Fixes IE margin bugs */ -* html .column, * html div.span-1, * html div.span-2, -* html div.span-3, * html div.span-4, * html div.span-5, -* html div.span-6, * html div.span-7, * html div.span-8, -* html div.span-9, * html div.span-10, * html div.span-11, -* html div.span-12, * html div.span-13, * html div.span-14, -* html div.span-15, * html div.span-16, * html div.span-17, -* html div.span-18, * html div.span-19, * html div.span-20, -* html div.span-21, * html div.span-22, * html div.span-23, -* html div.span-24 { display:inline; overflow-x: hidden; } - - -/* Elements --------------------------------------------------------------- */ - -/* Fixes incorrect styling of legend in IE6. */ -* html legend { margin:0px -8px 16px 0; padding:0; } - -/* Fixes wrong line-height on sup/sub in IE. */ -sup { vertical-align:text-top; } -sub { vertical-align:text-bottom; } - -/* Fixes IE7 missing wrapping of code elements. */ -html>body p code { *white-space: normal; } - -/* IE 6&7 has problems with setting proper
margins. */ -hr { margin:-8px auto 11px; } - -/* Explicitly set interpolation, allowing dynamically resized images to not look horrible */ -img { -ms-interpolation-mode:bicubic; } - -/* Clearing --------------------------------------------------------------- */ - -/* Makes clearfix actually work in IE */ -.clearfix, .container { display:inline-block; } -* html .clearfix, -* html .container { height:1%; } - - -/* Forms --------------------------------------------------------------- */ - -/* Fixes padding on fieldset */ -fieldset { padding-top:0; } - -/* Makes classic textareas in IE 6 resemble other browsers */ -textarea { overflow:auto; } - -/* Fixes rule that IE 6 ignores */ -input.text, input.title, textarea { background-color:#fff; border:1px solid #bbb; } -input.text:focus, input.title:focus { border-color:#666; } -input.text, input.title, textarea, select { margin:0.5em 0; } -input.checkbox, input.radio { position:relative; top:.25em; } - -/* Fixes alignment of inline form elements */ -form.inline div, form.inline p { vertical-align:middle; } -form.inline label { position:relative;top:-0.25em; } -form.inline input.checkbox, form.inline input.radio, -form.inline input.button, form.inline button { - margin:0.5em 0; -} -button, input.button { position:relative;top:0.25em; } \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/print.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/print.css deleted file mode 100755 index d3030294..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/print.css +++ /dev/null @@ -1,85 +0,0 @@ -/* -------------------------------------------------------------- - - print.css - * Gives you some sensible styles for printing pages. - * See Readme file in this directory for further instructions. - - Some additions you'll want to make, customized to your markup: - #header, #footer, #navigation { display:none; } - --------------------------------------------------------------- */ - -body { - line-height: 1.5; - font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; - color:#000; - background: none; - font-size: 10pt; -} - - -/* Layout --------------------------------------------------------------- */ - -.container { - background: none; -} - -hr { - background:#ccc; - color:#ccc; - width:100%; - height:2px; - margin:2em 0; - padding:0; - border:none; -} -hr.space { - background: #fff; - color: #fff; - visibility: hidden; -} - - -/* Text --------------------------------------------------------------- */ - -h1,h2,h3,h4,h5,h6 { font-family: "Helvetica Neue", Arial, "Lucida Grande", sans-serif; } -code { font:.9em "Courier New", Monaco, Courier, monospace; } - -a img { border:none; } -p img.top { margin-top: 0; } - -blockquote { - margin:1.5em; - padding:1em; - font-style:italic; - font-size:.9em; -} - -.small { font-size: .9em; } -.large { font-size: 1.1em; } -.quiet { color: #999; } -.hide { display:none; } - - -/* Links --------------------------------------------------------------- */ - -a:link, a:visited { - background: transparent; - font-weight:700; - text-decoration: underline; -} - -a:link:after, a:visited:after { - content: " (" attr(href) ")"; - font-size: 90%; -} - -/* If you're having trouble printing relative links, uncomment and customize this: - (note: This is valid CSS3, but it still won't go through the W3C CSS Validator) */ - -/* a[href^="/"]:after { - content: " (http://www.yourdomain.com" attr(href) ") "; -} */ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/reset.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/reset.css deleted file mode 100755 index fc0788c8..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/reset.css +++ /dev/null @@ -1,38 +0,0 @@ -/* -------------------------------------------------------------- - - reset.css - * Resets default browser CSS. - --------------------------------------------------------------- */ - -html, body, div, span, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, code, -del, dfn, em, img, q, dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - font-family: inherit; - vertical-align: baseline; -} - -body { - line-height: 1.5; -} - -/* Tables still need 'cellspacing="0"' in the markup. */ -table { border-collapse: separate; border-spacing: 0; } -caption, th, td { text-align: left; font-weight: normal; } -table, td, th { vertical-align: middle; } - -/* Remove possible quote marks (") from ,
. */ -blockquote:before, blockquote:after, q:before, q:after { content: ""; } -blockquote, q { quotes: "" ""; } - -/* Remove annoying border on linked images. */ -a img { border: none; } diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/typography.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/typography.css deleted file mode 100755 index 6cc099c6..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/blueprint/src/typography.css +++ /dev/null @@ -1,106 +0,0 @@ -/* -------------------------------------------------------------- - - typography.css - * Sets up some sensible default typography. - --------------------------------------------------------------- */ - -/* Default font settings. - The font-size percentage is of 16px. (0.75 * 16px = 12px) */ -html { font-size:100.01%; } -body { - font-size: 75%; - color: #222; - background: #fff; - font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; -} - - -/* Headings --------------------------------------------------------------- */ - -h1,h2,h3,h4,h5,h6 { font-weight: normal; color: #111; } - -h1 { font-size: 3em; line-height: 1; margin-bottom: 0.5em; } -h2 { font-size: 2em; margin-bottom: 0.75em; } -h3 { font-size: 1.5em; line-height: 1; margin-bottom: 1em; } -h4 { font-size: 1.2em; line-height: 1.25; margin-bottom: 1.25em; } -h5 { font-size: 1em; font-weight: bold; margin-bottom: 1.5em; } -h6 { font-size: 1em; font-weight: bold; } - -h1 img, h2 img, h3 img, -h4 img, h5 img, h6 img { - margin: 0; -} - - -/* Text elements --------------------------------------------------------------- */ - -p { margin: 0 0 1.5em; } -p img.left { float: left; margin: 1.5em 1.5em 1.5em 0; padding: 0; } -p img.right { float: right; margin: 1.5em 0 1.5em 1.5em; } - -a:focus, -a:hover { color: #000; } -a { color: #009; text-decoration: underline; } - -blockquote { margin: 1.5em; color: #666; font-style: italic; } -strong { font-weight: bold; } -em,dfn { font-style: italic; } -dfn { font-weight: bold; } -sup, sub { line-height: 0; } - -abbr, -acronym { border-bottom: 1px dotted #666; } -address { margin: 0 0 1.5em; font-style: italic; } -del { color:#666; } - -pre { margin: 1.5em 0; white-space: pre; } -pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.5; } - - -/* Lists --------------------------------------------------------------- */ - -li ul, -li ol { margin: 0; } -ul, ol { margin: 0 1.5em 1.5em 0; padding-left: 3.333em; } - -ul { list-style-type: disc; } -ol { list-style-type: decimal; } - -dl { margin: 0 0 1.5em 0; } -dl dt { font-weight: bold; } -dd { margin-left: 1.5em;} - - -/* Tables --------------------------------------------------------------- */ - -table { margin-bottom: 1.4em; width:100%; } -th { font-weight: bold; } -thead th { background: #c3d9ff; } -th,td,caption { padding: 4px 10px 4px 5px; } -tr.even td { background: #e5ecf9; } -tfoot { font-style: italic; } -caption { background: #eee; } - - -/* Misc classes --------------------------------------------------------------- */ - -.small { font-size: .8em; margin-bottom: 1.875em; line-height: 1.875em; } -.large { font-size: 1.2em; line-height: 2.5em; margin-bottom: 1.25em; } -.hide { display: none; } - -.quiet { color: #666; } -.loud { color: #000; } -.highlight { background:#ff0; } -.added { background:#060; color: #fff; } -.removed { background:#900; color: #fff; } - -.first { margin-left:0; padding-left:0; } -.last { margin-right:0; padding-right:0; } -.top { margin-top:0; padding-top:0; } -.bottom { margin-bottom:0; padding-bottom:0; } diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/booking.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/booking.css deleted file mode 100644 index 0f30e21f..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/booking.css +++ /dev/null @@ -1,59 +0,0 @@ - -a,a:visited,a:link,a:active { - color: #59924B; - background-color: transparent; - text-decoration: none; - font-weight: bold; -} - -a:hover { - color: white; - background-color: #65a242; - text-decoration: none; - font-weight: bold; -} - -input[type=submit] { - color: #fff; - background: #fff url(../images/btn.bg.gif) 0 0 repeat-x; - border-style: none; - margin:0.4em 0.4em 0.4em 0; - height: 1.8em; -} - -input[type=submit]:hover { - color: yellow; - background: #fff url(../images/btn.bg.gif) 0 0 repeat-x; - border-style: none; -} - -label { - margin-right: 0.5em; -} - -.summary { - width: 100%; - border: 1px solid #414f23; - border-collapse: collapse; -} - -.summary thead th { - border-left: 1px solid #414f23; - background: #fff url(../images/th.bg.gif) 0 100% repeat-x; - border-bottom: 1px solid #414f23; - padding: 6px; - text-align: left; - font-size: small; -} - -.summary tbody td { - border-left: 1px solid #9cac7c; - padding: 4px; - border-bottom: 1px solid #9cac7c; - font-size: 8pt; -} - -.label { - font-weight: bold; -} - diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-anim_basic_16x16.gif b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-anim_basic_16x16.gif deleted file mode 100644 index 085ccaec..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-anim_basic_16x16.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_diagonals-small_0_aaaaaa_40x40.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_diagonals-small_0_aaaaaa_40x40.png deleted file mode 100644 index d5359734..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_diagonals-small_0_aaaaaa_40x40.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_diagonals-thick_15_444444_40x40.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_diagonals-thick_15_444444_40x40.png deleted file mode 100644 index 88e46a6d..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_diagonals-thick_15_444444_40x40.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_diagonals-thick_95_ffdc2e_40x40.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_diagonals-thick_95_ffdc2e_40x40.png deleted file mode 100644 index a4f59e16..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_diagonals-thick_95_ffdc2e_40x40.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_glass_55_fbf5d0_1x400.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_glass_55_fbf5d0_1x400.png deleted file mode 100644 index 0f45be78..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_glass_55_fbf5d0_1x400.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_highlight-hard_30_285c00_1x100.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_highlight-hard_30_285c00_1x100.png deleted file mode 100644 index c341f5ef..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_highlight-hard_30_285c00_1x100.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_highlight-soft_33_3a8104_1x100.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_highlight-soft_33_3a8104_1x100.png deleted file mode 100644 index 3b32c4f3..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_highlight-soft_33_3a8104_1x100.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_highlight-soft_50_4eb305_1x100.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_highlight-soft_50_4eb305_1x100.png deleted file mode 100644 index 65518690..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_highlight-soft_50_4eb305_1x100.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_highlight-soft_60_4ca20b_1x100.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_highlight-soft_60_4ca20b_1x100.png deleted file mode 100644 index e0c83c01..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_highlight-soft_60_4ca20b_1x100.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_inset-soft_10_285c00_1x100.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_inset-soft_10_285c00_1x100.png deleted file mode 100644 index d0e7d801..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-bg_inset-soft_10_285c00_1x100.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-icons_4eb305_256x240.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-icons_4eb305_256x240.png deleted file mode 100644 index bae34204..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-icons_4eb305_256x240.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-icons_72b42d_256x240.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-icons_72b42d_256x240.png deleted file mode 100644 index 6108cfed..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-icons_72b42d_256x240.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-icons_cd0a0a_256x240.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-icons_cd0a0a_256x240.png deleted file mode 100644 index 2ab019b7..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-icons_cd0a0a_256x240.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-icons_ffffff_256x240.png b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-icons_ffffff_256x240.png deleted file mode 100644 index 42f8f992..00000000 Binary files a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/images/ui-icons_ffffff_256x240.png and /dev/null differ diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/jquery-ui-1.8.2.custom.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/jquery-ui-1.8.2.custom.css deleted file mode 100644 index ef948828..00000000 --- a/spring-webflow-samples/booking-faces/src/main/webapp/styles/le-frog/jquery-ui-1.8.2.custom.css +++ /dev/null @@ -1,489 +0,0 @@ -/* -* jQuery UI CSS Framework -* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about) -* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. -*/ - -/* Layout helpers -----------------------------------*/ -.ui-helper-hidden { display: none; } -.ui-helper-hidden-accessible { position: absolute; left: -99999999px; } -.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } -.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -.ui-helper-clearfix { display: inline-block; } -/* required comment for clearfix to work in Opera \*/ -* html .ui-helper-clearfix { height:1%; } -.ui-helper-clearfix { display:block; } -/* end clearfix */ -.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } - - -/* Interaction Cues -----------------------------------*/ -.ui-state-disabled { cursor: default !important; } - - -/* Icons -----------------------------------*/ - -/* states and images */ -.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } - - -/* Misc visuals -----------------------------------*/ - -/* Overlays */ -.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } - - -/* -* jQuery UI CSS Framework -* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about) -* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. -* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande,%20Lucida%20Sans,%20Arial,%20sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=10px&bgColorHeader=3a8104&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=33&borderColorHeader=3f7506&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=285c00&bgTextureContent=05_inset_soft.png&bgImgOpacityContent=10&borderColorContent=72b42d&fcContent=ffffff&iconColorContent=72b42d&bgColorDefault=4ca20b&bgTextureDefault=03_highlight_soft.png&bgImgOpacityDefault=60&borderColorDefault=45930b&fcDefault=ffffff&iconColorDefault=ffffff&bgColorHover=4eb305&bgTextureHover=03_highlight_soft.png&bgImgOpacityHover=50&borderColorHover=8bd83b&fcHover=ffffff&iconColorHover=ffffff&bgColorActive=285c00&bgTextureActive=04_highlight_hard.png&bgImgOpacityActive=30&borderColorActive=72b42d&fcActive=ffffff&iconColorActive=ffffff&bgColorHighlight=fbf5d0&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=f9dd34&fcHighlight=363636&iconColorHighlight=4eb305&bgColorError=ffdc2e&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=95&borderColorError=fad000&fcError=2b2b2b&iconColorError=cd0a0a&bgColorOverlay=444444&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=15&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=07_diagonals_small.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=0px&offsetTopShadow=4px&offsetLeftShadow=4px&cornerRadiusShadow=4px -*/ - - -/* Component containers -----------------------------------*/ -.ui-widget { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; } -.ui-widget .ui-widget { font-size: 1em; } -.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; } -.ui-widget-content { border: 1px solid #72b42d; background: #285c00 url(images/ui-bg_inset-soft_10_285c00_1x100.png) 50% bottom repeat-x; color: #ffffff; } -.ui-widget-content a { color: #ffffff; } -.ui-widget-header { border: 1px solid #3f7506; background: #3a8104 url(images/ui-bg_highlight-soft_33_3a8104_1x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; } -.ui-widget-header a { color: #ffffff; } - -/* Interaction states -----------------------------------*/ -.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #45930b; background: #4ca20b url(images/ui-bg_highlight-soft_60_4ca20b_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; } -.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #ffffff; text-decoration: none; } -.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #8bd83b; background: #4eb305 url(images/ui-bg_highlight-soft_50_4eb305_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; } -.ui-state-hover a, .ui-state-hover a:hover { color: #ffffff; text-decoration: none; } -.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #72b42d; background: #285c00 url(images/ui-bg_highlight-hard_30_285c00_1x100.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; } -.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #ffffff; text-decoration: none; } -.ui-widget :active { outline: none; } - -/* Interaction Cues -----------------------------------*/ -.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #f9dd34; background: #fbf5d0 url(images/ui-bg_glass_55_fbf5d0_1x400.png) 50% 50% repeat-x; color: #363636; } -.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; } -.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #fad000; background: #ffdc2e url(images/ui-bg_diagonals-thick_95_ffdc2e_40x40.png) 50% 50% repeat; color: #2b2b2b; } -.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #2b2b2b; } -.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #2b2b2b; } -.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } -.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } -.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } - -/* Icons -----------------------------------*/ - -/* states and images */ -.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_72b42d_256x240.png); } -.ui-widget-content .ui-icon {background-image: url(images/ui-icons_72b42d_256x240.png); } -.ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); } -.ui-state-default .ui-icon { background-image: url(images/ui-icons_ffffff_256x240.png); } -.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); } -.ui-state-active .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); } -.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_4eb305_256x240.png); } -.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); } - -/* positioning */ -.ui-icon-carat-1-n { background-position: 0 0; } -.ui-icon-carat-1-ne { background-position: -16px 0; } -.ui-icon-carat-1-e { background-position: -32px 0; } -.ui-icon-carat-1-se { background-position: -48px 0; } -.ui-icon-carat-1-s { background-position: -64px 0; } -.ui-icon-carat-1-sw { background-position: -80px 0; } -.ui-icon-carat-1-w { background-position: -96px 0; } -.ui-icon-carat-1-nw { background-position: -112px 0; } -.ui-icon-carat-2-n-s { background-position: -128px 0; } -.ui-icon-carat-2-e-w { background-position: -144px 0; } -.ui-icon-triangle-1-n { background-position: 0 -16px; } -.ui-icon-triangle-1-ne { background-position: -16px -16px; } -.ui-icon-triangle-1-e { background-position: -32px -16px; } -.ui-icon-triangle-1-se { background-position: -48px -16px; } -.ui-icon-triangle-1-s { background-position: -64px -16px; } -.ui-icon-triangle-1-sw { background-position: -80px -16px; } -.ui-icon-triangle-1-w { background-position: -96px -16px; } -.ui-icon-triangle-1-nw { background-position: -112px -16px; } -.ui-icon-triangle-2-n-s { background-position: -128px -16px; } -.ui-icon-triangle-2-e-w { background-position: -144px -16px; } -.ui-icon-arrow-1-n { background-position: 0 -32px; } -.ui-icon-arrow-1-ne { background-position: -16px -32px; } -.ui-icon-arrow-1-e { background-position: -32px -32px; } -.ui-icon-arrow-1-se { background-position: -48px -32px; } -.ui-icon-arrow-1-s { background-position: -64px -32px; } -.ui-icon-arrow-1-sw { background-position: -80px -32px; } -.ui-icon-arrow-1-w { background-position: -96px -32px; } -.ui-icon-arrow-1-nw { background-position: -112px -32px; } -.ui-icon-arrow-2-n-s { background-position: -128px -32px; } -.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } -.ui-icon-arrow-2-e-w { background-position: -160px -32px; } -.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } -.ui-icon-arrowstop-1-n { background-position: -192px -32px; } -.ui-icon-arrowstop-1-e { background-position: -208px -32px; } -.ui-icon-arrowstop-1-s { background-position: -224px -32px; } -.ui-icon-arrowstop-1-w { background-position: -240px -32px; } -.ui-icon-arrowthick-1-n { background-position: 0 -48px; } -.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } -.ui-icon-arrowthick-1-e { background-position: -32px -48px; } -.ui-icon-arrowthick-1-se { background-position: -48px -48px; } -.ui-icon-arrowthick-1-s { background-position: -64px -48px; } -.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } -.ui-icon-arrowthick-1-w { background-position: -96px -48px; } -.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } -.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } -.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } -.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } -.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } -.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } -.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } -.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } -.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } -.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } -.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } -.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } -.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } -.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } -.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } -.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } -.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } -.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } -.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } -.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } -.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } -.ui-icon-arrow-4 { background-position: 0 -80px; } -.ui-icon-arrow-4-diag { background-position: -16px -80px; } -.ui-icon-extlink { background-position: -32px -80px; } -.ui-icon-newwin { background-position: -48px -80px; } -.ui-icon-refresh { background-position: -64px -80px; } -.ui-icon-shuffle { background-position: -80px -80px; } -.ui-icon-transfer-e-w { background-position: -96px -80px; } -.ui-icon-transferthick-e-w { background-position: -112px -80px; } -.ui-icon-folder-collapsed { background-position: 0 -96px; } -.ui-icon-folder-open { background-position: -16px -96px; } -.ui-icon-document { background-position: -32px -96px; } -.ui-icon-document-b { background-position: -48px -96px; } -.ui-icon-note { background-position: -64px -96px; } -.ui-icon-mail-closed { background-position: -80px -96px; } -.ui-icon-mail-open { background-position: -96px -96px; } -.ui-icon-suitcase { background-position: -112px -96px; } -.ui-icon-comment { background-position: -128px -96px; } -.ui-icon-person { background-position: -144px -96px; } -.ui-icon-print { background-position: -160px -96px; } -.ui-icon-trash { background-position: -176px -96px; } -.ui-icon-locked { background-position: -192px -96px; } -.ui-icon-unlocked { background-position: -208px -96px; } -.ui-icon-bookmark { background-position: -224px -96px; } -.ui-icon-tag { background-position: -240px -96px; } -.ui-icon-home { background-position: 0 -112px; } -.ui-icon-flag { background-position: -16px -112px; } -.ui-icon-calendar { background-position: -32px -112px; } -.ui-icon-cart { background-position: -48px -112px; } -.ui-icon-pencil { background-position: -64px -112px; } -.ui-icon-clock { background-position: -80px -112px; } -.ui-icon-disk { background-position: -96px -112px; } -.ui-icon-calculator { background-position: -112px -112px; } -.ui-icon-zoomin { background-position: -128px -112px; } -.ui-icon-zoomout { background-position: -144px -112px; } -.ui-icon-search { background-position: -160px -112px; } -.ui-icon-wrench { background-position: -176px -112px; } -.ui-icon-gear { background-position: -192px -112px; } -.ui-icon-heart { background-position: -208px -112px; } -.ui-icon-star { background-position: -224px -112px; } -.ui-icon-link { background-position: -240px -112px; } -.ui-icon-cancel { background-position: 0 -128px; } -.ui-icon-plus { background-position: -16px -128px; } -.ui-icon-plusthick { background-position: -32px -128px; } -.ui-icon-minus { background-position: -48px -128px; } -.ui-icon-minusthick { background-position: -64px -128px; } -.ui-icon-close { background-position: -80px -128px; } -.ui-icon-closethick { background-position: -96px -128px; } -.ui-icon-key { background-position: -112px -128px; } -.ui-icon-lightbulb { background-position: -128px -128px; } -.ui-icon-scissors { background-position: -144px -128px; } -.ui-icon-clipboard { background-position: -160px -128px; } -.ui-icon-copy { background-position: -176px -128px; } -.ui-icon-contact { background-position: -192px -128px; } -.ui-icon-image { background-position: -208px -128px; } -.ui-icon-video { background-position: -224px -128px; } -.ui-icon-script { background-position: -240px -128px; } -.ui-icon-alert { background-position: 0 -144px; } -.ui-icon-info { background-position: -16px -144px; } -.ui-icon-notice { background-position: -32px -144px; } -.ui-icon-help { background-position: -48px -144px; } -.ui-icon-check { background-position: -64px -144px; } -.ui-icon-bullet { background-position: -80px -144px; } -.ui-icon-radio-off { background-position: -96px -144px; } -.ui-icon-radio-on { background-position: -112px -144px; } -.ui-icon-pin-w { background-position: -128px -144px; } -.ui-icon-pin-s { background-position: -144px -144px; } -.ui-icon-play { background-position: 0 -160px; } -.ui-icon-pause { background-position: -16px -160px; } -.ui-icon-seek-next { background-position: -32px -160px; } -.ui-icon-seek-prev { background-position: -48px -160px; } -.ui-icon-seek-end { background-position: -64px -160px; } -.ui-icon-seek-start { background-position: -80px -160px; } -/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ -.ui-icon-seek-first { background-position: -80px -160px; } -.ui-icon-stop { background-position: -96px -160px; } -.ui-icon-eject { background-position: -112px -160px; } -.ui-icon-volume-off { background-position: -128px -160px; } -.ui-icon-volume-on { background-position: -144px -160px; } -.ui-icon-power { background-position: 0 -176px; } -.ui-icon-signal-diag { background-position: -16px -176px; } -.ui-icon-signal { background-position: -32px -176px; } -.ui-icon-battery-0 { background-position: -48px -176px; } -.ui-icon-battery-1 { background-position: -64px -176px; } -.ui-icon-battery-2 { background-position: -80px -176px; } -.ui-icon-battery-3 { background-position: -96px -176px; } -.ui-icon-circle-plus { background-position: 0 -192px; } -.ui-icon-circle-minus { background-position: -16px -192px; } -.ui-icon-circle-close { background-position: -32px -192px; } -.ui-icon-circle-triangle-e { background-position: -48px -192px; } -.ui-icon-circle-triangle-s { background-position: -64px -192px; } -.ui-icon-circle-triangle-w { background-position: -80px -192px; } -.ui-icon-circle-triangle-n { background-position: -96px -192px; } -.ui-icon-circle-arrow-e { background-position: -112px -192px; } -.ui-icon-circle-arrow-s { background-position: -128px -192px; } -.ui-icon-circle-arrow-w { background-position: -144px -192px; } -.ui-icon-circle-arrow-n { background-position: -160px -192px; } -.ui-icon-circle-zoomin { background-position: -176px -192px; } -.ui-icon-circle-zoomout { background-position: -192px -192px; } -.ui-icon-circle-check { background-position: -208px -192px; } -.ui-icon-circlesmall-plus { background-position: 0 -208px; } -.ui-icon-circlesmall-minus { background-position: -16px -208px; } -.ui-icon-circlesmall-close { background-position: -32px -208px; } -.ui-icon-squaresmall-plus { background-position: -48px -208px; } -.ui-icon-squaresmall-minus { background-position: -64px -208px; } -.ui-icon-squaresmall-close { background-position: -80px -208px; } -.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } -.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } -.ui-icon-grip-solid-vertical { background-position: -32px -224px; } -.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } -.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } -.ui-icon-grip-diagonal-se { background-position: -80px -224px; } - - -/* Misc visuals -----------------------------------*/ - -/* Corner radius */ -.ui-corner-tl { -moz-border-radius-topleft: 10px; -webkit-border-top-left-radius: 10px; border-top-left-radius: 10px; } -.ui-corner-tr { -moz-border-radius-topright: 10px; -webkit-border-top-right-radius: 10px; border-top-right-radius: 10px; } -.ui-corner-bl { -moz-border-radius-bottomleft: 10px; -webkit-border-bottom-left-radius: 10px; border-bottom-left-radius: 10px; } -.ui-corner-br { -moz-border-radius-bottomright: 10px; -webkit-border-bottom-right-radius: 10px; border-bottom-right-radius: 10px; } -.ui-corner-top { -moz-border-radius-topleft: 10px; -webkit-border-top-left-radius: 10px; border-top-left-radius: 10px; -moz-border-radius-topright: 10px; -webkit-border-top-right-radius: 10px; border-top-right-radius: 10px; } -.ui-corner-bottom { -moz-border-radius-bottomleft: 10px; -webkit-border-bottom-left-radius: 10px; border-bottom-left-radius: 10px; -moz-border-radius-bottomright: 10px; -webkit-border-bottom-right-radius: 10px; border-bottom-right-radius: 10px; } -.ui-corner-right { -moz-border-radius-topright: 10px; -webkit-border-top-right-radius: 10px; border-top-right-radius: 10px; -moz-border-radius-bottomright: 10px; -webkit-border-bottom-right-radius: 10px; border-bottom-right-radius: 10px; } -.ui-corner-left { -moz-border-radius-topleft: 10px; -webkit-border-top-left-radius: 10px; border-top-left-radius: 10px; -moz-border-radius-bottomleft: 10px; -webkit-border-bottom-left-radius: 10px; border-bottom-left-radius: 10px; } -.ui-corner-all { -moz-border-radius: 10px; -webkit-border-radius: 10px; border-radius: 10px; } - -/* Overlays */ -.ui-widget-overlay { background: #444444 url(images/ui-bg_diagonals-thick_15_444444_40x40.png) 50% 50% repeat; opacity: .30;filter:Alpha(Opacity=30); } -.ui-widget-shadow { margin: 4px 0 0 4px; padding: 0px; background: #aaaaaa url(images/ui-bg_diagonals-small_0_aaaaaa_40x40.png) 50% 50% repeat; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }/* Resizable -----------------------------------*/ -.ui-resizable { position: relative;} -.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;} -.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } -.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } -.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } -.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; } -.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; } -.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } -.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } -.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } -.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Selectable -----------------------------------*/ -.ui-selectable-helper { border:1px dotted black } -/* Accordion -----------------------------------*/ -.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; } -.ui-accordion .ui-accordion-li-fix { display: inline; } -.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; } -.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; } -/* IE7-/Win - Fix extra vertical space in lists */ -.ui-accordion a { zoom: 1; } -.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; } -.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } -.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; } -.ui-accordion .ui-accordion-content-active { display: block; }/* Autocomplete -----------------------------------*/ -.ui-autocomplete { position: absolute; cursor: default; } -.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; } - -/* workarounds */ -* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ - -/* Menu -----------------------------------*/ -.ui-menu { - list-style:none; - padding: 2px; - margin: 0; - display:block; -} -.ui-menu .ui-menu { - margin-top: -3px; -} -.ui-menu .ui-menu-item { - margin:0; - padding: 0; - zoom: 1; - float: left; - clear: left; - width: 100%; -} -.ui-menu .ui-menu-item a { - text-decoration:none; - display:block; - padding:.2em .4em; - line-height:1.5; - zoom:1; -} -.ui-menu .ui-menu-item a.ui-state-hover, -.ui-menu .ui-menu-item a.ui-state-active { - font-weight: normal; - margin: -1px; -} -/* Button -----------------------------------*/ - -.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */ -.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ -button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ -.ui-button-icons-only { width: 3.4em; } -button.ui-button-icons-only { width: 3.7em; } - -/*button text element */ -.ui-button .ui-button-text { display: block; line-height: 1.4; } -.ui-button-text-only .ui-button-text { padding: .4em 1em; } -.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } -.ui-button-text-icon .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } -.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; } -/* no icon support for input elements, provide padding by default */ -input.ui-button { padding: .4em 1em; } - -/*button icon element(s) */ -.ui-button-icon-only .ui-icon, .ui-button-text-icon .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; } -.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; } -.ui-button-text-icon .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; } -.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } - -/*button sets*/ -.ui-buttonset { margin-right: 7px; } -.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; } - -/* workarounds */ -button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ - - - - - -/* Dialog -----------------------------------*/ -.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; } -.ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative; } -.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; } -.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } -.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } -.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } -.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } -.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } -.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; } -.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } -.ui-draggable .ui-dialog-titlebar { cursor: move; } -/* Slider -----------------------------------*/ -.ui-slider { position: relative; text-align: left; } -.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } -.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; } - -.ui-slider-horizontal { height: .8em; } -.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } -.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; } -.ui-slider-horizontal .ui-slider-range-min { left: 0; } -.ui-slider-horizontal .ui-slider-range-max { right: 0; } - -.ui-slider-vertical { width: .8em; height: 100px; } -.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; } -.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } -.ui-slider-vertical .ui-slider-range-min { bottom: 0; } -.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs -----------------------------------*/ -.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ -.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; } -.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; } -.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; } -.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; } -.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; } -.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ -.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; } -.ui-tabs .ui-tabs-hide { display: none !important; } -/* Datepicker -----------------------------------*/ -.ui-datepicker { width: 17em; padding: .2em .2em 0; } -.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } -.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } -.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } -.ui-datepicker .ui-datepicker-prev { left:2px; } -.ui-datepicker .ui-datepicker-next { right:2px; } -.ui-datepicker .ui-datepicker-prev-hover { left:1px; } -.ui-datepicker .ui-datepicker-next-hover { right:1px; } -.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } -.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } -.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } -.ui-datepicker select.ui-datepicker-month-year {width: 100%;} -.ui-datepicker select.ui-datepicker-month, -.ui-datepicker select.ui-datepicker-year { width: 49%;} -.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } -.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } -.ui-datepicker td { border: 0; padding: 1px; } -.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } -.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } -.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } -.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } - -/* with multiple calendars */ -.ui-datepicker.ui-datepicker-multi { width:auto; } -.ui-datepicker-multi .ui-datepicker-group { float:left; } -.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } -.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } -.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } -.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } -.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } -.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } -.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } -.ui-datepicker-row-break { clear:both; width:100%; } - -/* RTL support */ -.ui-datepicker-rtl { direction: rtl; } -.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } -.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } -.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } -.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } -.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } -.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } -.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } -.ui-datepicker-rtl .ui-datepicker-group { float:right; } -.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } -.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } - -/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ -.ui-datepicker-cover { - display: none; /*sorry for IE5*/ - display/**/: block; /*sorry for IE5*/ - position: absolute; /*must have*/ - z-index: -1; /*must have*/ - filter: mask(); /*must have*/ - top: -4px; /*must have*/ - left: -4px; /*must have*/ - width: 200px; /*must have*/ - height: 200px; /*must have*/ -}/* Progressbar -----------------------------------*/ -.ui-progressbar { height:2em; text-align: left; } -.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file diff --git a/spring-webflow-samples/booking-faces/src/test/java/org/springframework/webflow/samples/booking/BookingFlowExecutionTests.java b/spring-webflow-samples/booking-faces/src/test/java/org/springframework/webflow/samples/booking/BookingFlowExecutionTests.java deleted file mode 100644 index 4276dae4..00000000 --- a/spring-webflow-samples/booking-faces/src/test/java/org/springframework/webflow/samples/booking/BookingFlowExecutionTests.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import org.easymock.EasyMock; -import org.springframework.faces.model.converter.FacesConversionService; -import org.springframework.webflow.config.FlowDefinitionResource; -import org.springframework.webflow.config.FlowDefinitionResourceFactory; -import org.springframework.webflow.core.collection.LocalAttributeMap; -import org.springframework.webflow.core.collection.MutableAttributeMap; -import org.springframework.webflow.test.MockExternalContext; -import org.springframework.webflow.test.MockFlowBuilderContext; -import org.springframework.webflow.test.execution.AbstractXmlFlowExecutionTests; - -public class BookingFlowExecutionTests extends AbstractXmlFlowExecutionTests { - - private BookingService bookingService; - - protected void setUp() { - bookingService = EasyMock.createMock(BookingService.class); - } - - @Override - protected FlowDefinitionResource getResource(FlowDefinitionResourceFactory resourceFactory) { - return resourceFactory.createFileResource("src/main/webapp/WEB-INF/flows/booking/booking-flow.xml"); - } - - @Override - protected void configureFlowBuilderContext(MockFlowBuilderContext builderContext) { - builderContext.registerBean("bookingService", bookingService); - builderContext.getFlowBuilderServices().setConversionService(new FacesConversionService()); - } - - public void testStartBookingFlow() { - Booking booking = createTestBooking(); - - EasyMock.expect(bookingService.createBooking(1L, "keith")).andReturn(booking); - - EasyMock.replay(bookingService); - - MutableAttributeMap input = new LocalAttributeMap(); - input.put("hotelId", "1"); - MockExternalContext context = new MockExternalContext(); - context.setCurrentUser("keith"); - startFlow(input, context); - - assertCurrentStateEquals("enterBookingDetails"); - assertResponseWrittenEquals("enterBookingDetails", context); - assertTrue(getRequiredFlowAttribute("booking") instanceof Booking); - - EasyMock.verify(bookingService); - } - - public void testEnterBookingDetails_Proceed() { - setCurrentState("enterBookingDetails"); - getFlowScope().put("booking", createTestBooking()); - - MockExternalContext context = new MockExternalContext(); - context.setEventId("proceed"); - resumeFlow(context); - - assertCurrentStateEquals("reviewBooking"); - assertResponseWrittenEquals("reviewBooking", context); - } - - public void testReviewBooking_Confirm() { - setCurrentState("reviewBooking"); - getFlowScope().put("booking", createTestBooking()); - MockExternalContext context = new MockExternalContext(); - context.setEventId("confirm"); - resumeFlow(context); - assertFlowExecutionEnded(); - assertFlowExecutionOutcomeEquals("bookingConfirmed"); - } - - private Booking createTestBooking() { - Hotel hotel = new Hotel(); - hotel.setId(1L); - hotel.setName("Jameson Inn"); - User user = new User("keith", "pass", "Keith Donald"); - Booking booking = new Booking(hotel, user); - return booking; - } - -} diff --git a/spring-webflow-samples/booking-faces/src/test/java/org/springframework/webflow/samples/booking/MainFlowExecutionTests.java b/spring-webflow-samples/booking-faces/src/test/java/org/springframework/webflow/samples/booking/MainFlowExecutionTests.java deleted file mode 100644 index 9feca43d..00000000 --- a/spring-webflow-samples/booking-faces/src/test/java/org/springframework/webflow/samples/booking/MainFlowExecutionTests.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.util.ArrayList; -import java.util.List; - -import javax.faces.model.DataModel; - -import org.easymock.EasyMock; -import org.springframework.binding.mapping.Mapper; -import org.springframework.binding.mapping.MappingResults; -import org.springframework.faces.model.converter.FacesConversionService; -import org.springframework.webflow.config.FlowDefinitionResource; -import org.springframework.webflow.config.FlowDefinitionResourceFactory; -import org.springframework.webflow.core.collection.AttributeMap; -import org.springframework.webflow.engine.EndState; -import org.springframework.webflow.engine.Flow; -import org.springframework.webflow.test.MockExternalContext; -import org.springframework.webflow.test.MockFlowBuilderContext; -import org.springframework.webflow.test.execution.AbstractXmlFlowExecutionTests; - -public class MainFlowExecutionTests extends AbstractXmlFlowExecutionTests { - - private BookingService bookingService; - - protected void setUp() { - bookingService = EasyMock.createMock(BookingService.class); - } - - @Override - protected FlowDefinitionResource getResource(FlowDefinitionResourceFactory resourceFactory) { - return resourceFactory.createFileResource("src/main/webapp/WEB-INF/flows/main/main-flow.xml"); - } - - @Override - protected void configureFlowBuilderContext(MockFlowBuilderContext builderContext) { - builderContext.registerBean("bookingService", bookingService); - builderContext.getFlowBuilderServices().setConversionService(new FacesConversionService()); - } - - public void testStartMainFlow() { - List bookings = new ArrayList(); - bookings.add(new Booking(new Hotel(), new User("keith", "password", "Keith Donald"))); - EasyMock.expect(bookingService.findBookings("keith")).andReturn(bookings); - EasyMock.replay(bookingService); - - MockExternalContext context = new MockExternalContext(); - context.setCurrentUser("keith"); - startFlow(context); - assertCurrentStateEquals("enterSearchCriteria"); - assertResponseWrittenEquals("enterSearchCriteria", context); - assertTrue(getRequiredFlowAttribute("searchCriteria") instanceof SearchCriteria); - assertTrue(getRequiredViewAttribute("bookings") instanceof DataModel); - - EasyMock.verify(bookingService); - } - - public void testSearchHotels() { - setCurrentState("enterSearchCriteria"); - - SearchCriteria criteria = new SearchCriteria(); - criteria.setSearchString("Jameson"); - getFlowScope().put("searchCriteria", criteria); - - MockExternalContext context = new MockExternalContext(); - context.setEventId("search"); - resumeFlow(context); - - assertCurrentStateEquals("reviewHotels"); - assertResponseWrittenEquals("reviewHotels", context); - assertTrue(getRequiredViewAttribute("hotels") instanceof HotelLazyDataModel); - } - - public void testSelectHotel() { - setCurrentState("reviewHotels"); - - List hotels = new ArrayList(); - Hotel hotel = new Hotel(); - hotel.setId(1L); - hotel.setName("Jameson Inn"); - hotels.add(hotel); - HotelLazyDataModel dataModel = new HotelLazyDataModel(null, null); - dataModel.setSelected(hotel); - getViewScope().put("hotels", dataModel); - - MockExternalContext context = new MockExternalContext(); - context.setEventId("select"); - resumeFlow(context); - - assertCurrentStateEquals("reviewHotel"); - assertNull(getFlowAttribute("hotels")); - assertSame(hotel, getFlowAttribute("hotel")); - } - - public void testBookHotel() { - setCurrentState("reviewHotel"); - - Hotel hotel = new Hotel(); - hotel.setId(1L); - hotel.setName("Jameson Inn"); - getFlowScope().put("hotel", hotel); - - Flow mockBookingFlow = new Flow("booking"); - mockBookingFlow.setInputMapper(new Mapper() { - public MappingResults map(Object source, Object target) { - assertEquals(new Long(1), ((AttributeMap) source).get("hotelId")); - return null; - } - }); - new EndState(mockBookingFlow, "bookingConfirmed"); - getFlowDefinitionRegistry().registerFlowDefinition(mockBookingFlow); - - MockExternalContext context = new MockExternalContext(); - context.setEventId("book"); - resumeFlow(context); - - assertFlowExecutionEnded(); - assertFlowExecutionOutcomeEquals("finish"); - } -} diff --git a/spring-webflow-samples/booking-faces/src/test/resources/.gitignore b/spring-webflow-samples/booking-faces/src/test/resources/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/spring-webflow-samples/booking-mvc/.project b/spring-webflow-samples/booking-mvc/.project deleted file mode 100644 index 095416c1..00000000 --- a/spring-webflow-samples/booking-mvc/.project +++ /dev/null @@ -1,22 +0,0 @@ - - booking-mvc - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - org.eclipse.jdt.core.javabuilder - - - org.eclipse.wst.common.project.facet.core.builder - - - org.eclipse.wst.validation.validationbuilder - - - - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/build.xml b/spring-webflow-samples/booking-mvc/build.xml deleted file mode 100755 index 914de0de..00000000 --- a/spring-webflow-samples/booking-mvc/build.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/spring-webflow-samples/booking-mvc/pom.xml b/spring-webflow-samples/booking-mvc/pom.xml deleted file mode 100644 index d18053e8..00000000 --- a/spring-webflow-samples/booking-mvc/pom.xml +++ /dev/null @@ -1,272 +0,0 @@ - - - 4.0.0 - org.springframework.webflow.samples - booking-mvc - war - Hotel Booking : Spring MVC + Web Flow + JSP - 2.3.3.BUILD-SNAPSHOT - - 3.2.1.RELEASE - 3.1.3.RELEASE - 1.5.10 - - - - - org.springframework - spring-context - ${org.springframework-version} - - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${org.springframework-version} - - - - commons-logging - commons-logging - - - - - org.springframework - spring-jdbc - ${org.springframework-version} - - - org.springframework - spring-orm - ${org.springframework-version} - - - org.springframework.webflow - spring-webflow - ${project.version} - - - org.springframework.webflow - spring-js - ${project.version} - - - org.springframework.security - spring-security-web - ${org.springsecurity-version} - - - - commons-logging - commons-logging - - - org.springframework - spring-web - - - - - org.springframework.security - spring-security-taglibs - ${org.springsecurity-version} - - - org.springframework - spring-web - - - - - org.springframework.security - spring-security-config - ${org.springsecurity-version} - - - - commons-logging - commons-logging - - - - - - org.slf4j - slf4j-api - ${org.slf4j-version} - - - org.slf4j - jcl-over-slf4j - ${org.slf4j-version} - - - org.slf4j - slf4j-log4j12 - ${org.slf4j-version} - runtime - - - log4j - log4j - 1.2.15 - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime - - - - org.hsqldb - hsqldb - 1.8.0.10 - runtime - - - org.hibernate - hibernate-entitymanager - 3.5.0-Final - - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - jstl - 1.2 - - - - org.apache.tiles - tiles-jsp - 2.1.3 - - - - commons-logging - commons-logging-api - - - - - - org.hibernate - hibernate-validator - 4.1.0.Beta1 - - - - javax.xml.bind - jaxb-api - 2.1 - - - - joda-time - joda-time - 1.6 - - - joda-time - joda-time-jsptags - 1.0.2 - runtime - - - - org.easymock - easymock - 2.5.2 - test - - - junit - junit - 3.8.2 - test - - - org.springframework - spring-test - ${org.springframework-version} - test - - - - - spring-repository - Spring project snapshots, milestones, and releases - http://repo.springsource.org/snapshot - - - - booking-mvc - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-surefire-plugin - - junit:junit - - **/*Tests.java - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - true - false - 2.0 - - - - - diff --git a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/Amenity.java b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/Amenity.java deleted file mode 100644 index 9b1c2255..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/Amenity.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.springframework.webflow.samples.booking; - -public enum Amenity { - OCEAN_VIEW, LATE_CHECKOUT, MINIBAR; -} diff --git a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/Booking.java b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/Booking.java deleted file mode 100755 index b25931c7..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/Booking.java +++ /dev/null @@ -1,215 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.text.DateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.Set; - -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; -import javax.validation.constraints.Future; -import javax.validation.constraints.NotNull; - -import org.hibernate.validator.constraints.NotEmpty; -import org.springframework.format.annotation.DateTimeFormat; - -/** - * A Hotel Booking made by a User. - */ -@Entity -@BookingDateRange -public class Booking implements Serializable { - - private Long id; - - private User user; - - private Hotel hotel; - - @DateTimeFormat(pattern = "MM-dd-yyyy") - private Date checkinDate; - - @DateTimeFormat(pattern = "MM-dd-yyyy") - private Date checkoutDate; - - private String creditCard; - - private String creditCardName; - - private int creditCardExpiryMonth; - - private int creditCardExpiryYear; - - private boolean smoking; - - private int beds; - - private Set amenities; - - public Booking() { - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.DAY_OF_MONTH, 1); - setCheckinDate(calendar.getTime()); - calendar.add(Calendar.DAY_OF_MONTH, 1); - setCheckoutDate(calendar.getTime()); - } - - public Booking(Hotel hotel, User user) { - this(); - this.hotel = hotel; - this.user = user; - } - - @Transient - public BigDecimal getTotal() { - return hotel.getPrice().multiply(new BigDecimal(getNights())); - } - - @Transient - public int getNights() { - if (checkinDate == null || checkoutDate == null) { - return 0; - } else { - return (int) ((checkoutDate.getTime() - checkinDate.getTime()) / 1000 / 60 / 60 / 24); - } - } - - @Id - @GeneratedValue(strategy = GenerationType.TABLE) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - @Basic - @Temporal(TemporalType.DATE) - @NotNull - @Future - public Date getCheckinDate() { - return checkinDate; - } - - public void setCheckinDate(Date datetime) { - this.checkinDate = datetime; - } - - @ManyToOne - public Hotel getHotel() { - return hotel; - } - - public void setHotel(Hotel hotel) { - this.hotel = hotel; - } - - @ManyToOne - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - - @Basic - @Temporal(TemporalType.DATE) - @NotNull - @Future - public Date getCheckoutDate() { - return checkoutDate; - } - - public void setCheckoutDate(Date checkoutDate) { - this.checkoutDate = checkoutDate; - } - - @NotEmpty - public String getCreditCard() { - return creditCard; - } - - public void setCreditCard(String creditCard) { - this.creditCard = creditCard; - } - - @Transient - public String getDescription() { - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM); - return hotel == null ? null : hotel.getName() + ", " + df.format(getCheckinDate()) + " to " - + df.format(getCheckoutDate()); - } - - public boolean isSmoking() { - return smoking; - } - - public void setSmoking(boolean smoking) { - this.smoking = smoking; - } - - public int getBeds() { - return beds; - } - - public void setBeds(int beds) { - this.beds = beds; - } - - @NotEmpty - public String getCreditCardName() { - return creditCardName; - } - - public void setCreditCardName(String creditCardName) { - this.creditCardName = creditCardName; - } - - public int getCreditCardExpiryMonth() { - return creditCardExpiryMonth; - } - - public void setCreditCardExpiryMonth(int creditCardExpiryMonth) { - this.creditCardExpiryMonth = creditCardExpiryMonth; - } - - public int getCreditCardExpiryYear() { - return creditCardExpiryYear; - } - - public void setCreditCardExpiryYear(int creditCardExpiryYear) { - this.creditCardExpiryYear = creditCardExpiryYear; - } - - @Transient - public Set getAmenities() { - return amenities; - } - - public void setAmenities(Set amenities) { - this.amenities = amenities; - } - - private Date today() { - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.DAY_OF_MONTH, -1); - return calendar.getTime(); - } - - @Override - public String toString() { - return "Booking(" + user + "," + hotel + ")"; - } - -} diff --git a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRange.java b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRange.java deleted file mode 100644 index a5cad188..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRange.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import javax.validation.Constraint; -import javax.validation.Payload; - -@Constraint(validatedBy = BookingDateRangeValidator.class) -@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER }) -@Retention(RetentionPolicy.RUNTIME) -public @interface BookingDateRange { - - String message() default "Invalid check-in and check-out date range"; - - Class[] groups() default {}; - - Class[] payload() default {}; - -} diff --git a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRangeValidator.java b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRangeValidator.java deleted file mode 100644 index 716a40bc..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRangeValidator.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - -public class BookingDateRangeValidator implements ConstraintValidator { - - public void initialize(BookingDateRange bookingDateRange) { - } - - public boolean isValid(Booking booking, ConstraintValidatorContext context) { - if ((booking.getCheckinDate() != null) && (booking.getCheckoutDate() != null) - && booking.getCheckoutDate().before(booking.getCheckinDate())) { - return false; - } - return true; - } - -} diff --git a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingFlowHandler.java b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingFlowHandler.java deleted file mode 100644 index 726f2bd7..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingFlowHandler.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.webflow.core.FlowException; -import org.springframework.webflow.execution.FlowExecutionOutcome; -import org.springframework.webflow.execution.repository.NoSuchFlowExecutionException; -import org.springframework.webflow.mvc.servlet.AbstractFlowHandler; - -public class BookingFlowHandler extends AbstractFlowHandler { - - private static final String DEFAULT_URL = "/hotels/search"; - - @Override - public String handleExecutionOutcome(FlowExecutionOutcome outcome, HttpServletRequest request, - HttpServletResponse response) { - return DEFAULT_URL; - } - - @Override - public String handleException(FlowException e, HttpServletRequest request, HttpServletResponse response) { - if (e instanceof NoSuchFlowExecutionException) { - return DEFAULT_URL; - } else { - throw e; - } - } - -} diff --git a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingService.java b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingService.java deleted file mode 100755 index f6b6f9d2..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingService.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.util.List; - -/** - * A service interface for retrieving hotels and bookings from a backing repository. Also supports the ability to cancel - * a booking. - */ -public interface BookingService { - - /** - * Find bookings made by the given user - * @param username the user's name - * @return their bookings - */ - public List findBookings(String username); - - /** - * Find hotels available for booking by some criteria. - * @param criteria the search criteria - * @return a list of hotels meeting the criteria - */ - public List findHotels(SearchCriteria criteria); - - /** - * Find hotels by their identifier. - * @param id the hotel id - * @return the hotel - */ - public Hotel findHotelById(Long id); - - /** - * Create a new, transient hotel booking instance for the given user. - * @param hotelId the hotelId - * @param userName the user name - * @return the new transient booking instance - */ - public Booking createBooking(Long hotelId, String userName); - - /** - * Persist the booking to the database - * @param booking the booking - */ - public void persistBooking(Booking booking); - - /** - * Cancel an existing booking. - * @param id the booking id - */ - public void cancelBooking(Long id); - -} diff --git a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/Hotel.java b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/Hotel.java deleted file mode 100755 index 99719e50..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/Hotel.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; -import java.math.BigDecimal; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -/** - * A hotel where users may book stays. - */ -@Entity -public class Hotel implements Serializable { - private Long id; - - private String name; - - private String address; - - private String city; - - private String state; - - private String zip; - - private String country; - - private BigDecimal price; - - @Id - @GeneratedValue - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getZip() { - return zip; - } - - public void setZip(String zip) { - this.zip = zip; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public String getCountry() { - return country; - } - - public void setCountry(String country) { - this.country = country; - } - - @Column(precision = 6, scale = 2) - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - public Booking createBooking(User user) { - return new Booking(this, user); - } - - @Override - public String toString() { - return "Hotel(" + name + "," + address + "," + city + "," + zip + ")"; - } -} diff --git a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/HotelsController.java b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/HotelsController.java deleted file mode 100644 index fb49728f..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/HotelsController.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.security.Principal; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -@Controller -public class HotelsController { - - private BookingService bookingService; - - @Autowired - public HotelsController(BookingService bookingService) { - this.bookingService = bookingService; - } - - @RequestMapping(value = "/hotels/search", method = RequestMethod.GET) - public void search(SearchCriteria searchCriteria, Principal currentUser, Model model) { - if (currentUser != null) { - List booking = bookingService.findBookings(currentUser.getName()); - model.addAttribute(booking); - } - } - - @RequestMapping(value = "/hotels", method = RequestMethod.GET) - public String list(SearchCriteria criteria, Model model) { - List hotels = bookingService.findHotels(criteria); - model.addAttribute(hotels); - return "hotels/list"; - } - - @RequestMapping(value = "/hotels/{id}", method = RequestMethod.GET) - public String show(@PathVariable Long id, Model model) { - model.addAttribute(bookingService.findHotelById(id)); - return "hotels/show"; - } - - @RequestMapping(value = "/bookings/{id}", method = RequestMethod.DELETE) - public String deleteBooking(@PathVariable Long id) { - bookingService.cancelBooking(id); - return "redirect:../hotels/search"; - } - -} diff --git a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java deleted file mode 100755 index e88436ef..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - -import org.springframework.stereotype.Repository; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - -/** - * A JPA-based implementation of the Booking Service. Delegates to a JPA entity manager to issue data access calls - * against the backing repository. The EntityManager reference is provided by the managing container (Spring) - * automatically. - */ -@Service("bookingService") -@Repository -public class JpaBookingService implements BookingService { - - private EntityManager em; - - @PersistenceContext - public void setEntityManager(EntityManager em) { - this.em = em; - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public List findBookings(String username) { - if (username != null) { - return em.createQuery("select b from Booking b where b.user.username = :username order by b.checkinDate") - .setParameter("username", username).getResultList(); - } else { - return null; - } - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public List findHotels(SearchCriteria criteria) { - String pattern = getSearchPattern(criteria); - int startIndex = criteria.getPage() * criteria.getPageSize(); - return em - .createQuery( - "select h from Hotel h where lower(h.name) like :pattern or lower(h.city) like :pattern " - + " or lower(h.zip) like :pattern or lower(h.address) like :pattern") - .setParameter("pattern", pattern).setFirstResult(startIndex).setMaxResults(criteria.getPageSize()) - .getResultList(); - } - - @Transactional(readOnly = true) - public Hotel findHotelById(Long id) { - return em.find(Hotel.class, id); - } - - @Transactional(readOnly = true) - public Booking createBooking(Long hotelId, String username) { - Hotel hotel = em.find(Hotel.class, hotelId); - User user = findUser(username); - Booking booking = new Booking(hotel, user); - return booking; - } - - @Transactional - public void persistBooking(Booking booking) { - em.persist(booking); - } - - @Transactional - public void cancelBooking(Long id) { - Booking booking = em.find(Booking.class, id); - if (booking != null) { - em.remove(booking); - } - } - - // helpers - - private String getSearchPattern(SearchCriteria criteria) { - if (StringUtils.hasText(criteria.getSearchString())) { - return "%" + criteria.getSearchString().toLowerCase().replace('*', '%') + "%"; - } else { - return "%"; - } - } - - private User findUser(String username) { - return (User) em.createQuery("select u from User u where u.username = :username") - .setParameter("username", username).getSingleResult(); - } - -} \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java deleted file mode 100755 index 0db814b3..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; - - -/** - * A backing bean for the main hotel search form. Encapsulates the criteria needed to perform a hotel search. - * - * It is expected a future milestone of Spring Web Flow 2.0 will allow flow-scoped beans like this one to hold - * references to transient services that are restored automatically when the flow is resumed on subsequent requests. - * This would allow this SearchCriteria object to delegate to the {@link BookingService} directly, for example, - * eliminating the need for the actions in {@link MainActions}. - */ -public class SearchCriteria implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * The user-provided search criteria for finding Hotels. - */ - private String searchString; - - /** - * The maximum page size of the Hotel result list - */ - private int pageSize; - - /** - * The current page of the Hotel result list. - */ - private int page; - - public String getSearchString() { - return searchString; - } - - public void setSearchString(String searchString) { - this.searchString = searchString; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPage() { - return page; - } - - public void setPage(int page) { - this.page = page; - } -} \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/User.java b/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/User.java deleted file mode 100755 index 55213ad0..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/java/org/springframework/webflow/samples/booking/User.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -/** - * A user who can book hotels. - */ -@Entity -@Table(name = "Customer") -public class User implements Serializable { - private String username; - - private String password; - - private String name; - - public User() { - } - - public User(String username, String password, String name) { - this.username = username; - this.password = password; - this.name = name; - } - - @Id - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public String toString() { - return "User(" + username + ")"; - } -} diff --git a/spring-webflow-samples/booking-mvc/src/main/resources/META-INF/persistence.xml b/spring-webflow-samples/booking-mvc/src/main/resources/META-INF/persistence.xml deleted file mode 100755 index f4e3d6a7..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - org.hibernate.ejb.HibernatePersistence - org.springframework.webflow.samples.booking.User - org.springframework.webflow.samples.booking.Booking - org.springframework.webflow.samples.booking.Hotel - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/resources/import.sql b/spring-webflow-samples/booking-mvc/src/main/resources/import.sql deleted file mode 100755 index e3211aac..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/resources/import.sql +++ /dev/null @@ -1,27 +0,0 @@ -insert into Customer (username, name) values ('keith', 'Keith') -insert into Customer (username, name) values ('erwin', 'Erwin') -insert into Customer (username, name) values ('jeremy', 'Jeremy') -insert into Customer (username, name) values ('scott', 'Scott') -insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 199, 'Westin Diplomat', '3555 S. Ocean Drive', 'Hollywood', 'FL', '33019', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 60, 'Jameson Inn', '890 Palm Bay Rd NE', 'Palm Bay', 'FL', '32905', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 199, 'Chilworth Manor', 'The Cottage, Southampton Business Park', 'Southampton', 'Hants', 'SO16 7JF', 'UK') -insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (7, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 130, 'Hotel Beaulac', ' Esplanade Léopold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (22, 250, 'Meliá White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (23, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/resources/log4j.xml b/spring-webflow-samples/booking-mvc/src/main/resources/log4j.xml deleted file mode 100644 index b4e9ad15..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/resources/log4j.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/META-INF/MANIFEST.MF b/spring-webflow-samples/booking-mvc/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/classes/log4j.properties b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/classes/log4j.properties deleted file mode 100755 index 992d816d..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,11 +0,0 @@ -log4j.rootCategory=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n - -# Enable web flow logging -log4j.category.org.springframework.webflow=DEBUG -log4j.category.org.springframework.faces=DEBUG -log4j.category.org.springframework.binding=DEBUG -log4j.category.org.springframework.transaction=DEBUG \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml deleted file mode 100644 index 94e2bae0..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/data-access-config.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - hibernate.session_factory_name=mySessionFactory - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml deleted file mode 100644 index c1a44fca..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/security-config.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml deleted file mode 100644 index 5791b170..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/web-application-config.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml deleted file mode 100644 index 7dcaeed3..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml deleted file mode 100644 index 56e56fd4..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /WEB-INF/**/views.xml - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml deleted file mode 100644 index ff62d702..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp deleted file mode 100644 index 1f95919d..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp +++ /dev/null @@ -1,196 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -
-
-

${booking.hotel.name}

- -
- ${booking.hotel.address} -
- ${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip} -
- ${booking.hotel.country} -
-

- Nightly rate: ${status.value} -

-
-
- -
- - -
- - -
- - -
- Book Hotel -
-
- -
-
-

- - -
-
-
-
- -
-
-

- -
-
-
-
- -
-
-

- - - - - -

-
-
-
-
- Smoking Preference: -
-
-

- - -

- -
-
-
-
- Amenities: -
-
-

- -
- -
- -

- -
-
-
-
- -
-
-

- -
-
-
-
- -
-
-

- -
-
-
-
- -
-
-

- - - - - - - - - - - - - - - - - - - - - -

-
-
-
-

- - -

- -
-
- -
-
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.jsp deleted file mode 100644 index 42054c9c..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.jsp +++ /dev/null @@ -1,5 +0,0 @@ -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -
- -
\ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.properties b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.properties deleted file mode 100644 index 3d15709e..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/messages.properties +++ /dev/null @@ -1,16 +0,0 @@ -booking.checkinDate.NotNull=The check in date is required -booking.checkinDate.Future=The check in date must be in the future -booking.checkinDate.beforeToday=The check in date must be a future date -booking.checkinDate.typeMismatch=The check in date must be in the format mm-dd-yyyy - -booking.checkoutDate.Future=The check out date must be in the future -booking.checkoutDate.NotNull=The check out date is required -booking.checkoutDate.typeMismatch=The check out date must be in the format mm-dd-yyyy -booking.BookingDateRange=The check out date must be later than the check in date - -booking.creditCard.NotEmpty=The credit card must be a valid 16 digit number -booking.creditCardName.NotEmpty=The name on the credit card is required - -NotEmpty=The {0} field is required -NotNull=The {0} field is required -Future=The {0} date must be in the future \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp deleted file mode 100644 index 9efe4faa..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/reviewBooking.jsp +++ /dev/null @@ -1,65 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -
-
-

${booking.hotel.name}

- -
- ${booking.hotel.address} -
- ${booking.hotel.city}, ${booking.hotel.state}, ${booking.hotel.zip} -
- ${booking.hotel.country} -
-
-
- -
- Confirm Booking Details -
-
Check In:
-
-

${status.value}

-
-
-
-
Checkout:
-
-

${status.value}

-
-
-
-
Number of Nights:
-
-

${status.value}

-
-
-
-
Total Payment:
-
-

${status.value}

-
-
-
-
Credit Card #:
-
-

${booking.creditCard}

-
-
-
-

- - - -

- -
-
- -
- -
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml deleted file mode 100644 index 3e1ee8b1..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.jsp deleted file mode 100644 index 6d662836..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/bookingsTable.jsp +++ /dev/null @@ -1,53 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -
- -

Current Hotel Bookings

- - - - No bookings found - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameAddressCity, StateCheck in DateCheck out DateConfirmation NumberAction
${booking.hotel.name}${booking.hotel.address}${booking.hotel.city}, ${booking.hotel.state}${booking.checkinDate}${booking.checkoutDate}${booking.id} - - - - - - -
- - - -
\ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp deleted file mode 100644 index fdd08803..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/list.jsp +++ /dev/null @@ -1,74 +0,0 @@ -<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> - -

Hotel Results

-

- Change Search - -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameAddressCity, StateZipAction
${hotel.name}${hotel.address}${hotel.city}, ${hotel.state}, ${hotel.country}${hotel.zip}View Hotel
No hotels found
-
-
- - Previous Results - - -
-
- - More Results - - -
-
- -
- diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/search.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/search.jsp deleted file mode 100644 index 50d79b91..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/search.jsp +++ /dev/null @@ -1,5 +0,0 @@ -<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> - - - - diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp deleted file mode 100644 index 0940b440..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/searchForm.jsp +++ /dev/null @@ -1,36 +0,0 @@ -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - -

Search Hotels

- - - - - - -
-
- - - -
-
-
- - - - - - -
-
-
- -
-
- \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp deleted file mode 100644 index 82e2e708..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/show.jsp +++ /dev/null @@ -1,22 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -

${hotel.name}

-
- ${hotel.address} -
- ${hotel.city}, ${hotel.state}, ${hotel.zip} -
- ${hotel.country} -
-
-

- Nightly Rate: - ${status.value} -

- -
- -
-
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml deleted file mode 100644 index 42e7bc09..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp deleted file mode 100755 index 4525d2f1..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp +++ /dev/null @@ -1,29 +0,0 @@ -
-

Welcome to Spring Travel

-

- This sample demonstrates how to use Spring MVC and Spring Web Flow together with JavaServerPages (JSP) and Tiles. -

-
-

- The key features illustrated in this sample include: -

-
    -
  • A declarative navigation model enabling full browser button support and dynamic navigation rules
    • -
  • A fine-grained state management model, including support for ConversationScope and ViewScope
    • -
  • Modularization of web application functionality by domain use case, illustrating project structure best-practices
    • -
  • Spring Expression Language (SpEL) integration
    • -
  • Spring 3 formatting annotations @DateTimeFormat, @NumberFormat
    • -
  • Spring MVC custom namespace
    • -
  • Spring Security integration
    • -
  • Annotated POJO @Controllers for implementing RESTful user interactions.
    • -
  • Declarative page authoring with JSP, JSTL, and Spring MVC's form tag library
    • -
  • Page layout and composition with Apache Tiles
    • -
  • A JavaScript API for decorating HTML elements with behaviors such as Ajax, validation, and effects.
    • -
  • A grid layout with Blueprint CSS
    • -
  • Exception handling support across all layers of the application
    • -
  • SpringSource Tool Suite integration, with support for graphical flow modeling and visualization
    • -
-

- Start your Spring Travel experience -

-
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp deleted file mode 100644 index 5e7bfbb8..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/standard.jsp +++ /dev/null @@ -1,69 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> -<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> - - - - - Spring Travel: Spring MVC and Web Flow Reference Application - " /> - " type="text/css" media="screen, projection" /> - " type="text/css" media="print" /> - - " type="text/css" media="screen" /> - - - - - -
- -
- -
- -
-
-
- -
- - \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml deleted file mode 100644 index 0f94b929..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/views.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp deleted file mode 100755 index 04d9c59e..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp +++ /dev/null @@ -1,66 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -<%@ page import="org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter" %> -<%@ page import="org.springframework.security.core.AuthenticationException" %> - -
-

Valid username/passwords are:

-
    -
  • keith/melbourne
    • -
  • erwin/leuven
    • -
  • jeremy/atlanta
    • -
  • scott/rochester
    • -
-
- -
- -
- Your login attempt was not successful, try again.

- Reason: <%= ((AuthenticationException) session.getAttribute(UsernamePasswordAuthenticationFilter.SPRING_SECURITY_LAST_EXCEPTION_KEY)).getMessage() %> -
- -
" method="post"> -
- Login Information -

- -
- value="<%= session.getAttribute(UsernamePasswordAuthenticationFilter.SPRING_SECURITY_LAST_USERNAME_KEY) %>" /> -

- -

- -
- -

- -

- - -

- -

- - -

-
-
-
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp deleted file mode 100755 index 8f7418c3..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp +++ /dev/null @@ -1,8 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - -
-

Logout

-

You have successfully logged out.

-
-

">Continue

-
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/views.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/views.xml deleted file mode 100644 index 96200a15..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/views.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/web.xml deleted file mode 100755 index 99c45932..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - contextConfigLocation - - /WEB-INF/config/web-application-config.xml - - - - - - org.springframework.web.context.ContextLoaderListener - - - - - httpMethodFilter - org.springframework.web.filter.HiddenHttpMethodFilter - - - - httpMethodFilter - Spring MVC Dispatcher Servlet - - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - springSecurityFilterChain - Spring MVC Dispatcher Servlet - - - - - Spring MVC Dispatcher Servlet - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - - - 1 - - - - - Spring MVC Dispatcher Servlet - / - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/bg.gif b/spring-webflow-samples/booking-mvc/src/main/webapp/images/bg.gif deleted file mode 100644 index ea9200df..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/images/bg.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/btn.bg.gif b/spring-webflow-samples/booking-mvc/src/main/webapp/images/btn.bg.gif deleted file mode 100644 index b77cc954..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/images/btn.bg.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/diplomat.jpg b/spring-webflow-samples/booking-mvc/src/main/webapp/images/diplomat.jpg deleted file mode 100644 index e1d0c9cd..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/images/diplomat.jpg and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/header.jpg b/spring-webflow-samples/booking-mvc/src/main/webapp/images/header.jpg deleted file mode 100644 index 6893bd89..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/images/header.jpg and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/input.bg.gif b/spring-webflow-samples/booking-mvc/src/main/webapp/images/input.bg.gif deleted file mode 100644 index 8ebf87e3..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/images/input.bg.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/powered-by-spring.png b/spring-webflow-samples/booking-mvc/src/main/webapp/images/powered-by-spring.png deleted file mode 100644 index e773b170..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/images/powered-by-spring.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/spring-logo.jpg b/spring-webflow-samples/booking-mvc/src/main/webapp/images/spring-logo.jpg deleted file mode 100644 index 62be3983..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/images/spring-logo.jpg and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/springone2gx.jpeg b/spring-webflow-samples/booking-mvc/src/main/webapp/images/springone2gx.jpeg deleted file mode 100644 index b43bcb28..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/images/springone2gx.jpeg and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/th.bg.gif b/spring-webflow-samples/booking-mvc/src/main/webapp/images/th.bg.gif deleted file mode 100644 index 4663cf51..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/images/th.bg.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/tse.gif b/spring-webflow-samples/booking-mvc/src/main/webapp/images/tse.gif deleted file mode 100644 index b1fa98cf..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/images/tse.gif and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/images/webflow-logo.jpg b/spring-webflow-samples/booking-mvc/src/main/webapp/images/webflow-logo.jpg deleted file mode 100644 index ed76bae0..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/images/webflow-logo.jpg and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/icons/cross.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/icons/cross.png deleted file mode 100755 index 1514d51a..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/icons/cross.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/icons/key.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/icons/key.png deleted file mode 100755 index a9d5e4f8..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/icons/key.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/icons/tick.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/icons/tick.png deleted file mode 100755 index a9925a06..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/icons/tick.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/ie.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/ie.css deleted file mode 100755 index bbc1e5c1..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/ie.css +++ /dev/null @@ -1,36 +0,0 @@ -/* ----------------------------------------------------------------------- - - - Blueprint CSS Framework 0.9 - http://blueprintcss.org - - * Copyright (c) 2007-Present. See LICENSE for more info. - * See README for instructions on how to use Blueprint. - * For credits and origins, see AUTHORS. - * This is a compressed file. See the sources in the 'src' directory. - ------------------------------------------------------------------------ */ - -/* ie.css */ -body {text-align:center;} -.container {text-align:left;} -* html .column, * html div.span-1, * html div.span-2, * html div.span-3, * html div.span-4, * html div.span-5, * html div.span-6, * html div.span-7, * html div.span-8, * html div.span-9, * html div.span-10, * html div.span-11, * html div.span-12, * html div.span-13, * html div.span-14, * html div.span-15, * html div.span-16, * html div.span-17, * html div.span-18, * html div.span-19, * html div.span-20, * html div.span-21, * html div.span-22, * html div.span-23, * html div.span-24 {display:inline;overflow-x:hidden;} -* html legend {margin:0px -8px 16px 0;padding:0;} -ol {margin-left:2em;} -sup {vertical-align:text-top;} -sub {vertical-align:text-bottom;} -html>body p code {*white-space:normal;} -hr {margin:-8px auto 11px;} -img {-ms-interpolation-mode:bicubic;} -.clearfix, .container {display:inline-block;} -* html .clearfix, * html .container {height:1%;} -fieldset {padding-top:0;} -textarea {overflow:auto;} -input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;} -input.text:focus, input.title:focus {border-color:#666;} -input.text, input.title, textarea, select {margin:0.5em 0;} -input.checkbox, input.radio {position:relative;top:.25em;} -form.inline div, form.inline p {vertical-align:middle;} -form.inline label {position:relative;top:-0.25em;} -form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;} -button, input.button {position:relative;top:0.25em;} \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/icons/cross.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/icons/cross.png deleted file mode 100755 index 1514d51a..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/icons/cross.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/icons/key.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/icons/key.png deleted file mode 100755 index a9d5e4f8..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/icons/key.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/icons/tick.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/icons/tick.png deleted file mode 100755 index a9925a06..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/icons/tick.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/readme.txt b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/readme.txt deleted file mode 100755 index a8c2b570..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/readme.txt +++ /dev/null @@ -1,32 +0,0 @@ -Buttons - -* Gives you great looking CSS buttons, for both and - - - Change Password - - - - Cancel - diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/screen.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/screen.css deleted file mode 100755 index bb66b215..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/buttons/screen.css +++ /dev/null @@ -1,97 +0,0 @@ -/* -------------------------------------------------------------- - - buttons.css - * Gives you some great CSS-only buttons. - - Created by Kevin Hale [particletree.com] - * particletree.com/features/rediscovering-the-button-element - - See Readme.txt in this folder for instructions. - --------------------------------------------------------------- */ - -a.button, button { - display:block; - float:left; - margin: 0.7em 0.5em 0.7em 0; - padding:5px 10px 5px 7px; /* Links */ - - border:1px solid #dedede; - border-top:1px solid #eee; - border-left:1px solid #eee; - - background-color:#f5f5f5; - font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif; - font-size:100%; - line-height:130%; - text-decoration:none; - font-weight:bold; - color:#565656; - cursor:pointer; -} -button { - width:auto; - overflow:visible; - padding:4px 10px 3px 7px; /* IE6 */ -} -button[type] { - padding:4px 10px 4px 7px; /* Firefox */ - line-height:17px; /* Safari */ -} -*:first-child+html button[type] { - padding:4px 10px 3px 7px; /* IE7 */ -} -button img, a.button img{ - margin:0 3px -3px 0 !important; - padding:0; - border:none; - width:16px; - height:16px; - float:none; -} - - -/* Button colors --------------------------------------------------------------- */ - -/* Standard */ -button:hover, a.button:hover{ - background-color:#dff4ff; - border:1px solid #c2e1ef; - color:#336699; -} -a.button:active{ - background-color:#6299c5; - border:1px solid #6299c5; - color:#fff; -} - -/* Positive */ -body .positive { - color:#529214; -} -a.positive:hover, button.positive:hover { - background-color:#E6EFC2; - border:1px solid #C6D880; - color:#529214; -} -a.positive:active { - background-color:#529214; - border:1px solid #529214; - color:#fff; -} - -/* Negative */ -body .negative { - color:#d12f19; -} -a.negative:hover, button.negative:hover { - background-color:#fbe3e4; - border:1px solid #fbc2c4; - color:#d12f19; -} -a.negative:active { - background-color:#d12f19; - border:1px solid #d12f19; - color:#fff; -} diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/fancy-type/readme.txt b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/fancy-type/readme.txt deleted file mode 100755 index 85f24915..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/fancy-type/readme.txt +++ /dev/null @@ -1,14 +0,0 @@ -Fancy Type - -* Gives you classes to use if you'd like some - extra fancy typography. - -Credits and instructions are specified above each class -in the fancy-type.css file in this directory. - - -Usage ----------------------------------------------------------------- - -1) Add this plugin to lib/settings.yml. - See compress.rb for instructions. diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/fancy-type/screen.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/fancy-type/screen.css deleted file mode 100755 index 028e05bb..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/fancy-type/screen.css +++ /dev/null @@ -1,71 +0,0 @@ -/* -------------------------------------------------------------- - - fancy-type.css - * Lots of pretty advanced classes for manipulating text. - - See the Readme file in this folder for additional instructions. - --------------------------------------------------------------- */ - -/* Indentation instead of line shifts for sibling paragraphs. */ - p + p { text-indent:2em; margin-top:-1.5em; } - form p + p { text-indent: 0; } /* Don't want this in forms. */ - - -/* For great looking type, use this code instead of asdf: - asdf - Best used on prepositions and ampersands. */ - -.alt { - color: #666; - font-family: "Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua", Georgia, serif; - font-style: italic; - font-weight: normal; -} - - -/* For great looking quote marks in titles, replace "asdf" with: - “asdf” - (That is, when the title starts with a quote mark). - (You may have to change this value depending on your font size). */ - -.dquo { margin-left: -.5em; } - - -/* Reduced size type with incremental leading - (http://www.markboulton.co.uk/journal/comments/incremental_leading/) - - This could be used for side notes. For smaller type, you don't necessarily want to - follow the 1.5x vertical rhythm -- the line-height is too much. - - Using this class, it reduces your font size and line-height so that for - every four lines of normal sized type, there is five lines of the sidenote. eg: - - New type size in em's: - 10px (wanted side note size) / 12px (existing base size) = 0.8333 (new type size in ems) - - New line-height value: - 12px x 1.5 = 18px (old line-height) - 18px x 4 = 72px - 72px / 5 = 14.4px (new line height) - 14.4px / 10px = 1.44 (new line height in em's) */ - -p.incr, .incr p { - font-size: 10px; - line-height: 1.44em; - margin-bottom: 1.5em; -} - - -/* Surround uppercase words and abbreviations with this class. - Based on work by Jørgen Arnor GÃ¥rdsø Lom [http://twistedintellect.com/] */ - -.caps { - font-variant: small-caps; - letter-spacing: 1px; - text-transform: lowercase; - font-size:1.2em; - line-height:1%; - font-weight:bold; - padding:0 2px; -} diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/doc.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/doc.png deleted file mode 100755 index 834cdfaf..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/doc.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/email.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/email.png deleted file mode 100755 index 7348aed7..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/email.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/external.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/external.png deleted file mode 100755 index cf1cfb42..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/external.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/feed.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/feed.png deleted file mode 100755 index 315c4f4f..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/feed.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/im.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/im.png deleted file mode 100755 index 79f35ccb..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/im.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/pdf.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/pdf.png deleted file mode 100755 index 8f8095e4..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/pdf.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/visited.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/visited.png deleted file mode 100755 index ebf206de..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/visited.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/xls.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/xls.png deleted file mode 100755 index b977d7e5..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/icons/xls.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/readme.txt b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/readme.txt deleted file mode 100755 index 3cb1b2ce..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/readme.txt +++ /dev/null @@ -1,18 +0,0 @@ -Link Icons -* Icons for links based on protocol or file type. - -This is not supported in IE versions < 7. - - -Credits ----------------------------------------------------------------- - -* Marc Morgan -* Olav Bjorkoy [bjorkoy.com] - - -Usage ----------------------------------------------------------------- - -1) Add this line to your HTML: - \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/screen.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/screen.css deleted file mode 100755 index 6d3d47fa..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/link-icons/screen.css +++ /dev/null @@ -1,40 +0,0 @@ -/* -------------------------------------------------------------- - - link-icons.css - * Icons for links based on protocol or file type. - - See the Readme file in this folder for additional instructions. - --------------------------------------------------------------- */ - -/* Use this class if a link gets an icon when it shouldn't. */ -body a.noicon { - background:transparent none !important; - padding:0 !important; - margin:0 !important; -} - -/* Make sure the icons are not cut */ -a[href^="http:"], a[href^="mailto:"], a[href^="http:"]:visited, -a[href$=".pdf"], a[href$=".doc"], a[href$=".xls"], a[href$=".rss"], -a[href$=".rdf"], a[href^="aim:"] { - padding:2px 22px 2px 0; - margin:-2px 0; - background-repeat: no-repeat; - background-position: right center; -} - -/* External links */ -a[href^="http:"] { background-image: url(icons/external.png); } -a[href^="mailto:"] { background-image: url(icons/email.png); } -a[href^="http:"]:visited { background-image: url(icons/visited.png); } - -/* Files */ -a[href$=".pdf"] { background-image: url(icons/pdf.png); } -a[href$=".doc"] { background-image: url(icons/doc.png); } -a[href$=".xls"] { background-image: url(icons/xls.png); } - -/* Misc */ -a[href$=".rss"], -a[href$=".rdf"] { background-image: url(icons/feed.png); } -a[href^="aim:"] { background-image: url(icons/im.png); } \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/rtl/readme.txt b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/rtl/readme.txt deleted file mode 100755 index 4c465352..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/rtl/readme.txt +++ /dev/null @@ -1,10 +0,0 @@ -RTL -* Mirrors Blueprint, so it can be used with Right-to-Left languages. - -By Ran Yaniv Hartstein, ranh.co.il - -Usage ----------------------------------------------------------------- - -1) Add this line to your HTML: - \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/rtl/screen.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/rtl/screen.css deleted file mode 100755 index 7e7ccdb8..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/plugins/rtl/screen.css +++ /dev/null @@ -1,110 +0,0 @@ -/* -------------------------------------------------------------- - - rtl.css - * Mirrors Blueprint for left-to-right languages - - By Ran Yaniv Hartstein [ranh.co.il] - --------------------------------------------------------------- */ - -body .container { direction: rtl; } -body .column, body div.span-1, body div.span-2, body div.span-3, body div.span-4, body div.span-5, body div.span-6, body div.span-7, body div.span-8, body div.span-9, body div.span-10, body div.span-11, body div.span-12, body div.span-13, body div.span-14, body div.span-15, body div.span-16, body div.span-17, body div.span-18, body div.span-19, body div.span-20, body div.span-21, body div.span-22, body div.span-23, body div.span-24 { - float: right; - margin-right: 0; - margin-left: 10px; - text-align:right; -} - -body div.last { margin-left: 0; } -body table .last { padding-left: 0; } - -body .append-1 { padding-right: 0; padding-left: 40px; } -body .append-2 { padding-right: 0; padding-left: 80px; } -body .append-3 { padding-right: 0; padding-left: 120px; } -body .append-4 { padding-right: 0; padding-left: 160px; } -body .append-5 { padding-right: 0; padding-left: 200px; } -body .append-6 { padding-right: 0; padding-left: 240px; } -body .append-7 { padding-right: 0; padding-left: 280px; } -body .append-8 { padding-right: 0; padding-left: 320px; } -body .append-9 { padding-right: 0; padding-left: 360px; } -body .append-10 { padding-right: 0; padding-left: 400px; } -body .append-11 { padding-right: 0; padding-left: 440px; } -body .append-12 { padding-right: 0; padding-left: 480px; } -body .append-13 { padding-right: 0; padding-left: 520px; } -body .append-14 { padding-right: 0; padding-left: 560px; } -body .append-15 { padding-right: 0; padding-left: 600px; } -body .append-16 { padding-right: 0; padding-left: 640px; } -body .append-17 { padding-right: 0; padding-left: 680px; } -body .append-18 { padding-right: 0; padding-left: 720px; } -body .append-19 { padding-right: 0; padding-left: 760px; } -body .append-20 { padding-right: 0; padding-left: 800px; } -body .append-21 { padding-right: 0; padding-left: 840px; } -body .append-22 { padding-right: 0; padding-left: 880px; } -body .append-23 { padding-right: 0; padding-left: 920px; } - -body .prepend-1 { padding-left: 0; padding-right: 40px; } -body .prepend-2 { padding-left: 0; padding-right: 80px; } -body .prepend-3 { padding-left: 0; padding-right: 120px; } -body .prepend-4 { padding-left: 0; padding-right: 160px; } -body .prepend-5 { padding-left: 0; padding-right: 200px; } -body .prepend-6 { padding-left: 0; padding-right: 240px; } -body .prepend-7 { padding-left: 0; padding-right: 280px; } -body .prepend-8 { padding-left: 0; padding-right: 320px; } -body .prepend-9 { padding-left: 0; padding-right: 360px; } -body .prepend-10 { padding-left: 0; padding-right: 400px; } -body .prepend-11 { padding-left: 0; padding-right: 440px; } -body .prepend-12 { padding-left: 0; padding-right: 480px; } -body .prepend-13 { padding-left: 0; padding-right: 520px; } -body .prepend-14 { padding-left: 0; padding-right: 560px; } -body .prepend-15 { padding-left: 0; padding-right: 600px; } -body .prepend-16 { padding-left: 0; padding-right: 640px; } -body .prepend-17 { padding-left: 0; padding-right: 680px; } -body .prepend-18 { padding-left: 0; padding-right: 720px; } -body .prepend-19 { padding-left: 0; padding-right: 760px; } -body .prepend-20 { padding-left: 0; padding-right: 800px; } -body .prepend-21 { padding-left: 0; padding-right: 840px; } -body .prepend-22 { padding-left: 0; padding-right: 880px; } -body .prepend-23 { padding-left: 0; padding-right: 920px; } - -body .border { - padding-right: 0; - padding-left: 4px; - margin-right: 0; - margin-left: 5px; - border-right: none; - border-left: 1px solid #eee; -} - -body .colborder { - padding-right: 0; - padding-left: 24px; - margin-right: 0; - margin-left: 25px; - border-right: none; - border-left: 1px solid #eee; -} - -body .pull-1 { margin-left: 0; margin-right: -40px; } -body .pull-2 { margin-left: 0; margin-right: -80px; } -body .pull-3 { margin-left: 0; margin-right: -120px; } -body .pull-4 { margin-left: 0; margin-right: -160px; } - -body .push-0 { margin: 0 18px 0 0; } -body .push-1 { margin: 0 18px 0 -40px; } -body .push-2 { margin: 0 18px 0 -80px; } -body .push-3 { margin: 0 18px 0 -120px; } -body .push-4 { margin: 0 18px 0 -160px; } -body .push-0, body .push-1, body .push-2, -body .push-3, body .push-4 { float: left; } - - -/* Typography with RTL support */ -body h1,body h2,body h3, -body h4,body h5,body h6 { font-family: Arial, sans-serif; } -html body { font-family: Arial, sans-serif; } -body pre,body code,body tt { font-family: monospace; } - -/* Mirror floats and margins on typographic elements */ -body p img { float: right; margin: 1.5em 0 1.5em 1.5em; } -body dd, body ul, body ol { margin-left: 0; margin-right: 1.5em;} -body td, body th { text-align:right; } \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/print.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/print.css deleted file mode 100755 index fdb82208..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/print.css +++ /dev/null @@ -1,29 +0,0 @@ -/* ----------------------------------------------------------------------- - - - Blueprint CSS Framework 0.9 - http://blueprintcss.org - - * Copyright (c) 2007-Present. See LICENSE for more info. - * See README for instructions on how to use Blueprint. - * For credits and origins, see AUTHORS. - * This is a compressed file. See the sources in the 'src' directory. - ------------------------------------------------------------------------ */ - -/* print.css */ -body {line-height:1.5;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;color:#000;background:none;font-size:10pt;} -.container {background:none;} -hr {background:#ccc;color:#ccc;width:100%;height:2px;margin:2em 0;padding:0;border:none;} -hr.space {background:#fff;color:#fff;visibility:hidden;} -h1, h2, h3, h4, h5, h6 {font-family:"Helvetica Neue", Arial, "Lucida Grande", sans-serif;} -code {font:.9em "Courier New", Monaco, Courier, monospace;} -a img {border:none;} -p img.top {margin-top:0;} -blockquote {margin:1.5em;padding:1em;font-style:italic;font-size:.9em;} -.small {font-size:.9em;} -.large {font-size:1.1em;} -.quiet {color:#999;} -.hide {display:none;} -a:link, a:visited {background:transparent;font-weight:700;text-decoration:underline;} -a:link:after, a:visited:after {content:" (" attr(href) ")";font-size:90%;} \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/screen.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/screen.css deleted file mode 100755 index c18b9a57..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/screen.css +++ /dev/null @@ -1,280 +0,0 @@ -/* ----------------------------------------------------------------------- - - - Blueprint CSS Framework 0.9 - http://blueprintcss.org - - * Copyright (c) 2007-Present. See LICENSE for more info. - * See README for instructions on how to use Blueprint. - * For credits and origins, see AUTHORS. - * This is a compressed file. See the sources in the 'src' directory. - ------------------------------------------------------------------------ */ - -/* reset.css */ -html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;} -body {line-height:1.5;} -table {border-collapse:separate;border-spacing:0;} -caption, th, td {text-align:left;font-weight:normal;} -table, td, th {vertical-align:middle;} -blockquote:before, blockquote:after, q:before, q:after {content:"";} -blockquote, q {quotes:"" "";} -a img {border:none;} - -/* typography.css */ -html {font-size:100.01%;} -body {font-size:75%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;} -h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;} -h1 {font-size:3em;line-height:1;margin-bottom:0.5em;} -h2 {font-size:2em;margin-bottom:0.75em;} -h3 {font-size:1.5em;line-height:1;margin-bottom:1em;} -h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;} -h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;} -h6 {font-size:1em;font-weight:bold;} -h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;} -p {margin:0 0 1.5em;} -p img.left {float:left;margin:1.5em 1.5em 1.5em 0;padding:0;} -p img.right {float:right;margin:1.5em 0 1.5em 1.5em;} -a:focus, a:hover {color:#000;} -a {color:#009;text-decoration:underline;} -blockquote {margin:1.5em;color:#666;font-style:italic;} -strong {font-weight:bold;} -em, dfn {font-style:italic;} -dfn {font-weight:bold;} -sup, sub {line-height:0;} -abbr, acronym {border-bottom:1px dotted #666;} -address {margin:0 0 1.5em;font-style:italic;} -del {color:#666;} -pre {margin:1.5em 0;white-space:pre;} -pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;} -li ul, li ol {margin:0 1.5em;} -ul, ol {margin:0 1.5em 1.5em 1.5em;} -ul {list-style-type:disc;} -ol {list-style-type:decimal;} -dl {margin:0 0 1.5em 0;} -dl dt {font-weight:bold;} -dd {margin-left:1.5em;} -table {margin-bottom:1.4em;width:100%;} -th {font-weight:bold;} -thead th {background:#c3d9ff;} -th, td, caption {padding:4px 10px 4px 5px;} -tr.even td {background:#e5ecf9;} -tfoot {font-style:italic;} -caption {background:#eee;} -.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;} -.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;} -.hide {display:none;} -.quiet {color:#666;} -.loud {color:#000;} -.highlight {background:#ff0;} -.added {background:#060;color:#fff;} -.removed {background:#900;color:#fff;} -.first {margin-left:0;padding-left:0;} -.last {margin-right:0;padding-right:0;} -.top {margin-top:0;padding-top:0;} -.bottom {margin-bottom:0;padding-bottom:0;} - -/* forms.css */ -label {font-weight:bold;} -fieldset {padding:1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;} -legend {font-weight:bold;font-size:1.2em;} -input[type=text], input[type=password], input.text, input.title, textarea, select {background-color:#fff;border:1px solid #bbb;} -input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus, select:focus {border-color:#666;} -input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;} -input.text, input.title {width:300px;padding:5px;} -input.title {font-size:1.5em;} -textarea {width:390px;height:250px;padding:5px;} -input[type=checkbox], input[type=radio], input.checkbox, input.radio {position:relative;top:.25em;} -form.inline {line-height:3;} -form.inline p {margin-bottom:0;} -.error, .notice, .success {padding:.8em;margin-bottom:1em;border:2px solid #ddd;} -.error {background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;} -.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;} -.success {background:#E6EFC2;color:#264409;border-color:#C6D880;} -.error a {color:#8a1f11;} -.notice a {color:#514721;} -.success a {color:#264409;} - -/* grid.css */ -.container {width:950px;margin:0 auto;} -.showgrid {background:url(src/grid.png);} -.column, div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24 {float:left;margin-right:10px;} -.last, div.last {margin-right:0;} -.span-1 {width:30px;} -.span-2 {width:70px;} -.span-3 {width:110px;} -.span-4 {width:150px;} -.span-5 {width:190px;} -.span-6 {width:230px;} -.span-7 {width:270px;} -.span-8 {width:310px;} -.span-9 {width:350px;} -.span-10 {width:390px;} -.span-11 {width:430px;} -.span-12 {width:470px;} -.span-13 {width:510px;} -.span-14 {width:550px;} -.span-15 {width:590px;} -.span-16 {width:630px;} -.span-17 {width:670px;} -.span-18 {width:710px;} -.span-19 {width:750px;} -.span-20 {width:790px;} -.span-21 {width:830px;} -.span-22 {width:870px;} -.span-23 {width:910px;} -.span-24, div.span-24 {width:950px;margin-right:0;} -input.span-1, textarea.span-1, input.span-2, textarea.span-2, input.span-3, textarea.span-3, input.span-4, textarea.span-4, input.span-5, textarea.span-5, input.span-6, textarea.span-6, input.span-7, textarea.span-7, input.span-8, textarea.span-8, input.span-9, textarea.span-9, input.span-10, textarea.span-10, input.span-11, textarea.span-11, input.span-12, textarea.span-12, input.span-13, textarea.span-13, input.span-14, textarea.span-14, input.span-15, textarea.span-15, input.span-16, textarea.span-16, input.span-17, textarea.span-17, input.span-18, textarea.span-18, input.span-19, textarea.span-19, input.span-20, textarea.span-20, input.span-21, textarea.span-21, input.span-22, textarea.span-22, input.span-23, textarea.span-23, input.span-24, textarea.span-24 {border-left-width:1px!important;border-right-width:1px!important;padding-left:5px!important;padding-right:5px!important;} -input.span-1, textarea.span-1 {width:18px!important;} -input.span-2, textarea.span-2 {width:58px!important;} -input.span-3, textarea.span-3 {width:98px!important;} -input.span-4, textarea.span-4 {width:138px!important;} -input.span-5, textarea.span-5 {width:178px!important;} -input.span-6, textarea.span-6 {width:218px!important;} -input.span-7, textarea.span-7 {width:258px!important;} -input.span-8, textarea.span-8 {width:298px!important;} -input.span-9, textarea.span-9 {width:338px!important;} -input.span-10, textarea.span-10 {width:378px!important;} -input.span-11, textarea.span-11 {width:418px!important;} -input.span-12, textarea.span-12 {width:458px!important;} -input.span-13, textarea.span-13 {width:498px!important;} -input.span-14, textarea.span-14 {width:538px!important;} -input.span-15, textarea.span-15 {width:578px!important;} -input.span-16, textarea.span-16 {width:618px!important;} -input.span-17, textarea.span-17 {width:658px!important;} -input.span-18, textarea.span-18 {width:698px!important;} -input.span-19, textarea.span-19 {width:738px!important;} -input.span-20, textarea.span-20 {width:778px!important;} -input.span-21, textarea.span-21 {width:818px!important;} -input.span-22, textarea.span-22 {width:858px!important;} -input.span-23, textarea.span-23 {width:898px!important;} -input.span-24, textarea.span-24 {width:938px!important;} -.append-1 {padding-right:40px;} -.append-2 {padding-right:80px;} -.append-3 {padding-right:120px;} -.append-4 {padding-right:160px;} -.append-5 {padding-right:200px;} -.append-6 {padding-right:240px;} -.append-7 {padding-right:280px;} -.append-8 {padding-right:320px;} -.append-9 {padding-right:360px;} -.append-10 {padding-right:400px;} -.append-11 {padding-right:440px;} -.append-12 {padding-right:480px;} -.append-13 {padding-right:520px;} -.append-14 {padding-right:560px;} -.append-15 {padding-right:600px;} -.append-16 {padding-right:640px;} -.append-17 {padding-right:680px;} -.append-18 {padding-right:720px;} -.append-19 {padding-right:760px;} -.append-20 {padding-right:800px;} -.append-21 {padding-right:840px;} -.append-22 {padding-right:880px;} -.append-23 {padding-right:920px;} -.prepend-1 {padding-left:40px;} -.prepend-2 {padding-left:80px;} -.prepend-3 {padding-left:120px;} -.prepend-4 {padding-left:160px;} -.prepend-5 {padding-left:200px;} -.prepend-6 {padding-left:240px;} -.prepend-7 {padding-left:280px;} -.prepend-8 {padding-left:320px;} -.prepend-9 {padding-left:360px;} -.prepend-10 {padding-left:400px;} -.prepend-11 {padding-left:440px;} -.prepend-12 {padding-left:480px;} -.prepend-13 {padding-left:520px;} -.prepend-14 {padding-left:560px;} -.prepend-15 {padding-left:600px;} -.prepend-16 {padding-left:640px;} -.prepend-17 {padding-left:680px;} -.prepend-18 {padding-left:720px;} -.prepend-19 {padding-left:760px;} -.prepend-20 {padding-left:800px;} -.prepend-21 {padding-left:840px;} -.prepend-22 {padding-left:880px;} -.prepend-23 {padding-left:920px;} -div.border {padding-right:4px;margin-right:5px;border-right:1px solid #eee;} -div.colborder {padding-right:24px;margin-right:25px;border-right:1px solid #eee;} -.pull-1 {margin-left:-40px;} -.pull-2 {margin-left:-80px;} -.pull-3 {margin-left:-120px;} -.pull-4 {margin-left:-160px;} -.pull-5 {margin-left:-200px;} -.pull-6 {margin-left:-240px;} -.pull-7 {margin-left:-280px;} -.pull-8 {margin-left:-320px;} -.pull-9 {margin-left:-360px;} -.pull-10 {margin-left:-400px;} -.pull-11 {margin-left:-440px;} -.pull-12 {margin-left:-480px;} -.pull-13 {margin-left:-520px;} -.pull-14 {margin-left:-560px;} -.pull-15 {margin-left:-600px;} -.pull-16 {margin-left:-640px;} -.pull-17 {margin-left:-680px;} -.pull-18 {margin-left:-720px;} -.pull-19 {margin-left:-760px;} -.pull-20 {margin-left:-800px;} -.pull-21 {margin-left:-840px;} -.pull-22 {margin-left:-880px;} -.pull-23 {margin-left:-920px;} -.pull-24 {margin-left:-960px;} -.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {float:left;position:relative;} -.push-1 {margin:0 -40px 1.5em 40px;} -.push-2 {margin:0 -80px 1.5em 80px;} -.push-3 {margin:0 -120px 1.5em 120px;} -.push-4 {margin:0 -160px 1.5em 160px;} -.push-5 {margin:0 -200px 1.5em 200px;} -.push-6 {margin:0 -240px 1.5em 240px;} -.push-7 {margin:0 -280px 1.5em 280px;} -.push-8 {margin:0 -320px 1.5em 320px;} -.push-9 {margin:0 -360px 1.5em 360px;} -.push-10 {margin:0 -400px 1.5em 400px;} -.push-11 {margin:0 -440px 1.5em 440px;} -.push-12 {margin:0 -480px 1.5em 480px;} -.push-13 {margin:0 -520px 1.5em 520px;} -.push-14 {margin:0 -560px 1.5em 560px;} -.push-15 {margin:0 -600px 1.5em 600px;} -.push-16 {margin:0 -640px 1.5em 640px;} -.push-17 {margin:0 -680px 1.5em 680px;} -.push-18 {margin:0 -720px 1.5em 720px;} -.push-19 {margin:0 -760px 1.5em 760px;} -.push-20 {margin:0 -800px 1.5em 800px;} -.push-21 {margin:0 -840px 1.5em 840px;} -.push-22 {margin:0 -880px 1.5em 880px;} -.push-23 {margin:0 -920px 1.5em 920px;} -.push-24 {margin:0 -960px 1.5em 960px;} -.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {float:right;position:relative;} -.prepend-top {margin-top:1.5em;} -.append-bottom {margin-bottom:1.5em;} -.box {padding:1.5em;margin-bottom:1.5em;background:#E5ECF9;} -hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:.1em;margin:0 0 1.45em;border:none;} -hr.space {background:#fff;color:#fff;visibility:hidden;} -.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;} -.clearfix, .container {display:block;} -.clear {clear:both;} - -/* fancy-type */ -p + p {text-indent:2em;margin-top:-1.5em;} -form p + p {text-indent:0;} -.alt {color:#666;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua", Georgia, serif;font-style:italic;font-weight:normal;} -.dquo {margin-left:-.5em;} -p.incr, .incr p {font-size:10px;line-height:1.44em;margin-bottom:1.5em;} -.caps {font-variant:small-caps;letter-spacing:1px;text-transform:lowercase;font-size:1.2em;line-height:1%;font-weight:bold;padding:0 2px;} - -/* buttons */ -a.button, button {display:block;float:left;margin:0.7em 0.5em 0.7em 0;padding:5px 10px 5px 7px;border:1px solid #dedede;border-top:1px solid #eee;border-left:1px solid #eee;background-color:#f5f5f5;font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;font-size:100%;line-height:130%;text-decoration:none;font-weight:bold;color:#565656;cursor:pointer;} -button {width:auto;overflow:visible;padding:4px 10px 3px 7px;} -button[type] {padding:4px 10px 4px 7px;line-height:17px;} -*:first-child+html button[type] {padding:4px 10px 3px 7px;} -button img, a.button img {margin:0 3px -3px 0 !important;padding:0;border:none;width:16px;height:16px;float:none;} -button:hover, a.button:hover {background-color:#dff4ff;border:1px solid #c2e1ef;color:#336699;} -a.button:active {background-color:#6299c5;border:1px solid #6299c5;color:#fff;} -body .positive {color:#529214;} -a.positive:hover, button.positive:hover {background-color:#E6EFC2;border:1px solid #C6D880;color:#529214;} -a.positive:active {background-color:#529214;border:1px solid #529214;color:#fff;} -body .negative {color:#d12f19;} -a.negative:hover, button.negative:hover {background-color:#fbe3e4;border:1px solid #fbc2c4;color:#d12f19;} -a.negative:active {background-color:#d12f19;border:1px solid #d12f19;color:#fff;} \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/forms.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/forms.css deleted file mode 100755 index b4911340..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/forms.css +++ /dev/null @@ -1,65 +0,0 @@ -/* -------------------------------------------------------------- - - forms.css - * Sets up some default styling for forms - * Gives you classes to enhance your forms - - Usage: - * For text fields, use class .title or .text - * For inline forms, use .inline (even when using columns) - --------------------------------------------------------------- */ - -label { font-weight: bold; } -fieldset { padding:1.4em; margin: 0 0 1.5em 0; border: 1px solid #ccc; } -legend { font-weight: bold; font-size:1.2em; } - - -/* Form fields --------------------------------------------------------------- */ - -input[type=text], input[type=password], -input.text, input.title, -textarea, select { - background-color:#fff; - border:1px solid #bbb; -} -input[type=text]:focus, input[type=password]:focus, -input.text:focus, input.title:focus, -textarea:focus, select:focus { - border-color:#666; -} - -input[type=text], input[type=password], -input.text, input.title, -textarea, select { - margin:0.5em 0; -} - -input.text, -input.title { width: 300px; padding:5px; } -input.title { font-size:1.5em; } -textarea { width: 390px; height: 250px; padding:5px; } - -input[type=checkbox], input[type=radio], -input.checkbox, input.radio { - position:relative; top:.25em; -} - -form.inline { line-height:3; } -form.inline p { margin-bottom:0; } - - -/* Success, notice and error boxes --------------------------------------------------------------- */ - -.error, -.notice, -.success { padding: .8em; margin-bottom: 1em; border: 2px solid #ddd; } - -.error { background: #FBE3E4; color: #8a1f11; border-color: #FBC2C4; } -.notice { background: #FFF6BF; color: #514721; border-color: #FFD324; } -.success { background: #E6EFC2; color: #264409; border-color: #C6D880; } -.error a { color: #8a1f11; } -.notice a { color: #514721; } -.success a { color: #264409; } diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/grid.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/grid.css deleted file mode 100755 index 352e0e2a..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/grid.css +++ /dev/null @@ -1,281 +0,0 @@ -/* -------------------------------------------------------------- - grid.css - * Sets up an easy-to-use grid of 24 columns. - - By default, the grid is 950px wide, with 24 columns - spanning 30px, and a 10px margin between columns. - - If you need fewer or more columns, namespaces or semantic - element names, use the compressor script (lib/compress.rb) - - Note: Changes made in this file will not be applied when - using the compressor: make changes in lib/blueprint/grid.css.rb --------------------------------------------------------------- */ - -/* A container should group all your columns. */ -.container { - width: 950px; - margin: 0 auto; -} - -/* Use this class on any div.span / container to see the grid. */ -.showgrid { - background: url(src/grid.png); -} - - -/* Columns --------------------------------------------------------------- */ - -/* Sets up basic grid floating and margin. */ -.column, div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24 { - float: left; - margin-right: 10px; -} - -/* The last column in a row needs this class. */ -.last, div.last { margin-right: 0; } - -/* Use these classes to set the width of a column. */ -.span-1 {width: 30px;} - -.span-2 {width: 70px;} -.span-3 {width: 110px;} -.span-4 {width: 150px;} -.span-5 {width: 190px;} -.span-6 {width: 230px;} -.span-7 {width: 270px;} -.span-8 {width: 310px;} -.span-9 {width: 350px;} -.span-10 {width: 390px;} -.span-11 {width: 430px;} -.span-12 {width: 470px;} -.span-13 {width: 510px;} -.span-14 {width: 550px;} -.span-15 {width: 590px;} -.span-16 {width: 630px;} -.span-17 {width: 670px;} -.span-18 {width: 710px;} -.span-19 {width: 750px;} -.span-20 {width: 790px;} -.span-21 {width: 830px;} -.span-22 {width: 870px;} -.span-23 {width: 910px;} -.span-24, div.span-24 { width:950px; margin-right:0; } - -/* Use these classes to set the width of an input. */ -input.span-1, textarea.span-1, input.span-2, textarea.span-2, input.span-3, textarea.span-3, input.span-4, textarea.span-4, input.span-5, textarea.span-5, input.span-6, textarea.span-6, input.span-7, textarea.span-7, input.span-8, textarea.span-8, input.span-9, textarea.span-9, input.span-10, textarea.span-10, input.span-11, textarea.span-11, input.span-12, textarea.span-12, input.span-13, textarea.span-13, input.span-14, textarea.span-14, input.span-15, textarea.span-15, input.span-16, textarea.span-16, input.span-17, textarea.span-17, input.span-18, textarea.span-18, input.span-19, textarea.span-19, input.span-20, textarea.span-20, input.span-21, textarea.span-21, input.span-22, textarea.span-22, input.span-23, textarea.span-23, input.span-24, textarea.span-24 { - border-left-width: 1px!important; - border-right-width: 1px!important; - padding-left: 5px!important; - padding-right: 5px!important; -} - -input.span-1, textarea.span-1 { width: 18px!important; } -input.span-2, textarea.span-2 { width: 58px!important; } -input.span-3, textarea.span-3 { width: 98px!important; } -input.span-4, textarea.span-4 { width: 138px!important; } -input.span-5, textarea.span-5 { width: 178px!important; } -input.span-6, textarea.span-6 { width: 218px!important; } -input.span-7, textarea.span-7 { width: 258px!important; } -input.span-8, textarea.span-8 { width: 298px!important; } -input.span-9, textarea.span-9 { width: 338px!important; } -input.span-10, textarea.span-10 { width: 378px!important; } -input.span-11, textarea.span-11 { width: 418px!important; } -input.span-12, textarea.span-12 { width: 458px!important; } -input.span-13, textarea.span-13 { width: 498px!important; } -input.span-14, textarea.span-14 { width: 538px!important; } -input.span-15, textarea.span-15 { width: 578px!important; } -input.span-16, textarea.span-16 { width: 618px!important; } -input.span-17, textarea.span-17 { width: 658px!important; } -input.span-18, textarea.span-18 { width: 698px!important; } -input.span-19, textarea.span-19 { width: 738px!important; } -input.span-20, textarea.span-20 { width: 778px!important; } -input.span-21, textarea.span-21 { width: 818px!important; } -input.span-22, textarea.span-22 { width: 858px!important; } -input.span-23, textarea.span-23 { width: 898px!important; } -input.span-24, textarea.span-24 { width: 938px!important; } - -/* Add these to a column to append empty cols. */ - -.append-1 { padding-right: 40px;} -.append-2 { padding-right: 80px;} -.append-3 { padding-right: 120px;} -.append-4 { padding-right: 160px;} -.append-5 { padding-right: 200px;} -.append-6 { padding-right: 240px;} -.append-7 { padding-right: 280px;} -.append-8 { padding-right: 320px;} -.append-9 { padding-right: 360px;} -.append-10 { padding-right: 400px;} -.append-11 { padding-right: 440px;} -.append-12 { padding-right: 480px;} -.append-13 { padding-right: 520px;} -.append-14 { padding-right: 560px;} -.append-15 { padding-right: 600px;} -.append-16 { padding-right: 640px;} -.append-17 { padding-right: 680px;} -.append-18 { padding-right: 720px;} -.append-19 { padding-right: 760px;} -.append-20 { padding-right: 800px;} -.append-21 { padding-right: 840px;} -.append-22 { padding-right: 880px;} -.append-23 { padding-right: 920px;} - -/* Add these to a column to prepend empty cols. */ - -.prepend-1 { padding-left: 40px;} -.prepend-2 { padding-left: 80px;} -.prepend-3 { padding-left: 120px;} -.prepend-4 { padding-left: 160px;} -.prepend-5 { padding-left: 200px;} -.prepend-6 { padding-left: 240px;} -.prepend-7 { padding-left: 280px;} -.prepend-8 { padding-left: 320px;} -.prepend-9 { padding-left: 360px;} -.prepend-10 { padding-left: 400px;} -.prepend-11 { padding-left: 440px;} -.prepend-12 { padding-left: 480px;} -.prepend-13 { padding-left: 520px;} -.prepend-14 { padding-left: 560px;} -.prepend-15 { padding-left: 600px;} -.prepend-16 { padding-left: 640px;} -.prepend-17 { padding-left: 680px;} -.prepend-18 { padding-left: 720px;} -.prepend-19 { padding-left: 760px;} -.prepend-20 { padding-left: 800px;} -.prepend-21 { padding-left: 840px;} -.prepend-22 { padding-left: 880px;} -.prepend-23 { padding-left: 920px;} - - -/* Border on right hand side of a column. */ -div.border { - padding-right: 4px; - margin-right: 5px; - border-right: 1px solid #eee; -} - -/* Border with more whitespace, spans one column. */ -div.colborder { - padding-right: 24px; - margin-right: 25px; - border-right: 1px solid #eee; -} - - -/* Use these classes on an element to push it into the -next column, or to pull it into the previous column. */ - - -.pull-1 { margin-left: -40px; } -.pull-2 { margin-left: -80px; } -.pull-3 { margin-left: -120px; } -.pull-4 { margin-left: -160px; } -.pull-5 { margin-left: -200px; } -.pull-6 { margin-left: -240px; } -.pull-7 { margin-left: -280px; } -.pull-8 { margin-left: -320px; } -.pull-9 { margin-left: -360px; } -.pull-10 { margin-left: -400px; } -.pull-11 { margin-left: -440px; } -.pull-12 { margin-left: -480px; } -.pull-13 { margin-left: -520px; } -.pull-14 { margin-left: -560px; } -.pull-15 { margin-left: -600px; } -.pull-16 { margin-left: -640px; } -.pull-17 { margin-left: -680px; } -.pull-18 { margin-left: -720px; } -.pull-19 { margin-left: -760px; } -.pull-20 { margin-left: -800px; } -.pull-21 { margin-left: -840px; } -.pull-22 { margin-left: -880px; } -.pull-23 { margin-left: -920px; } -.pull-24 { margin-left: -960px; } - -.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {float: left; position:relative;} - - -.push-1 { margin: 0 -40px 1.5em 40px; } -.push-2 { margin: 0 -80px 1.5em 80px; } -.push-3 { margin: 0 -120px 1.5em 120px; } -.push-4 { margin: 0 -160px 1.5em 160px; } -.push-5 { margin: 0 -200px 1.5em 200px; } -.push-6 { margin: 0 -240px 1.5em 240px; } -.push-7 { margin: 0 -280px 1.5em 280px; } -.push-8 { margin: 0 -320px 1.5em 320px; } -.push-9 { margin: 0 -360px 1.5em 360px; } -.push-10 { margin: 0 -400px 1.5em 400px; } -.push-11 { margin: 0 -440px 1.5em 440px; } -.push-12 { margin: 0 -480px 1.5em 480px; } -.push-13 { margin: 0 -520px 1.5em 520px; } -.push-14 { margin: 0 -560px 1.5em 560px; } -.push-15 { margin: 0 -600px 1.5em 600px; } -.push-16 { margin: 0 -640px 1.5em 640px; } -.push-17 { margin: 0 -680px 1.5em 680px; } -.push-18 { margin: 0 -720px 1.5em 720px; } -.push-19 { margin: 0 -760px 1.5em 760px; } -.push-20 { margin: 0 -800px 1.5em 800px; } -.push-21 { margin: 0 -840px 1.5em 840px; } -.push-22 { margin: 0 -880px 1.5em 880px; } -.push-23 { margin: 0 -920px 1.5em 920px; } -.push-24 { margin: 0 -960px 1.5em 960px; } - -.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {float: right; position:relative;} - - -/* Misc classes and elements --------------------------------------------------------------- */ - -/* In case you need to add a gutter above/below an element */ -.prepend-top { - margin-top:1.5em; -} -.append-bottom { - margin-bottom:1.5em; -} - -/* Use a .box to create a padded box inside a column. */ -.box { - padding: 1.5em; - margin-bottom: 1.5em; - background: #E5ECF9; -} - -/* Use this to create a horizontal ruler across a column. */ -hr { - background: #ddd; - color: #ddd; - clear: both; - float: none; - width: 100%; - height: .1em; - margin: 0 0 1.45em; - border: none; -} - -hr.space { - background: #fff; - color: #fff; - visibility: hidden; -} - - -/* Clearing floats without extra markup - Based on How To Clear Floats Without Structural Markup by PiE - [http://www.positioniseverything.net/easyclearing.html] */ - -.clearfix:after, .container:after { - content: "\0020"; - display: block; - height: 0; - clear: both; - visibility: hidden; - overflow:hidden; -} -.clearfix, .container {display: block;} - -/* Regular clearing - apply to column that should drop below previous ones. */ - -.clear { clear:both; } diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/grid.png b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/grid.png deleted file mode 100755 index b7539f67..00000000 Binary files a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/grid.png and /dev/null differ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/ie.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/ie.css deleted file mode 100755 index 214b8790..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/ie.css +++ /dev/null @@ -1,76 +0,0 @@ -/* -------------------------------------------------------------- - - ie.css - - Contains every hack for Internet Explorer, - so that our core files stay sweet and nimble. - --------------------------------------------------------------- */ - -/* Make sure the layout is centered in IE5 */ -body { text-align: center; } -.container { text-align: left; } - -/* Fixes IE margin bugs */ -* html .column, * html div.span-1, * html div.span-2, -* html div.span-3, * html div.span-4, * html div.span-5, -* html div.span-6, * html div.span-7, * html div.span-8, -* html div.span-9, * html div.span-10, * html div.span-11, -* html div.span-12, * html div.span-13, * html div.span-14, -* html div.span-15, * html div.span-16, * html div.span-17, -* html div.span-18, * html div.span-19, * html div.span-20, -* html div.span-21, * html div.span-22, * html div.span-23, -* html div.span-24 { display:inline; overflow-x: hidden; } - - -/* Elements --------------------------------------------------------------- */ - -/* Fixes incorrect styling of legend in IE6. */ -* html legend { margin:0px -8px 16px 0; padding:0; } - -/* Fixes wrong line-height on sup/sub in IE. */ -sup { vertical-align:text-top; } -sub { vertical-align:text-bottom; } - -/* Fixes IE7 missing wrapping of code elements. */ -html>body p code { *white-space: normal; } - -/* IE 6&7 has problems with setting proper
margins. */ -hr { margin:-8px auto 11px; } - -/* Explicitly set interpolation, allowing dynamically resized images to not look horrible */ -img { -ms-interpolation-mode:bicubic; } - -/* Clearing --------------------------------------------------------------- */ - -/* Makes clearfix actually work in IE */ -.clearfix, .container { display:inline-block; } -* html .clearfix, -* html .container { height:1%; } - - -/* Forms --------------------------------------------------------------- */ - -/* Fixes padding on fieldset */ -fieldset { padding-top:0; } - -/* Makes classic textareas in IE 6 resemble other browsers */ -textarea { overflow:auto; } - -/* Fixes rule that IE 6 ignores */ -input.text, input.title, textarea { background-color:#fff; border:1px solid #bbb; } -input.text:focus, input.title:focus { border-color:#666; } -input.text, input.title, textarea, select { margin:0.5em 0; } -input.checkbox, input.radio { position:relative; top:.25em; } - -/* Fixes alignment of inline form elements */ -form.inline div, form.inline p { vertical-align:middle; } -form.inline label { position:relative;top:-0.25em; } -form.inline input.checkbox, form.inline input.radio, -form.inline input.button, form.inline button { - margin:0.5em 0; -} -button, input.button { position:relative;top:0.25em; } \ No newline at end of file diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/print.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/print.css deleted file mode 100755 index d3030294..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/print.css +++ /dev/null @@ -1,85 +0,0 @@ -/* -------------------------------------------------------------- - - print.css - * Gives you some sensible styles for printing pages. - * See Readme file in this directory for further instructions. - - Some additions you'll want to make, customized to your markup: - #header, #footer, #navigation { display:none; } - --------------------------------------------------------------- */ - -body { - line-height: 1.5; - font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; - color:#000; - background: none; - font-size: 10pt; -} - - -/* Layout --------------------------------------------------------------- */ - -.container { - background: none; -} - -hr { - background:#ccc; - color:#ccc; - width:100%; - height:2px; - margin:2em 0; - padding:0; - border:none; -} -hr.space { - background: #fff; - color: #fff; - visibility: hidden; -} - - -/* Text --------------------------------------------------------------- */ - -h1,h2,h3,h4,h5,h6 { font-family: "Helvetica Neue", Arial, "Lucida Grande", sans-serif; } -code { font:.9em "Courier New", Monaco, Courier, monospace; } - -a img { border:none; } -p img.top { margin-top: 0; } - -blockquote { - margin:1.5em; - padding:1em; - font-style:italic; - font-size:.9em; -} - -.small { font-size: .9em; } -.large { font-size: 1.1em; } -.quiet { color: #999; } -.hide { display:none; } - - -/* Links --------------------------------------------------------------- */ - -a:link, a:visited { - background: transparent; - font-weight:700; - text-decoration: underline; -} - -a:link:after, a:visited:after { - content: " (" attr(href) ")"; - font-size: 90%; -} - -/* If you're having trouble printing relative links, uncomment and customize this: - (note: This is valid CSS3, but it still won't go through the W3C CSS Validator) */ - -/* a[href^="/"]:after { - content: " (http://www.yourdomain.com" attr(href) ") "; -} */ diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/reset.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/reset.css deleted file mode 100755 index fc0788c8..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/reset.css +++ /dev/null @@ -1,38 +0,0 @@ -/* -------------------------------------------------------------- - - reset.css - * Resets default browser CSS. - --------------------------------------------------------------- */ - -html, body, div, span, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, code, -del, dfn, em, img, q, dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - font-family: inherit; - vertical-align: baseline; -} - -body { - line-height: 1.5; -} - -/* Tables still need 'cellspacing="0"' in the markup. */ -table { border-collapse: separate; border-spacing: 0; } -caption, th, td { text-align: left; font-weight: normal; } -table, td, th { vertical-align: middle; } - -/* Remove possible quote marks (") from ,
. */ -blockquote:before, blockquote:after, q:before, q:after { content: ""; } -blockquote, q { quotes: "" ""; } - -/* Remove annoying border on linked images. */ -a img { border: none; } diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/typography.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/typography.css deleted file mode 100755 index 6cc099c6..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/blueprint/src/typography.css +++ /dev/null @@ -1,106 +0,0 @@ -/* -------------------------------------------------------------- - - typography.css - * Sets up some sensible default typography. - --------------------------------------------------------------- */ - -/* Default font settings. - The font-size percentage is of 16px. (0.75 * 16px = 12px) */ -html { font-size:100.01%; } -body { - font-size: 75%; - color: #222; - background: #fff; - font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; -} - - -/* Headings --------------------------------------------------------------- */ - -h1,h2,h3,h4,h5,h6 { font-weight: normal; color: #111; } - -h1 { font-size: 3em; line-height: 1; margin-bottom: 0.5em; } -h2 { font-size: 2em; margin-bottom: 0.75em; } -h3 { font-size: 1.5em; line-height: 1; margin-bottom: 1em; } -h4 { font-size: 1.2em; line-height: 1.25; margin-bottom: 1.25em; } -h5 { font-size: 1em; font-weight: bold; margin-bottom: 1.5em; } -h6 { font-size: 1em; font-weight: bold; } - -h1 img, h2 img, h3 img, -h4 img, h5 img, h6 img { - margin: 0; -} - - -/* Text elements --------------------------------------------------------------- */ - -p { margin: 0 0 1.5em; } -p img.left { float: left; margin: 1.5em 1.5em 1.5em 0; padding: 0; } -p img.right { float: right; margin: 1.5em 0 1.5em 1.5em; } - -a:focus, -a:hover { color: #000; } -a { color: #009; text-decoration: underline; } - -blockquote { margin: 1.5em; color: #666; font-style: italic; } -strong { font-weight: bold; } -em,dfn { font-style: italic; } -dfn { font-weight: bold; } -sup, sub { line-height: 0; } - -abbr, -acronym { border-bottom: 1px dotted #666; } -address { margin: 0 0 1.5em; font-style: italic; } -del { color:#666; } - -pre { margin: 1.5em 0; white-space: pre; } -pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.5; } - - -/* Lists --------------------------------------------------------------- */ - -li ul, -li ol { margin: 0; } -ul, ol { margin: 0 1.5em 1.5em 0; padding-left: 3.333em; } - -ul { list-style-type: disc; } -ol { list-style-type: decimal; } - -dl { margin: 0 0 1.5em 0; } -dl dt { font-weight: bold; } -dd { margin-left: 1.5em;} - - -/* Tables --------------------------------------------------------------- */ - -table { margin-bottom: 1.4em; width:100%; } -th { font-weight: bold; } -thead th { background: #c3d9ff; } -th,td,caption { padding: 4px 10px 4px 5px; } -tr.even td { background: #e5ecf9; } -tfoot { font-style: italic; } -caption { background: #eee; } - - -/* Misc classes --------------------------------------------------------------- */ - -.small { font-size: .8em; margin-bottom: 1.875em; line-height: 1.875em; } -.large { font-size: 1.2em; line-height: 2.5em; margin-bottom: 1.25em; } -.hide { display: none; } - -.quiet { color: #666; } -.loud { color: #000; } -.highlight { background:#ff0; } -.added { background:#060; color: #fff; } -.removed { background:#900; color: #fff; } - -.first { margin-left:0; padding-left:0; } -.last { margin-right:0; padding-right:0; } -.top { margin-top:0; padding-top:0; } -.bottom { margin-bottom:0; padding-bottom:0; } diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/booking.css b/spring-webflow-samples/booking-mvc/src/main/webapp/styles/booking.css deleted file mode 100644 index b8d17e48..00000000 --- a/spring-webflow-samples/booking-mvc/src/main/webapp/styles/booking.css +++ /dev/null @@ -1,53 +0,0 @@ - -a,a:visited,a:link,a:active { - color: #59924B; - background-color: transparent; - text-decoration: none; - font-weight: bold; -} - -a:hover { - color: white; - background-color: #65a242; - text-decoration: none; - font-weight: bold; -} - -button { - color: #fff; - background: #fff url(../images/btn.bg.gif) 0 0 repeat-x; - border-style: none; -} - -button:hover { - color: yellow; - background: #fff url(../images/btn.bg.gif) 0 0 repeat-x; - border-style: none; -} - -.summary { - width: 100%; - border: 1px solid #414f23; - border-collapse: collapse; -} - -.summary thead th { - border-left: 1px solid #414f23; - background: #fff url(../images/th.bg.gif) 0 100% repeat-x; - border-bottom: 1px solid #414f23; - padding: 6px; - text-align: left; - font-size: small; -} - -.summary tbody td { - border-left: 1px solid #9cac7c; - padding: 4px; - border-bottom: 1px solid #9cac7c; - font-size: 8pt; -} - -.label { - font-weight: bold; -} - diff --git a/spring-webflow-samples/booking-mvc/src/test/java/org/springframework/webflow/samples/booking/BookingFlowExecutionTests.java b/spring-webflow-samples/booking-mvc/src/test/java/org/springframework/webflow/samples/booking/BookingFlowExecutionTests.java deleted file mode 100644 index 63d78e94..00000000 --- a/spring-webflow-samples/booking-mvc/src/test/java/org/springframework/webflow/samples/booking/BookingFlowExecutionTests.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import org.easymock.EasyMock; -import org.springframework.webflow.config.FlowDefinitionResource; -import org.springframework.webflow.config.FlowDefinitionResourceFactory; -import org.springframework.webflow.core.collection.LocalAttributeMap; -import org.springframework.webflow.core.collection.MutableAttributeMap; -import org.springframework.webflow.test.MockExternalContext; -import org.springframework.webflow.test.MockFlowBuilderContext; -import org.springframework.webflow.test.execution.AbstractXmlFlowExecutionTests; - -public class BookingFlowExecutionTests extends AbstractXmlFlowExecutionTests { - - private BookingService bookingService; - - protected void setUp() { - bookingService = EasyMock.createMock(BookingService.class); - } - - @Override - protected FlowDefinitionResource getResource(FlowDefinitionResourceFactory resourceFactory) { - return resourceFactory.createFileResource("src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml"); - } - - @Override - protected void configureFlowBuilderContext(MockFlowBuilderContext builderContext) { - builderContext.registerBean("bookingService", bookingService); - } - - public void testStartBookingFlow() { - Booking booking = createTestBooking(); - - EasyMock.expect(bookingService.createBooking(1L, "keith")).andReturn(booking); - - EasyMock.replay(bookingService); - - MutableAttributeMap input = new LocalAttributeMap(); - input.put("hotelId", "1"); - MockExternalContext context = new MockExternalContext(); - context.setCurrentUser("keith"); - startFlow(input, context); - - assertCurrentStateEquals("enterBookingDetails"); - assertResponseWrittenEquals("enterBookingDetails", context); - assertTrue(getRequiredFlowAttribute("booking") instanceof Booking); - - EasyMock.verify(bookingService); - } - - public void testEnterBookingDetails_Proceed() { - setCurrentState("enterBookingDetails"); - getFlowScope().put("booking", createTestBooking()); - - MockExternalContext context = new MockExternalContext(); - context.setEventId("proceed"); - resumeFlow(context); - - assertCurrentStateEquals("reviewBooking"); - assertResponseWrittenEquals("reviewBooking", context); - } - - public void testReviewBooking_Confirm() { - setCurrentState("reviewBooking"); - getFlowScope().put("booking", createTestBooking()); - MockExternalContext context = new MockExternalContext(); - context.setEventId("confirm"); - resumeFlow(context); - assertFlowExecutionEnded(); - assertFlowExecutionOutcomeEquals("bookingConfirmed"); - } - - private Booking createTestBooking() { - Hotel hotel = new Hotel(); - hotel.setId(1L); - hotel.setName("Jameson Inn"); - User user = new User("keith", "pass", "Keith Donald"); - Booking booking = new Booking(hotel, user); - return booking; - } - -} diff --git a/spring-webflow-samples/booking-mvc/src/test/resources/.gitignore b/spring-webflow-samples/booking-mvc/src/test/resources/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/spring-webflow-samples/booking-portlet-faces/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow b/spring-webflow-samples/booking-portlet-faces/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow deleted file mode 100644 index 60c2b790..00000000 --- a/spring-webflow-samples/booking-portlet-faces/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/spring-webflow-samples/booking-portlet-faces/.project b/spring-webflow-samples/booking-portlet-faces/.project deleted file mode 100644 index c634b21e..00000000 --- a/spring-webflow-samples/booking-portlet-faces/.project +++ /dev/null @@ -1,22 +0,0 @@ - - booking-portlet-faces - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - org.eclipse.jdt.core.javabuilder - - - org.eclipse.wst.common.project.facet.core.builder - - - org.eclipse.wst.validation.validationbuilder - - - - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/build.xml b/spring-webflow-samples/booking-portlet-faces/build.xml deleted file mode 100644 index e27197ce..00000000 --- a/spring-webflow-samples/booking-portlet-faces/build.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/spring-webflow-samples/booking-portlet-faces/pom.xml b/spring-webflow-samples/booking-portlet-faces/pom.xml deleted file mode 100644 index 9e904728..00000000 --- a/spring-webflow-samples/booking-portlet-faces/pom.xml +++ /dev/null @@ -1,212 +0,0 @@ - - - 4.0.0 - org.springframework.webflow.samples - booking-portlet-faces - war - Hotel Booking : Spring Portlet MVC + Web Flow + JSF - 2.3.3.BUILD-SNAPSHOT - - 3.2.1.RELEASE - 1.5.10 - 1.2.9 - - - - - org.springframework - spring-context - ${org.springframework-version} - - - - commons-logging - commons-logging - - - - - org.springframework - spring-jdbc - ${org.springframework-version} - - - org.springframework - spring-orm - ${org.springframework-version} - - - org.springframework - spring-webmvc - ${org.springframework-version} - - - org.springframework - spring-webmvc-portlet - ${org.springframework-version} - - - org.springframework.webflow - spring-faces - ${project.version} - - - - org.hsqldb - hsqldb - 1.8.0.10 - runtime - - - org.hibernate - hibernate-entitymanager - 3.5.0-Final - - - - org.apache.myfaces.core - myfaces-api - ${myfaces.core-version} - - - org.apache.myfaces.core - myfaces-impl - ${myfaces.core-version} - - - com.sun.facelets - jsf-facelets - 1.1.14 - - - - org.slf4j - slf4j-api - ${org.slf4j-version} - - - org.slf4j - jcl-over-slf4j - ${org.slf4j-version} - - - org.slf4j - slf4j-log4j12 - ${org.slf4j-version} - runtime - - - log4j - log4j - 1.2.15 - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime - - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.portlet - portlet-api - 2.0 - provided - - - - org.hibernate - hibernate-validator - 4.0.2.GA - - - - javax.xml.bind - jaxb-api - 2.1 - - - - org.easymock - easymock - 2.5.2 - test - - - junit - junit - 3.8.2 - test - - - org.springframework - spring-test - ${org.springframework-version} - test - - - - - spring-repository - Spring project snapshots, milestones, and releases - http://repo.springsource.org/snapshot - - - - booking-portlet-faces - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-surefire-plugin - - junit:junit - - **/*Tests.java - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - true - false - 2.0 - - - - - diff --git a/spring-webflow-samples/booking-portlet-faces/readme.txt b/spring-webflow-samples/booking-portlet-faces/readme.txt deleted file mode 100644 index 323a0811..00000000 --- a/spring-webflow-samples/booking-portlet-faces/readme.txt +++ /dev/null @@ -1,8 +0,0 @@ - -Starting with version 2.2, Spring Web Flow provides support for JSF Portlets using its own internal -Portlet integration rather than a Portlet Bridge for JSF. - -This sample demonstrates that support. It has been tested on Apache Pluto 2.0.1 with Portlet -API 2.0 and JSF 1.2 (both Mojarra and MyFaces). - -See the reference documentation for more information. diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/Booking.java b/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/Booking.java deleted file mode 100644 index 07db3df3..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/Booking.java +++ /dev/null @@ -1,198 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.text.DateFormat; -import java.util.Calendar; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -import org.springframework.binding.message.MessageBuilder; -import org.springframework.binding.message.MessageContext; - -/** - * A Hotel Booking made by a User. - */ -@Entity -public class Booking implements Serializable { - - private static final long serialVersionUID = 1171567558348174963L; - - private Long id; - - private User user; - - private Hotel hotel; - - private Date checkinDate; - - private Date checkoutDate; - - private String creditCard; - - private String creditCardName; - - private int creditCardExpiryMonth; - - private int creditCardExpiryYear; - - private boolean smoking; - - private int beds; - - public Booking() { - } - - public Booking(Hotel hotel, User user) { - this.hotel = hotel; - this.user = user; - Calendar calendar = Calendar.getInstance(); - setCheckinDate(calendar.getTime()); - calendar.add(Calendar.DAY_OF_MONTH, 1); - setCheckoutDate(calendar.getTime()); - } - - @Transient - public BigDecimal getTotal() { - return hotel.getPrice().multiply(new BigDecimal(getNights())); - } - - @Transient - public int getNights() { - return (int) (checkoutDate.getTime() - checkinDate.getTime()) / 1000 / 60 / 60 / 24; - } - - @Id - @GeneratedValue(strategy = GenerationType.TABLE) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - @Basic - @Temporal(TemporalType.DATE) - public Date getCheckinDate() { - return checkinDate; - } - - public void setCheckinDate(Date datetime) { - this.checkinDate = datetime; - } - - @ManyToOne - public Hotel getHotel() { - return hotel; - } - - public void setHotel(Hotel hotel) { - this.hotel = hotel; - } - - @ManyToOne - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - - @Basic - @Temporal(TemporalType.DATE) - public Date getCheckoutDate() { - return checkoutDate; - } - - public void setCheckoutDate(Date checkoutDate) { - this.checkoutDate = checkoutDate; - } - - public String getCreditCard() { - return creditCard; - } - - public void setCreditCard(String creditCard) { - this.creditCard = creditCard; - } - - @Transient - public String getDescription() { - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM); - return hotel == null ? null : hotel.getName() + ", " + df.format(getCheckinDate()) + " to " - + df.format(getCheckoutDate()); - } - - public boolean isSmoking() { - return smoking; - } - - public void setSmoking(boolean smoking) { - this.smoking = smoking; - } - - public int getBeds() { - return beds; - } - - public void setBeds(int beds) { - this.beds = beds; - } - - public String getCreditCardName() { - return creditCardName; - } - - public void setCreditCardName(String creditCardName) { - this.creditCardName = creditCardName; - } - - public int getCreditCardExpiryMonth() { - return creditCardExpiryMonth; - } - - public void setCreditCardExpiryMonth(int creditCardExpiryMonth) { - this.creditCardExpiryMonth = creditCardExpiryMonth; - } - - public int getCreditCardExpiryYear() { - return creditCardExpiryYear; - } - - public void setCreditCardExpiryYear(int creditCardExpiryYear) { - this.creditCardExpiryYear = creditCardExpiryYear; - } - - public boolean validate(MessageContext context) { - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.DAY_OF_MONTH, -1); - boolean valid = true; - if (checkinDate.before(calendar.getTime())) { - context.addMessage(new MessageBuilder().error().source("checkinDate").defaultText( - "Check in date must be a future date").build()); - valid = false; - } else if (!checkinDate.before(checkoutDate)) { - context.addMessage(new MessageBuilder().error().source("checkoutDate").defaultText( - "Check out date must be later than check in date").build()); - valid = false; - } - return valid; - } - - @Override - public String toString() { - return "Booking(" + user + "," + hotel + ")"; - } - -} diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/BookingService.java b/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/BookingService.java deleted file mode 100644 index 59a333f3..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/BookingService.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.util.List; - -/** - * A service interface for retrieving hotels and bookings from a backing repository. Also supports the ability to cancel - * a booking. - */ -public interface BookingService { - - /** - * Find bookings made by the given user - * @param username the user's name - * @return their bookings - */ - public List findBookings(String username); - - /** - * Find hotels available for booking by some criteria. - * @param criteria the search criteria - * @return a list of hotels meeting the criteria - */ - public List findHotels(SearchCriteria criteria); - - /** - * Find hotels by their identifier. - * @param id the hotel id - * @return the hotel - */ - public Hotel findHotelById(Long id); - - /** - * Find user by their username. - * @param username the user's username - * @return the user - */ - public User findUser(String username); - - /** - * Create a new, transient hotel booking instance for the given user. - * @param hotelId the hotelId - * @param userName the user name - * @return the new transient booking instance - */ - public Booking createBooking(Long hotelId, String userName); - - /** - * Persist the booking to the database - * @param booking the booking - */ - public void persistBooking(Booking booking); - - /** - * Cancel an existing booking. - * @param id the booking id - */ - public void cancelBooking(Booking booking); - -} diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/Hotel.java b/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/Hotel.java deleted file mode 100644 index 3715a98a..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/Hotel.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; -import java.math.BigDecimal; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -/** - * A hotel where users may book stays. - */ -@Entity -public class Hotel implements Serializable { - - private static final long serialVersionUID = 4011346719502656269L; - - private Long id; - - private String name; - - private String address; - - private String city; - - private String state; - - private String zip; - - private String country; - - private BigDecimal price; - - @Id - @GeneratedValue - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getZip() { - return zip; - } - - public void setZip(String zip) { - this.zip = zip; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public String getCountry() { - return country; - } - - public void setCountry(String country) { - this.country = country; - } - - @Column(precision = 6, scale = 2) - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - public Booking createBooking(User user) { - return new Booking(this, user); - } - - @Override - public String toString() { - return "Hotel(" + name + "," + address + "," + city + "," + zip + ")"; - } -} diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java b/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java deleted file mode 100644 index b5304110..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - -import org.springframework.stereotype.Repository; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - -/** - * A JPA-based implementation of the Booking Service. Delegates to a JPA entity manager to issue data access calls - * against the backing repository. The EntityManager reference is provided by the managing container (Spring) - * automatically. - */ -@Service("bookingService") -@Repository -public class JpaBookingService implements BookingService { - - private EntityManager em; - - @PersistenceContext - public void setEntityManager(EntityManager em) { - this.em = em; - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public List findBookings(String username) { - if (username != null) { - return em.createQuery("select b from Booking b where b.user.username = :username order by b.checkinDate") - .setParameter("username", username).getResultList(); - } else { - return null; - } - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public List findHotels(SearchCriteria criteria) { - String pattern = getSearchPattern(criteria); - return em - .createQuery( - "select h from Hotel h where lower(h.name) like :pattern or lower(h.city) like :pattern " - + " or lower(h.zip) like :pattern or lower(h.address) like :pattern") - .setParameter("pattern", pattern).setMaxResults(criteria.getPageSize()) - .setFirstResult(criteria.getPage() * criteria.getPageSize()).getResultList(); - } - - @Transactional(readOnly = true) - public Hotel findHotelById(Long id) { - return em.find(Hotel.class, id); - } - - @Transactional(readOnly = true) - public User findUser(String username) { - return (User) em.createQuery("select u from User u where u.username = :username") - .setParameter("username", username).getSingleResult(); - } - - @Transactional(readOnly = true) - public Booking createBooking(Long hotelId, String username) { - Hotel hotel = em.find(Hotel.class, hotelId); - User user = findUser(username); - return new Booking(hotel, user); - } - - @Transactional - public void persistBooking(Booking booking) { - em.persist(booking); - } - - @Transactional - public void cancelBooking(Booking booking) { - booking = em.find(Booking.class, booking.getId()); - if (booking != null) { - em.remove(booking); - } - } - - // helpers - - private String getSearchPattern(SearchCriteria criteria) { - if (StringUtils.hasText(criteria.getSearchString())) { - return "%" + criteria.getSearchString().toLowerCase().replace('*', '%') + "%"; - } else { - return "%"; - } - } - -} \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/ReferenceData.java b/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/ReferenceData.java deleted file mode 100644 index 4c499aaf..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/ReferenceData.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.util.ArrayList; -import java.util.List; - -import javax.faces.model.SelectItem; - -import org.springframework.stereotype.Service; - -@Service -public class ReferenceData { - - private List bedOptions; - - private List smokingOptions; - - private List creditCardExpMonths; - - private List creditCardExpYears; - - private List pageSizeOptions; - - public List getBedOptions() { - if (bedOptions == null) { - bedOptions = new ArrayList(); - bedOptions.add(new SelectItem(new Integer(1), "One king-size bed")); - bedOptions.add(new SelectItem(new Integer(2), "Two double beds")); - bedOptions.add(new SelectItem(new Integer(3), "Three beds")); - } - return bedOptions; - } - - public List getSmokingOptions() { - if (smokingOptions == null) { - smokingOptions = new ArrayList(); - smokingOptions.add(new SelectItem(Boolean.TRUE, "Smoking")); - smokingOptions.add(new SelectItem(Boolean.FALSE, "Non-Smoking")); - } - return smokingOptions; - } - - public List getCreditCardExpMonths() { - if (creditCardExpMonths == null) { - creditCardExpMonths = new ArrayList(); - creditCardExpMonths.add(new SelectItem(new Integer(1), "Jan")); - creditCardExpMonths.add(new SelectItem(new Integer(2), "Feb")); - creditCardExpMonths.add(new SelectItem(new Integer(3), "Mar")); - creditCardExpMonths.add(new SelectItem(new Integer(4), "Apr")); - creditCardExpMonths.add(new SelectItem(new Integer(5), "May")); - creditCardExpMonths.add(new SelectItem(new Integer(6), "Jun")); - creditCardExpMonths.add(new SelectItem(new Integer(7), "Jul")); - creditCardExpMonths.add(new SelectItem(new Integer(8), "Aug")); - creditCardExpMonths.add(new SelectItem(new Integer(9), "Sep")); - creditCardExpMonths.add(new SelectItem(new Integer(10), "Oct")); - creditCardExpMonths.add(new SelectItem(new Integer(11), "Nov")); - creditCardExpMonths.add(new SelectItem(new Integer(12), "Dec")); - } - return creditCardExpMonths; - } - - public List getCreditCardExpYears() { - if (creditCardExpYears == null) { - creditCardExpYears = new ArrayList(); - creditCardExpYears.add(new SelectItem(new Integer(2008), "2008")); - creditCardExpYears.add(new SelectItem(new Integer(2009), "2009")); - creditCardExpYears.add(new SelectItem(new Integer(2010), "2010")); - creditCardExpYears.add(new SelectItem(new Integer(2010), "2011")); - creditCardExpYears.add(new SelectItem(new Integer(2010), "2012")); - } - return creditCardExpYears; - } - - public List getPageSizeOptions() { - if (pageSizeOptions == null) { - pageSizeOptions = new ArrayList(); - pageSizeOptions.add(new SelectItem(new Integer(5), "5")); - pageSizeOptions.add(new SelectItem(new Integer(10), "10")); - pageSizeOptions.add(new SelectItem(new Integer(20), "20")); - } - return pageSizeOptions; - } - -} diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java b/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java deleted file mode 100644 index 0a1b92dc..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; - -/** - * A backing bean for the main hotel search form. Encapsulates the criteria needed to perform a hotel search. - */ -public class SearchCriteria implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * The user-provided search criteria for finding Hotels. - */ - private String searchString = ""; - - /** - * The maximum page size of the Hotel result list - */ - private int pageSize = 5; - - /** - * The current page of the Hotel result list. - */ - private int page; - - public String getSearchString() { - return searchString; - } - - public void setSearchString(String searchString) { - this.searchString = searchString; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPage() { - return page; - } - - public void setPage(int page) { - this.page = page; - } - - public void nextPage() { - page++; - } - - public void previousPage() { - page--; - } - - public void resetPage() { - page = 0; - } - - public String toString() { - return "[Search Criteria searchString = '" + searchString + "'"; - } -} \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/User.java b/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/User.java deleted file mode 100644 index 2a5d0a5c..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/User.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -/** - * A user who can book hotels. - */ -@Entity -@Table(name = "Customer") -public class User implements Serializable { - - private static final long serialVersionUID = -3652559447682574722L; - - private String username; - - private String password; - - private String name; - - public User() { - } - - public User(String username, String password, String name) { - this.username = username; - this.password = password; - this.name = name; - } - - @Id - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public String toString() { - return "User(" + username + ")"; - } -} diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/ViewFlowHandler.java b/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/ViewFlowHandler.java deleted file mode 100644 index 27a42805..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/java/org/springframework/webflow/samples/booking/ViewFlowHandler.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import org.springframework.webflow.mvc.portlet.AbstractFlowHandler; - -public class ViewFlowHandler extends AbstractFlowHandler { - - public String getFlowId() { - return "view"; - } - -} diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/resources/META-INF/persistence.xml b/spring-webflow-samples/booking-portlet-faces/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index f4e3d6a7..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - org.hibernate.ejb.HibernatePersistence - org.springframework.webflow.samples.booking.User - org.springframework.webflow.samples.booking.Booking - org.springframework.webflow.samples.booking.Hotel - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/resources/import.sql b/spring-webflow-samples/booking-portlet-faces/src/main/resources/import.sql deleted file mode 100644 index 9c156ed2..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/resources/import.sql +++ /dev/null @@ -1,28 +0,0 @@ -insert into Customer (username, name) values ('keith', 'Keith') -insert into Customer (username, name) values ('erwin', 'Erwin') -insert into Customer (username, name) values ('jeremy', 'Jeremy') -insert into Customer (username, name) values ('scott', 'Scott') -insert into Customer (username, name) values ('pluto', 'Pluto') -insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 199, 'Westin Diplomat', '3555 S. Ocean Drive', 'Hollywood', 'FL', '33019', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 60, 'Jameson Inn', '890 Palm Bay Rd NE', 'Palm Bay', 'FL', '32905', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 199, 'Chilworth Manor', 'The Cottage, Southampton Business Park', 'Southampton', 'Hants', 'SO16 7JF', 'UK') -insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (7, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 130, 'Hotel Beaulac', ' Esplanade Léopold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (22, 250, 'Meliá White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (23, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/resources/log4j.xml b/spring-webflow-samples/booking-portlet-faces/src/main/resources/log4j.xml deleted file mode 100644 index 4c3ff1c0..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/resources/log4j.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/classes/log4j.properties b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/classes/log4j.properties deleted file mode 100644 index 992d816d..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,11 +0,0 @@ -log4j.rootCategory=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n - -# Enable web flow logging -log4j.category.org.springframework.webflow=DEBUG -log4j.category.org.springframework.faces=DEBUG -log4j.category.org.springframework.binding=DEBUG -log4j.category.org.springframework.transaction=DEBUG \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/config/application-config.xml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/config/application-config.xml deleted file mode 100644 index 295df2e2..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/config/application-config.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/config/hotelbooking-portlet-config.xml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/config/hotelbooking-portlet-config.xml deleted file mode 100644 index 6526dc0f..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/config/hotelbooking-portlet-config.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/faces-config.xml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/faces-config.xml deleted file mode 100644 index 67a0dac8..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/faces-config.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - org.springframework.faces.webflow.application.portlet.PortletFaceletViewHandler - - diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/booking/booking.xml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/booking/booking.xml deleted file mode 100644 index a3abd47d..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/booking/booking.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml deleted file mode 100644 index 982cda94..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.xhtml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - -

Book Hotel

- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Name:#{booking.hotel.name}
Address:#{booking.hotel.address}
City, State:#{booking.hotel.city}, #{booking.hotel.state}
Zip:#{booking.hotel.zip}
Country:#{booking.hotel.country}
Nightly rate: - - - -
- Check In Date: - - - - -
- Check Out Date: - - - - -
- Room Preference: - - - - -
- Smoking Preference: - - - - -
- Credit Card #: - - -
- Credit Card Name: - - -
- Expiration Date: - - - - - - - -
-   - -
-
- - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/booking/reviewBooking.xhtml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/booking/reviewBooking.xhtml deleted file mode 100644 index 57c610b7..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/booking/reviewBooking.xhtml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - -

Confirm Hotel Booking

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Name:#{booking.hotel.name}
Address:#{booking.hotel.address}
City, State:#{booking.hotel.city}, #{booking.hotel.state}
Zip:#{booking.hotel.zip}
Country:#{booking.hotel.country}
Total payment: - - - -
Check In Date: - - - -
Check Out Date: - - - -
Credit Card #:#{booking.creditCard}
-   -   - -
-
- - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml deleted file mode 100644 index 9b559b52..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - -
-

Search Hotels

- - - - -
-
-
- Search String: - -
-
- Maximum results: - - - -
-
- -
-
-
- -
- -
- -

Current Hotel Bookings

- - - - Name - #{booking.hotel.name} - - - Address - #{booking.hotel.address} - - - City, State - #{booking.hotel.city}, #{booking.hotel.state} - - - Check in date - - - - - - Check out date - - - - - - Confirmation number - #{booking.id} - - - Action - - - - -
- - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/main/main.xml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/main/main.xml deleted file mode 100644 index 2c798207..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/main/main.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml deleted file mode 100644 index 9517b4a3..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -

View Hotel

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Name:#{hotel.name}
Address:#{hotel.address}
City:#{hotel.city}
State:#{hotel.state}
Zip:#{hotel.zip}
Country:#{hotel.country}
Nightly rate: - - - -
- - - -   - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml deleted file mode 100644 index ad9d944d..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - -

Hotel Results

-

- -

-
- - - - Name - #{hotel.name} - - - Address - #{hotel.address} - - - City, State - #{hotel.city}, #{hotel.state}, #{hotel.country} - - - Zip - #{hotel.zip} - - - Action - - - - - -
- - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/view/intro.xhtml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/view/intro.xhtml deleted file mode 100644 index b9b064e1..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/view/intro.xhtml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - -

Welcome to Spring Travel

-

- This reference application illustrates Spring Faces, - a software library that integrates Spring and JavaServerFaces technology in a portlet environment. -

-

- The key features illustrated in this sample include: -

-
    -
  • A declarative navigation model enabling full browser button support and dynamic navigation rules
    • -
  • A fine-grained state management model, including support for ConversationScope and ViewScope
    • -
  • Modularization of web application functionality by domain use case, illustrating project structure best-practices
    • -
  • Managed persistence contexts with the Java Persistence API (JPA)
    • -
  • Unified Expression Language (EL) integration
    • -
  • Declarative page authoring with Facelets, including applying reusable page layouts
    • -
  • Exception handling support across all layers of the application
    • -
  • Spring IDE tooling integration, with support for graphical flow modeling and visualization
    • -
-

- - Start your Spring Travel experience - -

- - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/view/view.xml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/view/view.xml deleted file mode 100644 index 71d0044f..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/flows/view/view.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/portlet.xml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/portlet.xml deleted file mode 100644 index 2294d947..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/portlet.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - swf-booking-faces - Spring Webflow Booking Faces - - - org.springframework.web.portlet.DispatcherPortlet - - - - contextConfigLocation - - /WEB-INF/config/hotelbooking-portlet-config.xml - - - - - viewRendererUrl - /WEB-INF/servlet/view - - - 0 - - - text/html - view - - - - Spring Webflow Booking Faces - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 1ad56826..00000000 --- a/spring-webflow-samples/booking-portlet-faces/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - contextConfigLocation - - /WEB-INF/config/application-config.xml - - - - - - javax.faces.DEFAULT_SUFFIX - .xhtml - - - - - facelets.DEVELOPMENT - true - - - - - facelets.REFRESH_PERIOD - 1 - - - - org.springframework.web.context.ContextLoaderListener - - - - - swf-booking-faces - org.apache.pluto.container.driver.PortletServlet - - portlet-name - swf-booking-faces - - 1 - - - - swf-booking-faces - /PlutoInvoker/swf-booking-faces - - - - - Faces Servlet - javax.faces.webapp.FacesServlet - 1 - - - - - Faces Servlet - *.faces - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-faces/src/test/java/.gitignore b/spring-webflow-samples/booking-portlet-faces/src/test/java/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/spring-webflow-samples/booking-portlet-faces/src/test/resources/.gitignore b/spring-webflow-samples/booking-portlet-faces/src/test/resources/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/spring-webflow-samples/booking-portlet-mvc/.project b/spring-webflow-samples/booking-portlet-mvc/.project deleted file mode 100644 index 94e32f6f..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/.project +++ /dev/null @@ -1,22 +0,0 @@ - - booking-portlet-mvc - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - org.eclipse.jdt.core.javabuilder - - - org.eclipse.wst.common.project.facet.core.builder - - - org.eclipse.wst.validation.validationbuilder - - - - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/build.xml b/spring-webflow-samples/booking-portlet-mvc/build.xml deleted file mode 100644 index e28d39cd..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/build.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/spring-webflow-samples/booking-portlet-mvc/pom.xml b/spring-webflow-samples/booking-portlet-mvc/pom.xml deleted file mode 100644 index 03cf2c06..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/pom.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - 4.0.0 - org.springframework.webflow.samples - booking-portlet-mvc - war - Hotel Booking : Spring Portlet MVC + Web Flow + JSP - 2.3.3.BUILD-SNAPSHOT - - 3.2.1.RELEASE - 1.5.10 - - - - - org.springframework - spring-context - ${org.springframework-version} - - - - commons-logging - commons-logging - - - - - org.springframework - spring-jdbc - ${org.springframework-version} - - - org.springframework - spring-orm - ${org.springframework-version} - - - org.springframework - spring-webmvc - ${org.springframework-version} - - - org.springframework - spring-webmvc-portlet - ${org.springframework-version} - - - org.springframework.webflow - spring-webflow - ${project.version} - - - org.springframework.webflow - spring-js - ${project.version} - - - - org.slf4j - slf4j-api - ${org.slf4j-version} - - - org.slf4j - jcl-over-slf4j - ${org.slf4j-version} - - - org.slf4j - slf4j-log4j12 - ${org.slf4j-version} - runtime - - - log4j - log4j - 1.2.15 - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime - - - - org.hsqldb - hsqldb - 1.8.0.10 - runtime - - - org.hibernate - hibernate-entitymanager - 3.5.0-Final - - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.portlet - portlet-api - 2.0 - provided - - - javax.servlet - jstl - 1.2 - - - - org.hibernate - hibernate-validator - 4.1.0.Beta1 - - - - javax.xml.bind - jaxb-api - 2.1 - - - - joda-time - joda-time - 1.6 - - - joda-time - joda-time-jsptags - 1.0.2 - runtime - - - - org.easymock - easymock - 2.5.2 - test - - - junit - junit - 3.8.2 - test - - - org.springframework - spring-test - ${org.springframework-version} - test - - - - - spring-repository - Spring project snapshots, milestones, and releases - http://repo.springsource.org/snapshot - - - - booking-portlet-mvc - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-surefire-plugin - - junit:junit - - **/*Tests.java - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - true - false - 2.0 - - - - - diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/Booking.java b/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/Booking.java deleted file mode 100644 index 2cf8b8c0..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/Booking.java +++ /dev/null @@ -1,192 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.text.DateFormat; -import java.util.Calendar; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; -import javax.validation.constraints.Future; -import javax.validation.constraints.NotNull; - -import org.hibernate.validator.constraints.NotEmpty; -import org.springframework.format.annotation.DateTimeFormat; - -/** - * A Hotel Booking made by a User. - */ -@Entity -@BookingDateRange -public class Booking implements Serializable { - private Long id; - - private User user; - - private Hotel hotel; - - @DateTimeFormat(pattern = "MM-dd-yyyy") - private Date checkinDate; - - @DateTimeFormat(pattern = "MM-dd-yyyy") - private Date checkoutDate; - - private String creditCard; - - private String creditCardName; - - private int creditCardExpiryMonth; - - private int creditCardExpiryYear; - - private boolean smoking; - - private int beds; - - public Booking() { - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.DAY_OF_MONTH, 1); - setCheckinDate(calendar.getTime()); - calendar.add(Calendar.DAY_OF_MONTH, 1); - setCheckoutDate(calendar.getTime()); - } - - public Booking(Hotel hotel, User user) { - this(); - this.hotel = hotel; - this.user = user; - } - - @Transient - public BigDecimal getTotal() { - return hotel.getPrice().multiply(new BigDecimal(getNights())); - } - - @Transient - public int getNights() { - return (int) (checkoutDate.getTime() - checkinDate.getTime()) / 1000 / 60 / 60 / 24; - } - - @Id - @GeneratedValue(strategy = GenerationType.TABLE) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - @Basic - @Temporal(TemporalType.DATE) - @NotNull - @Future - public Date getCheckinDate() { - return checkinDate; - } - - public void setCheckinDate(Date datetime) { - this.checkinDate = datetime; - } - - @ManyToOne - public Hotel getHotel() { - return hotel; - } - - public void setHotel(Hotel hotel) { - this.hotel = hotel; - } - - @ManyToOne - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - - @Basic - @Temporal(TemporalType.DATE) - @NotNull - @Future - public Date getCheckoutDate() { - return checkoutDate; - } - - public void setCheckoutDate(Date checkoutDate) { - this.checkoutDate = checkoutDate; - } - - @NotEmpty - public String getCreditCard() { - return creditCard; - } - - public void setCreditCard(String creditCard) { - this.creditCard = creditCard; - } - - @Transient - public String getDescription() { - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM); - return hotel == null ? null : hotel.getName() + ", " + df.format(getCheckinDate()) + " to " - + df.format(getCheckoutDate()); - } - - public boolean isSmoking() { - return smoking; - } - - public void setSmoking(boolean smoking) { - this.smoking = smoking; - } - - public int getBeds() { - return beds; - } - - public void setBeds(int beds) { - this.beds = beds; - } - - @NotEmpty - public String getCreditCardName() { - return creditCardName; - } - - public void setCreditCardName(String creditCardName) { - this.creditCardName = creditCardName; - } - - public int getCreditCardExpiryMonth() { - return creditCardExpiryMonth; - } - - public void setCreditCardExpiryMonth(int creditCardExpiryMonth) { - this.creditCardExpiryMonth = creditCardExpiryMonth; - } - - public int getCreditCardExpiryYear() { - return creditCardExpiryYear; - } - - public void setCreditCardExpiryYear(int creditCardExpiryYear) { - this.creditCardExpiryYear = creditCardExpiryYear; - } - - @Override - public String toString() { - return "Booking(" + user + "," + hotel + ")"; - } - -} diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRange.java b/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRange.java deleted file mode 100644 index a5cad188..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRange.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import javax.validation.Constraint; -import javax.validation.Payload; - -@Constraint(validatedBy = BookingDateRangeValidator.class) -@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER }) -@Retention(RetentionPolicy.RUNTIME) -public @interface BookingDateRange { - - String message() default "Invalid check-in and check-out date range"; - - Class[] groups() default {}; - - Class[] payload() default {}; - -} diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRangeValidator.java b/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRangeValidator.java deleted file mode 100644 index 716a40bc..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingDateRangeValidator.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - -public class BookingDateRangeValidator implements ConstraintValidator { - - public void initialize(BookingDateRange bookingDateRange) { - } - - public boolean isValid(Booking booking, ConstraintValidatorContext context) { - if ((booking.getCheckinDate() != null) && (booking.getCheckoutDate() != null) - && booking.getCheckoutDate().before(booking.getCheckinDate())) { - return false; - } - return true; - } - -} diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingService.java b/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingService.java deleted file mode 100644 index 5a1978ff..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingService.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.util.List; - -/** - * A service interface for retrieving hotels and bookings from a backing repository. Also supports the ability to cancel - * a booking. - */ -public interface BookingService { - - /** - * Find user by their username. - * @param username the user's username - * @return the user - */ - public User findUser(String username); - - /** - * Find bookings made by the given user - * @param username the user's name - * @return their bookings - */ - public List findBookings(String username); - - /** - * Find hotels available for booking by some criteria. - * @param criteria the search criteria - * @return a list of hotels meeting the criteria - */ - public List findHotels(SearchCriteria criteria); - - /** - * Find hotels by their identifier. - * @param id the hotel id - * @return the hotel - */ - public Hotel findHotelById(Long id); - - /** - * Create a new, transient hotel booking instance for the given user. - * @param hotelId the hotelId - * @param userName the user name - * @return the new transient booking instance - */ - public Booking createBooking(Long hotelId, String userName); - - /** - * Persist the booking to the database - * @param booking the booking - */ - public void persistBooking(Booking booking); - - /** - * Cancel an existing booking. - * @param id the booking id - */ - public void cancelBooking(Long id); - -} diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingValidator.java b/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingValidator.java deleted file mode 100644 index f0977e17..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/BookingValidator.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.util.Calendar; - -import org.springframework.validation.Errors; -import org.springframework.validation.Validator; - -public class BookingValidator implements Validator { - - public boolean supports(Class clazz) { - return Booking.class.equals(clazz); - } - - public void validate(Object obj, Errors errors) { - Booking booking = (Booking) obj; - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.DAY_OF_MONTH, -1); - if (booking.getCreditCard() == null || "".equals(booking.getCreditCard())) { - errors.rejectValue("creditCard", null, "Credit card number must be provided"); - } - if (booking.getCreditCardName() == null || "".equals(booking.getCreditCardName())) { - errors.rejectValue("creditCardName", null, "Credit card name must be provided"); - } - if (booking.getCheckinDate() == null || booking.getCheckinDate().before(calendar.getTime())) { - errors.rejectValue("checkinDate", null, "Check in date must be a future date"); - } else if (booking.getCheckoutDate() == null || !booking.getCheckinDate().before(booking.getCheckoutDate())) { - errors.rejectValue("checkoutDate", null, "Check out date must be later than check in date"); - } - } - -} diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/Hotel.java b/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/Hotel.java deleted file mode 100644 index 99719e50..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/Hotel.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; -import java.math.BigDecimal; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -/** - * A hotel where users may book stays. - */ -@Entity -public class Hotel implements Serializable { - private Long id; - - private String name; - - private String address; - - private String city; - - private String state; - - private String zip; - - private String country; - - private BigDecimal price; - - @Id - @GeneratedValue - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getZip() { - return zip; - } - - public void setZip(String zip) { - this.zip = zip; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public String getCountry() { - return country; - } - - public void setCountry(String country) { - this.country = country; - } - - @Column(precision = 6, scale = 2) - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - public Booking createBooking(User user) { - return new Booking(this, user); - } - - @Override - public String toString() { - return "Hotel(" + name + "," + address + "," + city + "," + zip + ")"; - } -} diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java b/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java deleted file mode 100644 index 6a365256..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - -import org.springframework.stereotype.Repository; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - -/** - * A JPA-based implementation of the Booking Service. Delegates to a JPA entity manager to issue data access calls - * against the backing repository. The EntityManager reference is provided by the managing container (Spring) - * automatically. - */ -@Service("bookingService") -@Repository -public class JpaBookingService implements BookingService { - - private EntityManager em; - - @PersistenceContext - public void setEntityManager(EntityManager em) { - this.em = em; - } - - @Transactional(readOnly = true) - public User findUser(String username) { - return (User) em.createQuery("select u from User u where u.username = :username") - .setParameter("username", username).getSingleResult(); - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public List findBookings(String username) { - if (username != null) { - return em.createQuery("select b from Booking b where b.user.username = :username order by b.checkinDate") - .setParameter("username", username).getResultList(); - } else { - return null; - } - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public List findHotels(SearchCriteria criteria) { - String pattern = getSearchPattern(criteria); - return em - .createQuery( - "select h from Hotel h where lower(h.name) like :pattern or lower(h.city) like :pattern " - + " or lower(h.zip) like :pattern or lower(h.address) like :pattern") - .setParameter("pattern", pattern).setMaxResults(criteria.getPageSize()) - .setFirstResult(criteria.getPage() * criteria.getPageSize()).getResultList(); - } - - @Transactional(readOnly = true) - public Hotel findHotelById(Long id) { - return em.find(Hotel.class, id); - } - - @Transactional(readOnly = true) - public Booking createBooking(Long hotelId, String username) { - Hotel hotel = em.find(Hotel.class, hotelId); - User user = findUser(username); - return new Booking(hotel, user); - } - - @Transactional - public void persistBooking(Booking booking) { - em.persist(booking); - } - - @Transactional - public void cancelBooking(Long id) { - Booking booking = em.find(Booking.class, id); - if (booking != null) { - em.remove(booking); - } - } - - // helpers - - private String getSearchPattern(SearchCriteria criteria) { - if (StringUtils.hasText(criteria.getSearchString())) { - return "%" + criteria.getSearchString().toLowerCase().replace('*', '%') + "%"; - } else { - return "%"; - } - } - -} \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java b/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java deleted file mode 100644 index ba0b2f01..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; - -/** - * A backing bean for the main hotel search form. Encapsulates the criteria needed to perform a hotel search. - * - * It is expected a future milestone of Spring Web Flow 2.0 will allow flow-scoped beans like this one to hold - * references to transient services that are restored automatically when the flow is resumed on subsequent requests. - * This would allow this SearchCriteria object to delegate to the {@link BookingService} directly, for example, - * eliminating the need for the actions in {@link MainActions}. - */ -public class SearchCriteria implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * The user-provided search criteria for finding Hotels. - */ - private String searchString; - - /** - * The maximum page size of the Hotel result list - */ - private int pageSize; - - /** - * The current page of the Hotel result list. - */ - private int page; - - public String getSearchString() { - return searchString; - } - - public void setSearchString(String searchString) { - this.searchString = searchString; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPage() { - return page; - } - - public void setPage(int page) { - this.page = page; - } - - public void nextPage() { - page++; - } - - public void previousPage() { - page--; - } - - public void resetPage() { - page = 0; - } - -} \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/User.java b/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/User.java deleted file mode 100644 index 55213ad0..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/User.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -/** - * A user who can book hotels. - */ -@Entity -@Table(name = "Customer") -public class User implements Serializable { - private String username; - - private String password; - - private String name; - - public User() { - } - - public User(String username, String password, String name) { - this.username = username; - this.password = password; - this.name = name; - } - - @Id - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public String toString() { - return "User(" + username + ")"; - } -} diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/ViewFlowHandler.java b/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/ViewFlowHandler.java deleted file mode 100644 index 27a42805..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/java/org/springframework/webflow/samples/booking/ViewFlowHandler.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import org.springframework.webflow.mvc.portlet.AbstractFlowHandler; - -public class ViewFlowHandler extends AbstractFlowHandler { - - public String getFlowId() { - return "view"; - } - -} diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/resources/META-INF/persistence.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index f4e3d6a7..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - org.hibernate.ejb.HibernatePersistence - org.springframework.webflow.samples.booking.User - org.springframework.webflow.samples.booking.Booking - org.springframework.webflow.samples.booking.Hotel - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/resources/import.sql b/spring-webflow-samples/booking-portlet-mvc/src/main/resources/import.sql deleted file mode 100644 index 9c156ed2..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/resources/import.sql +++ /dev/null @@ -1,28 +0,0 @@ -insert into Customer (username, name) values ('keith', 'Keith') -insert into Customer (username, name) values ('erwin', 'Erwin') -insert into Customer (username, name) values ('jeremy', 'Jeremy') -insert into Customer (username, name) values ('scott', 'Scott') -insert into Customer (username, name) values ('pluto', 'Pluto') -insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 199, 'Westin Diplomat', '3555 S. Ocean Drive', 'Hollywood', 'FL', '33019', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 60, 'Jameson Inn', '890 Palm Bay Rd NE', 'Palm Bay', 'FL', '32905', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 199, 'Chilworth Manor', 'The Cottage, Southampton Business Park', 'Southampton', 'Hants', 'SO16 7JF', 'UK') -insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (7, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 130, 'Hotel Beaulac', ' Esplanade Léopold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (22, 250, 'Meliá White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (23, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/resources/log4j.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/resources/log4j.xml deleted file mode 100644 index b4e9ad15..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/resources/log4j.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/META-INF/MANIFEST.MF b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/classes/log4j.properties b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/classes/log4j.properties deleted file mode 100644 index 0b9061f0..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,11 +0,0 @@ -log4j.rootCategory=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n - -# Enable web flow logging -log4j.category.org.springframework.webflow=DEBUG -log4j.category.org.springframework.js=DEBUG -log4j.category.org.springframework.binding=DEBUG -log4j.category.org.springframework.transaction=DEBUG \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/application-config.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/application-config.xml deleted file mode 100644 index 02faf838..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/application-config.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/hotelbooking-portlet-config.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/hotelbooking-portlet-config.xml deleted file mode 100644 index f3cc03aa..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/config/hotelbooking-portlet-config.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/booking.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/booking.xml deleted file mode 100644 index f7cd26f3..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/booking.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp deleted file mode 100644 index 51508a95..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/enterBookingDetails.jsp +++ /dev/null @@ -1,142 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -

Book Hotel

- - - - - - -
- - -
- - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Name:${booking.hotel.name}
Address:${booking.hotel.address}
City, State:${booking.hotel.city}, ${booking.hotel.state}
Zip:${booking.hotel.zip}
Country:${booking.hotel.country}
Nightly rate: - ${status.value} -
- - - - -
- - - - -
- - - - - - - -
- - - - -
- - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - -
-   -   -
-
- diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/messages.properties b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/messages.properties deleted file mode 100644 index 3d15709e..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/messages.properties +++ /dev/null @@ -1,16 +0,0 @@ -booking.checkinDate.NotNull=The check in date is required -booking.checkinDate.Future=The check in date must be in the future -booking.checkinDate.beforeToday=The check in date must be a future date -booking.checkinDate.typeMismatch=The check in date must be in the format mm-dd-yyyy - -booking.checkoutDate.Future=The check out date must be in the future -booking.checkoutDate.NotNull=The check out date is required -booking.checkoutDate.typeMismatch=The check out date must be in the format mm-dd-yyyy -booking.BookingDateRange=The check out date must be later than the check in date - -booking.creditCard.NotEmpty=The credit card must be a valid 16 digit number -booking.creditCardName.NotEmpty=The name on the credit card is required - -NotEmpty=The {0} field is required -NotNull=The {0} field is required -Future=The {0} date must be in the future \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp deleted file mode 100644 index d95fbaa2..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/booking/reviewBooking.jsp +++ /dev/null @@ -1,65 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -

Confirm Hotel Booking

- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Name:${booking.hotel.name}
Address:${booking.hotel.address}
City, State:${booking.hotel.city}, ${booking.hotel.state}
Zip:${booking.hotel.zip}
Country:${booking.hotel.country}
Total payment: - ${status.value} -
Check In Date: - ${status.value} -
Check Out Date: - ${status.value} -
Credit Card #:${booking.creditCard}
-   -   -   -
-
- diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp deleted file mode 100644 index 84bc87a2..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.jsp +++ /dev/null @@ -1,64 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - - - - - -

Search Hotels

- - - -
- - - - - - - - - -
- - -

Current Hotel Bookings

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameAddressCity, StateCheck in DateCheck out DateConfirmation NumberAction
${booking.hotel.name}${booking.hotel.address}${booking.hotel.city}, ${booking.hotel.state}${booking.checkinDate}${booking.checkoutDate}${booking.id} - - - - - - Cancel -
No booking history
diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/main.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/main.xml deleted file mode 100644 index fbd0607c..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/main.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp deleted file mode 100644 index a617049f..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotel.jsp +++ /dev/null @@ -1,53 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -

View Hotel

- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Name:${hotel.name}
Address:${hotel.address}
City:${hotel.city}
State:${hotel.state}
Zip:${hotel.zip}
Country:${hotel.country}
Nightly rate: - ${status.value} -
-   -   -
-
- diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp deleted file mode 100644 index b760e99c..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/main/reviewHotels.jsp +++ /dev/null @@ -1,63 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0"%> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> - -

Hotel Results

- - - - - -Change Search - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameAddressCity, StateZipAction
${hotel.name}${hotel.address}${hotel.city}, ${hotel.state}, ${hotel.country}${hotel.zip} - - - - - - View Hotel -
No hotels found
- - - - - - - Previous Results - - - - - - - More Results - - diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/view/intro.jsp b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/view/intro.jsp deleted file mode 100644 index 1fe0053f..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/view/intro.jsp +++ /dev/null @@ -1,28 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0"%> - -

Welcome to Spring Travel

-

- This reference application shows how to use Spring MVC and Web Flow together with JavaServerPages (JSP) in a portlet. -

-

- The key features illustrated in this sample include: -

-
    -
  • A declarative navigation model enabling full browser button support and dynamic navigation rules
    • -
  • A fine-grained state management model, including support for ConversationScope and ViewScope
    • -
  • Managed persistence contexts with the Java Persistence API (JPA)
    • -
  • Unified Expression Language (EL) integration
    • -
  • Declarative page authoring with JSP, JSTL, and Spring MVC's form tag library -
  • Exception handling support across all layers of the application
    • -
  • Spring IDE tooling integration, with support for graphical flow modeling and visualization
    • -
-

- - - - - - Start your Spring Travel experience - -

diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/view/view.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/view/view.xml deleted file mode 100644 index 71d0044f..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/flows/view/view.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml deleted file mode 100644 index c3fcc9fd..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/portlet.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - swf-booking-mvc - Spring Webflow Booking MVC - - - org.springframework.web.portlet.DispatcherPortlet - - - - contextConfigLocation - - /WEB-INF/config/hotelbooking-portlet-config.xml - - - - - viewRendererUrl - /WEB-INF/servlet/view - - - 0 - - - text/html - view - - - - Spring Webflow Booking MVC - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 2c908546..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - contextConfigLocation - - /WEB-INF/config/application-config.xml - - - - - - org.springframework.web.context.ContextLoaderListener - - - - - ViewRendererServlet - org.springframework.web.servlet.ViewRendererServlet - - - - ViewRendererServlet - /WEB-INF/servlet/view - - - - - swf-booking-mvc - org.apache.pluto.container.driver.PortletServlet - - portlet-name - swf-booking-mvc - - 1 - - - - swf-booking-mvc - /PlutoInvoker/swf-booking-mvc - - - \ No newline at end of file diff --git a/spring-webflow-samples/booking-portlet-mvc/src/test/java/.gitignore b/spring-webflow-samples/booking-portlet-mvc/src/test/java/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/spring-webflow-samples/booking-portlet-mvc/src/test/resources/log4j.properties b/spring-webflow-samples/booking-portlet-mvc/src/test/resources/log4j.properties deleted file mode 100644 index 5ba9222c..00000000 --- a/spring-webflow-samples/booking-portlet-mvc/src/test/resources/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -log4j.rootCategory=WARN, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n - -# Enable web flow logging -log4j.category.org.springframework.webflow=DEBUG -log4j.category.org.springframework.binding=DEBUG \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow b/spring-webflow-samples/jsf-booking/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow deleted file mode 100644 index d95db370..00000000 --- a/spring-webflow-samples/jsf-booking/.metadata/src/main/webapp/WEB-INF/faces-config.pageflow +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/spring-webflow-samples/jsf-booking/.project b/spring-webflow-samples/jsf-booking/.project deleted file mode 100644 index 16236f1b..00000000 --- a/spring-webflow-samples/jsf-booking/.project +++ /dev/null @@ -1,22 +0,0 @@ - - jsf-booking - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - - - org.eclipse.jdt.core.javabuilder - - - org.eclipse.wst.common.project.facet.core.builder - - - org.eclipse.wst.validation.validationbuilder - - - - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/build.xml b/spring-webflow-samples/jsf-booking/build.xml deleted file mode 100644 index d48f90c3..00000000 --- a/spring-webflow-samples/jsf-booking/build.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/spring-webflow-samples/jsf-booking/pom.xml b/spring-webflow-samples/jsf-booking/pom.xml deleted file mode 100644 index b09cbdf9..00000000 --- a/spring-webflow-samples/jsf-booking/pom.xml +++ /dev/null @@ -1,175 +0,0 @@ - - - 4.0.0 - org.springframework.webflow.samples - jsf-booking - war - Hotel Booking : Spring Framework + JSF - 2.3.3.BUILD-SNAPSHOT - - 3.2.1.RELEASE - 1.5.10 - 2.1.7 - - - - - org.springframework - spring-context - ${org.springframework-version} - - - - commons-logging - commons-logging - - - - - org.springframework - spring-jdbc - ${org.springframework-version} - - - org.springframework - spring-orm - ${org.springframework-version} - - - org.springframework - spring-web - ${org.springframework-version} - - - - org.hsqldb - hsqldb - 1.8.0.10 - runtime - - - org.hibernate - hibernate-entitymanager - 3.5.0-Final - - - - com.sun.faces - jsf-api - ${jsf-version} - - - com.sun.faces - jsf-impl - ${jsf-version} - - - - org.slf4j - slf4j-api - ${org.slf4j-version} - - - org.slf4j - jcl-over-slf4j - ${org.slf4j-version} - - - org.slf4j - slf4j-log4j12 - ${org.slf4j-version} - runtime - - - log4j - log4j - 1.2.15 - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - runtime - - - - javax.servlet - servlet-api - 2.5 - provided - - - - org.easymock - easymock - 2.5.2 - test - - - junit - junit - 3.8.2 - test - - - org.springframework - spring-test - ${org.springframework-version} - test - - - - - spring-repository - Spring project snapshots, milestones, and releases - http://repo.springsource.org/snapshot - - - - jsf-booking - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-surefire-plugin - - junit:junit - - **/*Tests.java - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - true - false - 2.0 - - - - - diff --git a/spring-webflow-samples/jsf-booking/readme.txt b/spring-webflow-samples/jsf-booking/readme.txt deleted file mode 100644 index f7643b49..00000000 --- a/spring-webflow-samples/jsf-booking/readme.txt +++ /dev/null @@ -1,4 +0,0 @@ -This sample is intended to demonstrate the "JSF-centric" approach to integrating JSF and Spring. It uses the pure -JSF controller model, including JSF managed beans and navigation rules, and only utilizes Spring for the service layer. -It is provided purely as a point of comparison against the "Spring-centric" approach of using Spring Faces and the -MVC + Web Flow controller model, as demonstrated in the "booking-faces" sample project. \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/faces/support/RequestLoggingPhaseListener.java b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/faces/support/RequestLoggingPhaseListener.java deleted file mode 100644 index 6a87eff2..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/faces/support/RequestLoggingPhaseListener.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2004-2008 the original authorimport javax.faces.event.PhaseEvent; -import javax.faces.event.PhaseId; -import javax.faces.event.PhaseListener; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - * 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. - */ -package org.springframework.faces.support; - -import javax.faces.event.PhaseEvent; -import javax.faces.event.PhaseId; -import javax.faces.event.PhaseListener; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * {@link PhaseListener} that logs the execution of the individual phases of the JSF lifecycle. Useful during JSF - * application development in order to detect unreported JSF errors that cause the lifecycle to short-circuit. Turn - * logging level to DEBUG to see its output. - * - * @author Jeremy Grelle - */ -public class RequestLoggingPhaseListener implements PhaseListener { - - private Log logger = LogFactory.getLog(RequestLoggingPhaseListener.class); - - public void afterPhase(PhaseEvent event) { - // no-op - } - - public void beforePhase(PhaseEvent event) { - if (logger.isDebugEnabled()) { - logger.debug("Entering JSF Phase: " + event.getPhaseId()); - } - } - - public PhaseId getPhaseId() { - return PhaseId.ANY_PHASE; - } - -} diff --git a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/Booking.java b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/Booking.java deleted file mode 100644 index 80851349..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/Booking.java +++ /dev/null @@ -1,179 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.text.DateFormat; -import java.util.Calendar; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; - -/** - * A Hotel Booking made by a User. - */ -@Entity -public class Booking implements Serializable { - - private static final long serialVersionUID = 1171567558348174963L; - - private Long id; - - private User user; - - private Hotel hotel; - - private Date checkinDate; - - private Date checkoutDate; - - private String creditCard; - - private String creditCardName; - - private int creditCardExpiryMonth; - - private int creditCardExpiryYear; - - private boolean smoking; - - private int beds; - - public Booking() { - } - - public Booking(Hotel hotel, User user) { - this.hotel = hotel; - this.user = user; - Calendar calendar = Calendar.getInstance(); - setCheckinDate(calendar.getTime()); - calendar.add(Calendar.DAY_OF_MONTH, 1); - setCheckoutDate(calendar.getTime()); - } - - @Transient - public BigDecimal getTotal() { - return hotel.getPrice().multiply(new BigDecimal(getNights())); - } - - @Transient - public int getNights() { - return (int) (checkoutDate.getTime() - checkinDate.getTime()) / 1000 / 60 / 60 / 24; - } - - @Id - @GeneratedValue(strategy = GenerationType.TABLE) - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - @Basic - @Temporal(TemporalType.DATE) - public Date getCheckinDate() { - return checkinDate; - } - - public void setCheckinDate(Date datetime) { - this.checkinDate = datetime; - } - - @ManyToOne - public Hotel getHotel() { - return hotel; - } - - public void setHotel(Hotel hotel) { - this.hotel = hotel; - } - - @ManyToOne - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - - @Basic - @Temporal(TemporalType.DATE) - public Date getCheckoutDate() { - return checkoutDate; - } - - public void setCheckoutDate(Date checkoutDate) { - this.checkoutDate = checkoutDate; - } - - public String getCreditCard() { - return creditCard; - } - - public void setCreditCard(String creditCard) { - this.creditCard = creditCard; - } - - @Transient - public String getDescription() { - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM); - return hotel == null ? null : hotel.getName() + ", " + df.format(getCheckinDate()) + " to " - + df.format(getCheckoutDate()); - } - - public boolean isSmoking() { - return smoking; - } - - public void setSmoking(boolean smoking) { - this.smoking = smoking; - } - - public int getBeds() { - return beds; - } - - public void setBeds(int beds) { - this.beds = beds; - } - - public String getCreditCardName() { - return creditCardName; - } - - public void setCreditCardName(String creditCardName) { - this.creditCardName = creditCardName; - } - - public int getCreditCardExpiryMonth() { - return creditCardExpiryMonth; - } - - public void setCreditCardExpiryMonth(int creditCardExpiryMonth) { - this.creditCardExpiryMonth = creditCardExpiryMonth; - } - - public int getCreditCardExpiryYear() { - return creditCardExpiryYear; - } - - public void setCreditCardExpiryYear(int creditCardExpiryYear) { - this.creditCardExpiryYear = creditCardExpiryYear; - } - - @Override - public String toString() { - return "Booking(" + user + "," + hotel + ")"; - } - -} diff --git a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/BookingService.java b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/BookingService.java deleted file mode 100644 index 955b5a40..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/BookingService.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.util.List; - -/** - * A service interface for retrieving hotels and bookings from a backing repository. Also supports the ability to cancel - * a booking. - */ -public interface BookingService { - - /** - * Find bookings made by the given user - * @param username the user's name - * @return their bookings - */ - public List findBookings(String username); - - /** - * Find hotels available for booking by some criteria. - * @param criteria the search criteria - * @return a list of hotels meeting the criteria - */ - public List findHotels(SearchCriteria criteria); - - /** - * Find hotels by their identifier. - * @param id the hotel id - * @return the hotel - */ - public Hotel findHotelById(Long id); - - /** - * Create a new, transient hotel booking instance for the given user. - * @param hotelId the hotelId - * @param userName the user name - * @return the new transient booking instance - */ - public Booking createBooking(Long hotelId, String userName); - - /** - * Cancel an existing booking. - * @param booking the booking to cancel - */ - public void cancelBooking(Booking booking); - - /** - * Save a new booking. - * @param booking the booking to save - */ - public void saveBooking(Booking booking); - -} diff --git a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/Hotel.java b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/Hotel.java deleted file mode 100644 index 3715a98a..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/Hotel.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; -import java.math.BigDecimal; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -/** - * A hotel where users may book stays. - */ -@Entity -public class Hotel implements Serializable { - - private static final long serialVersionUID = 4011346719502656269L; - - private Long id; - - private String name; - - private String address; - - private String city; - - private String state; - - private String zip; - - private String country; - - private BigDecimal price; - - @Id - @GeneratedValue - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getZip() { - return zip; - } - - public void setZip(String zip) { - this.zip = zip; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public String getCountry() { - return country; - } - - public void setCountry(String country) { - this.country = country; - } - - @Column(precision = 6, scale = 2) - public BigDecimal getPrice() { - return price; - } - - public void setPrice(BigDecimal price) { - this.price = price; - } - - public Booking createBooking(User user) { - return new Booking(this, user); - } - - @Override - public String toString() { - return "Hotel(" + name + "," + address + "," + city + "," + zip + ")"; - } -} diff --git a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java deleted file mode 100644 index 1e11cae6..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java +++ /dev/null @@ -1,92 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - -import org.springframework.stereotype.Repository; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; - -/** - * A JPA-based implementation of the Booking Service. Delegates to a JPA entity manager to issue data access calls - * against the backing repository. The EntityManager reference is provided by the managing container (Spring) - * automatically. - */ -@Service("bookingService") -@Repository -public class JpaBookingService implements BookingService { - - private EntityManager em; - - @PersistenceContext - public void setEntityManager(EntityManager em) { - this.em = em; - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public List findBookings(String username) { - if (username != null) { - return em.createQuery("select b from Booking b where b.user.username = :username order by b.checkinDate") - .setParameter("username", username).getResultList(); - } else { - return null; - } - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public List findHotels(SearchCriteria criteria) { - String pattern = getSearchPattern(criteria); - return em.createQuery( - "select h from Hotel h where lower(h.name) like " + pattern + " or lower(h.city) like " + pattern - + " or lower(h.zip) like " + pattern + " or lower(h.address) like " + pattern).setMaxResults( - criteria.getPageSize()).setFirstResult(criteria.getPage() * criteria.getPageSize()).getResultList(); - } - - @Transactional(readOnly = true) - public Hotel findHotelById(Long id) { - return em.find(Hotel.class, id); - } - - @Transactional(readOnly = true) - public Booking createBooking(Long hotelId, String username) { - Hotel hotel = em.find(Hotel.class, hotelId); - User user = findUser(username); - return new Booking(hotel, user); - } - - // read-write transactional methods - @Transactional - public void cancelBooking(Booking booking) { - booking = em.find(Booking.class, booking.getId()); - if (booking != null) { - em.remove(booking); - } - } - - // read-write transactional methods - @Transactional - public void saveBooking(Booking booking) { - em.persist(booking); - } - - // helpers - - private String getSearchPattern(SearchCriteria criteria) { - if (StringUtils.hasText(criteria.getSearchString())) { - return "'%" + criteria.getSearchString().toLowerCase().replace('*', '%') + "%'"; - } else { - return "'%'"; - } - } - - private User findUser(String username) { - return (User) em.createQuery("select u from User u where u.username = :username").setParameter("username", - username).getSingleResult(); - } - -} \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/ReferenceData.java b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/ReferenceData.java deleted file mode 100644 index 4c499aaf..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/ReferenceData.java +++ /dev/null @@ -1,83 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.util.ArrayList; -import java.util.List; - -import javax.faces.model.SelectItem; - -import org.springframework.stereotype.Service; - -@Service -public class ReferenceData { - - private List bedOptions; - - private List smokingOptions; - - private List creditCardExpMonths; - - private List creditCardExpYears; - - private List pageSizeOptions; - - public List getBedOptions() { - if (bedOptions == null) { - bedOptions = new ArrayList(); - bedOptions.add(new SelectItem(new Integer(1), "One king-size bed")); - bedOptions.add(new SelectItem(new Integer(2), "Two double beds")); - bedOptions.add(new SelectItem(new Integer(3), "Three beds")); - } - return bedOptions; - } - - public List getSmokingOptions() { - if (smokingOptions == null) { - smokingOptions = new ArrayList(); - smokingOptions.add(new SelectItem(Boolean.TRUE, "Smoking")); - smokingOptions.add(new SelectItem(Boolean.FALSE, "Non-Smoking")); - } - return smokingOptions; - } - - public List getCreditCardExpMonths() { - if (creditCardExpMonths == null) { - creditCardExpMonths = new ArrayList(); - creditCardExpMonths.add(new SelectItem(new Integer(1), "Jan")); - creditCardExpMonths.add(new SelectItem(new Integer(2), "Feb")); - creditCardExpMonths.add(new SelectItem(new Integer(3), "Mar")); - creditCardExpMonths.add(new SelectItem(new Integer(4), "Apr")); - creditCardExpMonths.add(new SelectItem(new Integer(5), "May")); - creditCardExpMonths.add(new SelectItem(new Integer(6), "Jun")); - creditCardExpMonths.add(new SelectItem(new Integer(7), "Jul")); - creditCardExpMonths.add(new SelectItem(new Integer(8), "Aug")); - creditCardExpMonths.add(new SelectItem(new Integer(9), "Sep")); - creditCardExpMonths.add(new SelectItem(new Integer(10), "Oct")); - creditCardExpMonths.add(new SelectItem(new Integer(11), "Nov")); - creditCardExpMonths.add(new SelectItem(new Integer(12), "Dec")); - } - return creditCardExpMonths; - } - - public List getCreditCardExpYears() { - if (creditCardExpYears == null) { - creditCardExpYears = new ArrayList(); - creditCardExpYears.add(new SelectItem(new Integer(2008), "2008")); - creditCardExpYears.add(new SelectItem(new Integer(2009), "2009")); - creditCardExpYears.add(new SelectItem(new Integer(2010), "2010")); - creditCardExpYears.add(new SelectItem(new Integer(2010), "2011")); - creditCardExpYears.add(new SelectItem(new Integer(2010), "2012")); - } - return creditCardExpYears; - } - - public List getPageSizeOptions() { - if (pageSizeOptions == null) { - pageSizeOptions = new ArrayList(); - pageSizeOptions.add(new SelectItem(new Integer(5), "5")); - pageSizeOptions.add(new SelectItem(new Integer(10), "10")); - pageSizeOptions.add(new SelectItem(new Integer(20), "20")); - } - return pageSizeOptions; - } - -} diff --git a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java deleted file mode 100644 index 0a1b92dc..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; - -/** - * A backing bean for the main hotel search form. Encapsulates the criteria needed to perform a hotel search. - */ -public class SearchCriteria implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * The user-provided search criteria for finding Hotels. - */ - private String searchString = ""; - - /** - * The maximum page size of the Hotel result list - */ - private int pageSize = 5; - - /** - * The current page of the Hotel result list. - */ - private int page; - - public String getSearchString() { - return searchString; - } - - public void setSearchString(String searchString) { - this.searchString = searchString; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public int getPage() { - return page; - } - - public void setPage(int page) { - this.page = page; - } - - public void nextPage() { - page++; - } - - public void previousPage() { - page--; - } - - public void resetPage() { - page = 0; - } - - public String toString() { - return "[Search Criteria searchString = '" + searchString + "'"; - } -} \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/User.java b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/User.java deleted file mode 100644 index 494e9ddd..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/User.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.springframework.webflow.samples.booking; - -import java.io.Serializable; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -/** - * A user who can book hotels. - */ -@Entity -@Table(name = "Customer") -public class User implements Serializable { - - private static final long serialVersionUID = -3652559447682574722L; - - private String username; - - private String password; - - private String name; - - public User() { - } - - public User(String username, String password, String name) { - this.username = username; - this.password = password; - this.name = name; - } - - @Id - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public String toString() { - return "User(" + username + ")"; - } -} diff --git a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/jsf/BookingController.java b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/jsf/BookingController.java deleted file mode 100644 index 4bd4081e..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/jsf/BookingController.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.springframework.webflow.samples.booking.jsf; - -import java.util.Calendar; - -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ManagedProperty; -import javax.faces.bean.RequestScoped; -import javax.faces.context.FacesContext; - -import org.springframework.webflow.samples.booking.Booking; -import org.springframework.webflow.samples.booking.BookingService; -import org.springframework.webflow.samples.booking.Hotel; - -@ManagedBean -@RequestScoped -public class BookingController { - - @ManagedProperty("#{bookingService}") - private BookingService bookingService; - - @ManagedProperty("#{hotelController.hotelId}") - private Long hotelId; - - @ManagedProperty("#{booking}") - private Booking booking; - - private Hotel hotel = new Hotel(); - - private boolean initialized = false; - - public void setBookingService(BookingService bookingService) { - this.bookingService = bookingService; - } - - public Long getHotelId() { - return hotelId; - } - - public void setHotelId(Long hotelId) { - if (hotelId != null && hotelId != 0 && !initialized) { - // put booking in session - booking = bookingService.createBooking(hotelId, getCurrentUser()); - FacesContext.getCurrentInstance().getExternalContext().getSessionMap().put("booking", booking); - initialized = true; - } - this.hotelId = hotelId; - } - - public Booking getBooking() { - return booking; - } - - public void setBooking(Booking booking) { - this.booking = booking; - } - - public Hotel getHotel() { - return hotel; - } - - public void setHotel(Hotel hotel) { - this.hotel = hotel; - } - - public String processBooking() { - FacesContext context = FacesContext.getCurrentInstance(); - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.DAY_OF_MONTH, -1); - boolean valid = true; - if (booking.getCheckinDate().before(calendar.getTime())) { - context.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, - "Check in date must be a future date.", "Check in date must be a future date.")); - valid = false; - } else if (!booking.getCheckinDate().before(booking.getCheckoutDate())) { - context.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_ERROR, - "Check out date must be later than check in date", - "Check out date must be later than check in date")); - valid = false; - } - if (valid) { - return "reviewBooking"; - } else { - return null; - } - } - - public String confirm() { - bookingService.saveBooking(booking); - removeBookingFromSession(); - return "confirm"; - } - - public String cancel() { - removeBookingFromSession(); - return "cancel"; - } - - private String getCurrentUser() { - return "jeremy"; - } - - private void removeBookingFromSession() { - FacesContext.getCurrentInstance().getExternalContext().getSessionMap().remove("booking"); - } - -} diff --git a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/jsf/HotelController.java b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/jsf/HotelController.java deleted file mode 100644 index 64392dc1..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/jsf/HotelController.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.springframework.webflow.samples.booking.jsf; - -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ManagedProperty; -import javax.faces.bean.RequestScoped; - -import org.springframework.webflow.samples.booking.BookingService; -import org.springframework.webflow.samples.booking.Hotel; - -@ManagedBean -@RequestScoped -public class HotelController { - - @ManagedProperty("#{bookingService}") - private BookingService bookingService; - - @ManagedProperty("#{param.id}") - private Long hotelId; - - private Hotel hotel; - - public void setBookingService(BookingService bookingService) { - this.bookingService = bookingService; - } - - public void setHotelId(Long hotelId) { - this.hotelId = hotelId; - } - - public Hotel getHotel() { - if (hotel == null && hotelId != null) { - hotel = bookingService.findHotelById(hotelId); - } - return hotel; - } - - public Long getHotelId() { - return hotelId; - } - -} diff --git a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/jsf/SearchController.java b/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/jsf/SearchController.java deleted file mode 100644 index 23617fb1..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/java/org/springframework/webflow/samples/booking/jsf/SearchController.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.springframework.webflow.samples.booking.jsf; - -import java.util.List; - -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ManagedProperty; -import javax.faces.bean.RequestScoped; -import javax.faces.event.ActionEvent; -import javax.faces.model.DataModel; -import javax.faces.model.ListDataModel; - -import org.springframework.webflow.samples.booking.Booking; -import org.springframework.webflow.samples.booking.BookingService; -import org.springframework.webflow.samples.booking.SearchCriteria; - -@ManagedBean -@RequestScoped -public class SearchController { - - private SearchCriteria searchCriteria; - - private DataModel bookings; - - private DataModel hotels; - - @ManagedProperty("#{bookingService}") - private BookingService bookingService; - - public void setBookingService(BookingService bookingService) { - this.bookingService = bookingService; - } - - public SearchCriteria getSearchCriteria() { - if (searchCriteria == null) { - searchCriteria = new SearchCriteria(); - } - return searchCriteria; - } - - public DataModel getBookings() { - if (bookings == null) { - // load the current user's bookings from the database - bookings = new ListDataModel(bookingService.findBookings(getCurrentUser())); - } - return bookings; - } - - public DataModel getHotels() { - return hotels; - } - - // from enterSearchCriteria.xhtml - - public String search() { - searchCriteria.resetPage(); - executeSearch(); - return "reviewHotels"; - } - - public void cancelBookingListener(ActionEvent event) { - Booking booking = (Booking) bookings.getRowData(); - bookingService.cancelBooking(booking); - ((List) bookings.getWrappedData()).remove(booking); - } - - // from reviewHotels.xhtml - - public void nextListener(ActionEvent event) { - searchCriteria.nextPage(); - executeSearch(); - } - - public void prevListener(ActionEvent event) { - searchCriteria.previousPage(); - executeSearch(); - } - - // internal helpers - - private void executeSearch() { - hotels = new ListDataModel(); - hotels.setWrappedData(bookingService.findHotels(searchCriteria)); - } - - private String getCurrentUser() { - return "jeremy"; - } - -} diff --git a/spring-webflow-samples/jsf-booking/src/main/resources/META-INF/persistence.xml b/spring-webflow-samples/jsf-booking/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index f4e3d6a7..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - org.hibernate.ejb.HibernatePersistence - org.springframework.webflow.samples.booking.User - org.springframework.webflow.samples.booking.Booking - org.springframework.webflow.samples.booking.Hotel - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/resources/import.sql b/spring-webflow-samples/jsf-booking/src/main/resources/import.sql deleted file mode 100644 index 9a7ed4a9..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/resources/import.sql +++ /dev/null @@ -1,27 +0,0 @@ -insert into Customer (username, name) values ('keith', 'Keith') -insert into Customer (username, name) values ('erwin', 'Erwin') -insert into Customer (username, name) values ('jeremy', 'Jeremy') -insert into Customer (username, name) values ('scott', 'Scott') -insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 199, 'Westin Diplomat', '3555 S. Ocean Drive', 'Hollywood', 'FL', '33019', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 60, 'Jameson Inn', '890 Palm Bay Rd NE', 'Palm Bay', 'FL', '32905', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 199, 'Chilworth Manor', 'The Cottage, Southampton Business Park', 'Southampton', 'Hants', 'SO16 7JF', 'UK') -insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (7, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 130, 'Hotel Beaulac', ' Esplanade Léopold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (22, 250, 'Meliá White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (23, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/resources/log4j.xml b/spring-webflow-samples/jsf-booking/src/main/resources/log4j.xml deleted file mode 100644 index f88f08cb..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/resources/log4j.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/META-INF/MANIFEST.MF b/spring-webflow-samples/jsf-booking/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/classes/log4j.properties b/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/classes/log4j.properties deleted file mode 100644 index 992d816d..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,11 +0,0 @@ -log4j.rootCategory=INFO, stdout - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n - -# Enable web flow logging -log4j.category.org.springframework.webflow=DEBUG -log4j.category.org.springframework.faces=DEBUG -log4j.category.org.springframework.binding=DEBUG -log4j.category.org.springframework.transaction=DEBUG \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/faces-config.xml b/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/faces-config.xml deleted file mode 100644 index e01318c3..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/faces-config.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - org.springframework.web.jsf.SpringBeanVariableResolver - - - - /main/reviewHotel.xhtml - - book - /booking/enterBookingDetails.xhtml - - - - - /booking/reviewBooking.xhtml - - revise - /booking/enterBookingDetails.xhtml - - - confirm - /main/enterSearchCriteria.xhtml - - - - - - cancel - /main/enterSearchCriteria.xhtml - - - - - org.springframework.faces.support.RequestLoggingPhaseListener - - - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/layouts/standard.xhtml b/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/layouts/standard.xhtml deleted file mode 100644 index 3d213db3..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/layouts/standard.xhtml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - JSF and Spring Hotel Booking Sample Application - - - - - - - - - - -
- -
-
- - - - - - -

-

-
-
- -
-
- -
- - - - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/web-application-config.xml b/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/web-application-config.xml deleted file mode 100644 index 75264585..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/web-application-config.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 0bd2b02b..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - contextConfigLocation - - /WEB-INF/web-application-config.xml - - - - - - javax.faces.DEFAULT_SUFFIX - .xhtml - - - - - javax.faces.PROJECT_STAGE - Development - - - - - javax.faces.FACELETS_REFRESH_PERIOD - 1 - - - - - org.springframework.web.context.ContextLoaderListener - - - - - Faces Servlet - javax.faces.webapp.FacesServlet - 1 - - - - - Faces Servlet - *.faces - - - - index.html - - - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/booking/enterBookingDetails.xhtml b/spring-webflow-samples/jsf-booking/src/main/webapp/booking/enterBookingDetails.xhtml deleted file mode 100644 index e84464e1..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/booking/enterBookingDetails.xhtml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - -
-

Book Hotel

- - -
-
-
Name:
-
#{bookingController.booking.hotel.name}
-
-
-
Address:
-
#{bookingController.booking.hotel.address}
-
-
-
City, State:
-
#{bookingController.booking.hotel.city}, #{bookingController.booking.hotel.state}
-
-
-
Zip:
-
#{bookingController.booking.hotel.zip}
-
-
-
Country:
-
#{bookingController.booking.hotel.country}
-
-
-
Nightly rate:
-
- - - -
-
-
-
- Check In Date: -
-
- - - -
-
-
-
- Check Out Date: -
-
- - - -
-
-
-
- Room Preference: -
-
- - - -
-
-
-
- Smoking Preference: -
-
- - - -
-
-
-
- Credit Card #: -
-
- -
-
-
-
- Credit Card Name: -
-
- -
-
-
-
- Expiration Date: -
-
- - - - - - -
-
-
-   - -
-
- -
- - - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/booking/reviewBooking.xhtml b/spring-webflow-samples/jsf-booking/src/main/webapp/booking/reviewBooking.xhtml deleted file mode 100644 index d4d43235..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/booking/reviewBooking.xhtml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - -
-

Confirm Hotel Booking

-
- -
- -
-
-
Name:
-
#{booking.hotel.name}
-
-
-
Address:
-
#{booking.hotel.address}
-
-
-
City, State:
-
#{booking.hotel.city}, #{booking.hotel.state}
-
-
-
Zip:
-
#{booking.hotel.zip}
-
-
-
Country:
-
#{booking.hotel.country}
-
-
-
Total payment:
-
- - - -
-
-
-
Check In Date:
-
- - - -
-
-
-
Check Out Date:
-
- - - -
-
-
-
Credit Card #:
-
#{booking.creditCard}
-
-
-   -   - -
-
- -
- - - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/forms.css b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/forms.css deleted file mode 100644 index f92b8058..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/forms.css +++ /dev/null @@ -1,100 +0,0 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ - -/* FORM ELEMENTS */ - form { - margin:0; - padding:0; - } - form div, - form p { - font-size: 1em; - margin: 0 0 1em 0; - padding: 0; - } - label { - font-weight: bold; - } - fieldset { - border: 1px solid #eee; - padding: 5px 10px; - margin: 0 0 1.5em 0; - } - fieldset legend { - color: #666; - font-size: 1.1em; - font-weight: bold; - margin: 0 0 0 0px; - padding: 0; - background-color: white; - } - * html fieldset legend { - margin: 0 0 10px -10px; - } - fieldset ul { - list-style: none; - margin: 0 0 1.5em 0; - padding: 0; - } - fieldset ul li { - list-style: none; - margin: 0 0 0.5em 0; - padding: 0; - } - - - input, select, textarea { - font-size:1em; - font-family: arial, helvetica, verdana, sans-serif; - - margin: 0; - padding: 2px; - } - - input, select { - vertical-align:middle; - } - textarea { - width: 200px; - height: 8em; - } - - input.check { - border: none; - width: auto; - height: auto; - margin: 0; - } - input.radio { - border: none; - width: auto; - height: auto; - margin: 0; - } - input.file { - height: auto; - width: 250px; - } - input.readonly { - background-color: transparent; - border: none; - } - input.button { - width: 10em; - border:1px solid black; - background-color: #ddd; - } - input.image { - border: none; - width: auto; - height: auto; - } - - form div.submit { - margin: 1em 0; - } - form div.submit input { - height: 2em; - width: 15em; - } -/* END FORM ELEMENTS */ - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-1col.css b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-1col.css deleted file mode 100644 index 0215f837..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-1col.css +++ /dev/null @@ -1,27 +0,0 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ - -@import url("nav-horizontal.css"); - -/* NAV BAR AT THE TOP AND ONE COLUMN OF CONTENT */ - div#content { - position: relative; - width: 701px; - - margin: 0 auto 20px auto; - padding: 0; - - text-align: left; - } - div#main { - width: 100%; - } - div#local { - display: none; - } - div#sub { - display: none; - } - div#nav { - display: none; - } -/* END CONTENT */ \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navleft-1col.css b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navleft-1col.css deleted file mode 100644 index 1d596bf8..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navleft-1col.css +++ /dev/null @@ -1,31 +0,0 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ - -@import url("nav-vertical.css"); - -/* NAV BAR ON THE LEFT AND ONE COLUMN OF CONTENT */ - div#content { - position: relative; - width: 780px; - - margin: 0 auto 20px auto; - padding: 0; - - text-align: left; - } - div#main { - float: right; - width: 560px; - display: inline; - } - div#local { - display: none; - } - div#sub { - display: none; - } - div#nav { - float: left; - width: 200px; - display: inline; - } -/* END CONTENT */ \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navleft-2col.css b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navleft-2col.css deleted file mode 100644 index 5cba5628..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navleft-2col.css +++ /dev/null @@ -1,39 +0,0 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ - -@import url("nav-vertical.css"); - -/* NAV BAR ON THE LEFT AND TWO COLUMNS OF CONTENT */ - div#content { - position: relative; - width: 780px; - - margin: 0 auto 20px auto; - padding: 0; - - text-align: left; - } - div#main { - float: right; - width: 340px; - display: inline; - - margin-right: 220px; - margin-left: -220px; - } - div#local { - display: none; - } - div#sub { - float: right; - width: 200px; - display: inline; - - margin-right: -340px; - margin-left: 200px; - } - div#nav { - float: left; - width: 200px; - display: inline; - } -/* END CONTENT */ \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-1col.css b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-1col.css deleted file mode 100644 index ef413731..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-1col.css +++ /dev/null @@ -1,32 +0,0 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ - -@import url("nav-horizontal.css"); - -/* NAV BAR AT THE TOP AND ONE COLUMN OF CONTENT */ - div#content { - position: relative; - width: 701px; - - margin: 0 auto 20px auto; - padding: 0; - - text-align: left; - } - div#main { - width: 100%; - } - div#local { - width: 100%; - } - div#sub { - width: 100%; - } - div#nav { - position: absolute; - top: -15px; - left: 0; - width: 100%; - - text-align: left; - } -/* END CONTENT */ \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-3col.css b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-3col.css deleted file mode 100644 index 352af577..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-3col.css +++ /dev/null @@ -1,43 +0,0 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ - -@import url("nav-horizontal.css"); - -/* NAV BAR AT THE TOP, LOCAL NAV ON THE LEFT AND TWO COLUMNS OF CONTENT */ - div#content { - position: relative; - width: 701px; - - margin: 0 auto 20px auto; - padding: 0; - - text-align: left; - } - div#main { - float: left; - width: 300px; - display: inline; - - margin-right: -200px; - margin-left: 200px; - } - div#sub { - float: right; - width: 180px; - display: inline; - } - div#local { - float: left; - width: 180px; - display: inline; - - margin-left: -300px; - } - div#nav { - position: absolute; - top: -15px; - left: 0; - width: 701px; - - text-align: left; - } -/* END CONTENT */ \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-localleft.css b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-localleft.css deleted file mode 100644 index a63a7c01..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-localleft.css +++ /dev/null @@ -1,36 +0,0 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ - -@import url("nav-horizontal.css"); - -/* NAV BAR AT THE TOP, LOCAL NAVIGATION ON THE LEFT AND ONE COLUMN OF CONTENT */ - div#content { - position: relative; - width: 701px; - - margin: 0 auto 20px auto; - padding: 0; - - text-align: left; - } - div#main { - float: right; - width: 500px; - display: inline; - } - div#local { - float: left; - width: 200px; - display: inline; - } - div#sub { - display: none; - } - div#nav { - position: absolute; - top: -15px; - left: 0; - width: 100%; - - text-align: left; - } -/* END CONTENT */ \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-subright.css b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-subright.css deleted file mode 100644 index 7f219a4b..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout-navtop-subright.css +++ /dev/null @@ -1,36 +0,0 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ - -@import url("nav-horizontal.css"); - -/* NAV BAR AT THE TOP AND TWO COLUMNS OF CONTENT */ - div#content { - position: relative; - width: 701px; - - margin: 0 auto 20px auto; - padding: 0; - - text-align: left; - } - div#main { - float: left; - width: 480px; - display: inline; - } - div#sub { - float: right; - width: 200px; - display: inline; - } - div#local { - display: none; - } - div#nav { - position: absolute; - top: -15px; - left: 0; - width: 100%; - - text-align: left; - } -/* END CONTENT */ \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout.css b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout.css deleted file mode 100644 index 57958b5d..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/layout.css +++ /dev/null @@ -1,125 +0,0 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ - -/* SITE SPECIFIC LAYOUT */ - body { - margin: 0; - padding: 0; - - background: white; - - text-align: center; - } - div#page { - width: 780px; - - margin: 0 auto; - padding: 0; - - background: white; - text-align: center; - } - - /* HEADER */ - div#header { - margin: 0 0 5em 0; - padding: 40px 20px; - - color: white; - background: black; - - text-align: left; - } - div#branding { - float: left; - width: 40%; - - margin: 0; - padding: 10px 0 10px 20px; - - text-align: left; - } - div#search { - float: right; - width: 49%; - - margin: 0; - padding: 16px 20px 0 0; - - text-align: right; - } - /* END HEADER */ - - - /* CONTENT */ - div#content { - - } - - /* MAIN */ - div#main { - - } - /* END MAIN */ - - /* SUB */ - div#sub { - - } - /* END SUB */ - - /* END CONTENT */ - - - /* FOOTER */ - div#footer { - color: white; - background-color: black; - } - div#footer p { - font-size: 0.8em; - - margin: 0; - padding: 15px; - } - /* END FOOTER */ -/* END LAYOUT */ - - - - -/* UL.SUBNAV */ - ul.subnav { - margin: 0; - padding: 0; - - font-size: 0.8em; - list-style: none; - } - ul.subnav li { - margin: 0 0 1em 0; - padding: 0; - list-style: none; - } - ul.subnav li a, - ul.subnav li a:link, - ul.subnav li a:visited, - ul.subnav li a:active { - text-decoration: none; - font-weight: bold; - color: black; - } - ul.subnav li a:hover { - text-decoration: underline; - } - ul.subnav li strong { - padding: 0 0 0 12px; - background: url("../i/subnav-highlight.gif") left top no-repeat transparent; - } - ul.subnav li strong a, - ul.subnav li strong a:link, - ul.subnav li strong a:visited, - ul.subnav li strong a:active { - color: white; - background-color: black; - } -/* END UL.SUBNAV */ diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/nav-horizontal.css b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/nav-horizontal.css deleted file mode 100644 index 8a8e3196..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/nav-horizontal.css +++ /dev/null @@ -1,80 +0,0 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ - -/* NAV */ - div#nav { - font-size: 0.8em; - } - * html div#nav { - /* hide ie/mac \*/ - height: 1%; - /* end hide */ - } - div#nav div.wrapper { - position: absolute; - left: 0; - bottom: 0; - width: 100%; - } - div#nav ul { - width: auto; - width: 100%; - - margin: 0; - padding: 0; - - line-height: 1em; - list-style: none; - } - div#nav li { - float: left; - display: inline; - - list-style: none; - - margin: 0; - padding: 0; - - line-height: 1em; - border-right: 1px solid #aaa; - } - div#nav li.last { - border-right: none; - } - div#nav a, - div#nav a:link, - div#nav a:active, - div#nav a:visited { - display: inline-block; - /* hide from ie/mac \*/ - display: block; - /* end hide */ - font-weight: bold; - text-decoration: none; - - margin: 0; - padding: 5px 38px 5px 38px; - - color: black; - background: #ddd; - } - div#nav a:hover { - text-decoration: underline; - } - div#nav strong { - display: inline-block; - /* hide from ie/mac \*/ - display: block; - /* end hide */ - - color: white; - background: black; - } - div#nav strong a, - div#nav strong a:link, - div#nav strong a:active, - div#nav strong a:visited, - div#nav strong a:hover { - color: white; - background-color: black; - } -/* END NAV */ \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/nav-vertical.css b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/nav-vertical.css deleted file mode 100644 index 1f57bd25..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/nav-vertical.css +++ /dev/null @@ -1,79 +0,0 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ - -/* NAV */ - div#nav { - font-size: 0.8em; - } - * html div#nav { - /* hide ie/mac \*/ - height: 1%; - /* end hide */ - } - div#nav div.wrapper { - width: 100%; - - background: #ddd; - } - div#nav ul { - width: auto; - width: 100%; - - margin: 0; - padding: 0; - - line-height: 1em; - list-style: none; - } - div#nav li { - display: block; - - list-style: none; - - margin: 0; - padding: 0; - - line-height: 1em; - } - * html div#nav li { - /* hide ie/mac \*/ - height: 1%; - /* end hide */ - } - div#nav li.last { - - } - div#nav a, - div#nav a:link, - div#nav a:active, - div#nav a:visited { - display: block; - - font-weight: bold; - text-decoration: none; - - margin: 0; - padding: 5px 10px 5px 10px; - - color: black; - background: white; - } - div#nav a:hover { - color: white; - background: black; - text-decoration: underline; - } - div#nav strong { - display: block; - - color: white; - background: black; - } - div#nav strong a, - div#nav strong a:link, - div#nav strong a:active, - div#nav strong a:visited, - div#nav strong a:hover { - color: white; - background-color: black; - } -/* END NAV */ \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/tools.css b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/tools.css deleted file mode 100644 index 3219ebd8..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/tools.css +++ /dev/null @@ -1,68 +0,0 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ - -/* clearing */ - .stretch, - .clear { - clear:both; - height:1px; - margin:0; - padding:0; - font-size: 15px; - line-height: 1px; - } - .clearfix:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; - } - * html>body .clearfix { - display: inline-block; - width: 100%; - } - - * html .clearfix { - /* Hides from IE-mac \*/ - height: 1%; - /* End hide from IE-mac */ - } -/* end clearing */ - - -/* replace */ - .replace { - display:block; - - background-repeat: no-repeat; - background-position: left top; - background-color:transparent; - } - /* tidy these up */ - .replace * { - text-indent: -10000px; - display:block; - - background-repeat: no-repeat; - background-position: left top; - background-color:transparent; - } - .replace a { - text-indent:0; - } - .replace a span { - text-indent:-10000px; - } -/* end replace */ - - -/* accessibility */ - span.accesskey { - text-decoration:none; - } - .accessibility { - position: absolute; - top: -999em; - left: -999em; - } -/* end accessibility */ \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/typo.css b/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/typo.css deleted file mode 100644 index b159e6dc..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/css-framework/css/typo.css +++ /dev/null @@ -1,177 +0,0 @@ -/* A CSS Framework by Mike Stenhouse of Content with Style */ - -/* TYPOGRAPHY */ - body { - text-align: left; - font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; - font-size: 76%; - line-height: 1em; - color: #333; - } - div { - font-size: 1em; - } - img { - border: 0; - } - -/* LINKS */ - a, - a:link - a:active { - color: blue; - background-color: white; - text-decoration: underline; - } - a:visited { - color: purple; - background-color: transparent; - } - a:hover { - color: white; - background-color: black; - text-decoration: none; - } -/* END LINKS */ - -/* HEADINGS */ - h1 { - font-size: 2em; - line-height: 1.5em; - margin: 0 0 0.5em 0; - padding: 0; - color: black; - } - h2 { - font-size: 1.5em; - line-height: 1.5em; - margin: 0 0 0.5em 0; - padding: 0; - color: black; - } - h3 { - font-size: 1.3em; - line-height: 1.3em; - margin: 0 0 0.5em 0; - padding:0; - color: black; - } - h4 { - font-size: 1.2em; - line-height: 1.3em; - margin: 0 0 0.25em 0; - padding: 0; - color: black; - } - h5 { - font-size: 1.1em; - line-height: 1.3em; - margin: 0 0 0.25em 0; - padding: 0; - color: black; - } - h6 { - font-size: 1em; - line-height: 1.3em; - margin: 0 0 0.25em 0; - padding: 0; - color: black; - } -/* END HEADINGS */ - -/* TEXT */ - p { - font-size: 1em; - margin: 0 0 1.5em 0; - padding: 0; - line-height:1.4em; - } - blockquote { - border-left:10px solid #ddd; - margin-left:10px; - } - pre { - font-family: monospace; - font-size: 1.0em; - } - strong, b { - font-weight: bold; - } - em, i { - font-style:italic; - } - code { - font-family: "Courier New", Courier, monospace; - font-size: 1em; - white-space: pre; - } -/* END TEXT */ - -/* LISTS */ - ul { - line-height:1.4em; - margin: 0 0 1.5em 0; - padding: 0; - } - ul li { - margin: 0 0 0.25em 30px; - padding: 0; - } - ol { - font-size: 1.0em; - line-height: 1.4em; - margin: 0 0 1.5em 0; - padding: 0; - } - ol li { - font-size: 1.0em; - margin: 0 0 0.25em 30px; - padding: 0; - } - dl { - margin: 0 0 1.5em 0; - padding: 0; - line-height: 1.4em; - } - dl dt { - font-weight: bold; - margin: 0.25em 0 0.25em 0; - padding: 0; - } - dl dd { - margin: 0 0 0 30px; - padding: 0; - } -/* END LISTS */ - - -/* TABLE */ - table { - font-size: 1em; - margin: 0 0 1.5em 0; - padding: 0; - } - table caption { - font-weight: bold; - margin: 0 0 0 0; - padding: 0 0 1.5em 0; - } - th { - font-weight: bold; - text-align: left; - } - td { - font-size: 1em; - } -/* END TABLE */ - - hr { - display: none; - } - div.hr { - height: 1px; - margin: 1.5em 10px; - border-bottom: 1px dotted black; - } - -/* END TYPOGRAPHY */ \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/images/bg.gif b/spring-webflow-samples/jsf-booking/src/main/webapp/images/bg.gif deleted file mode 100644 index 013cfa6f..00000000 Binary files a/spring-webflow-samples/jsf-booking/src/main/webapp/images/bg.gif and /dev/null differ diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/images/btn.bg.gif b/spring-webflow-samples/jsf-booking/src/main/webapp/images/btn.bg.gif deleted file mode 100644 index 87256cf4..00000000 Binary files a/spring-webflow-samples/jsf-booking/src/main/webapp/images/btn.bg.gif and /dev/null differ diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/images/diplomat.jpg b/spring-webflow-samples/jsf-booking/src/main/webapp/images/diplomat.jpg deleted file mode 100644 index e1d0c9cd..00000000 Binary files a/spring-webflow-samples/jsf-booking/src/main/webapp/images/diplomat.jpg and /dev/null differ diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/images/header.jpg b/spring-webflow-samples/jsf-booking/src/main/webapp/images/header.jpg deleted file mode 100644 index 0be0d4d7..00000000 Binary files a/spring-webflow-samples/jsf-booking/src/main/webapp/images/header.jpg and /dev/null differ diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/images/input.bg.gif b/spring-webflow-samples/jsf-booking/src/main/webapp/images/input.bg.gif deleted file mode 100644 index 8ebf87e3..00000000 Binary files a/spring-webflow-samples/jsf-booking/src/main/webapp/images/input.bg.gif and /dev/null differ diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/images/powered-by-spring.png b/spring-webflow-samples/jsf-booking/src/main/webapp/images/powered-by-spring.png deleted file mode 100644 index e773b170..00000000 Binary files a/spring-webflow-samples/jsf-booking/src/main/webapp/images/powered-by-spring.png and /dev/null differ diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/images/th.bg.gif b/spring-webflow-samples/jsf-booking/src/main/webapp/images/th.bg.gif deleted file mode 100644 index 4663cf51..00000000 Binary files a/spring-webflow-samples/jsf-booking/src/main/webapp/images/th.bg.gif and /dev/null differ diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/images/tse.gif b/spring-webflow-samples/jsf-booking/src/main/webapp/images/tse.gif deleted file mode 100644 index b1fa98cf..00000000 Binary files a/spring-webflow-samples/jsf-booking/src/main/webapp/images/tse.gif and /dev/null differ diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/index.html b/spring-webflow-samples/jsf-booking/src/main/webapp/index.html deleted file mode 100644 index f3ce71ae..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/index.html +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/intro.xhtml b/spring-webflow-samples/jsf-booking/src/main/webapp/intro.xhtml deleted file mode 100644 index 256a1c12..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/intro.xhtml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - -
-

Welcome to Spring Travel

-

- This reference application illustrates Spring Faces, - a software library that integrates Spring and JavaServerFaces technology to power rich web applications. -

-

- The key features illustrated in this sample include: -

-
    -
  • A declarative navigation model enabling full browser button support and dynamic navigation rules
    • -
  • A fine-grained state management model, including support for ConversationScope and ViewScope
    • -
  • Modularization of web application functionality by domain use case, illustrating project structure best-practices
    • -
  • Managed persistence contexts with the Java Persistence API (JPA)
    • -
  • Unified Expression Language (EL) integration
    • -
  • Spring Security integration
    • -
  • Declarative page authoring with Facelets, including applying reusable page layouts
    • -
  • A lightweight component library for Ajax and client-side validation that employs progressive enhancement techniques
    • -
  • Exception handling support across all layers of the application
    • -
  • Spring IDE tooling integration, with support for graphical flow modeling and visualization
    • -
-

- Start your Spring Travel experience -

-
- - - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/main/enterSearchCriteria.xhtml b/spring-webflow-samples/jsf-booking/src/main/webapp/main/enterSearchCriteria.xhtml deleted file mode 100644 index 70a35bc5..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/main/enterSearchCriteria.xhtml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - -
- - - -

Search Hotels

- -
-
-
- -
-
- Maximum results: - - - -
-
- -
-
-
- -
- -
- -

Current Hotel Bookings

- - - - Name - #{booking.hotel.name} - - - Address - #{booking.hotel.address} - - - City, State - #{booking.hotel.city}, #{booking.hotel.state} - - - Check in date - - - - - - Check out date - - - - - - Confirmation number - #{booking.id} - - - Action - - - - -
- - - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/main/reviewHotel.xhtml b/spring-webflow-samples/jsf-booking/src/main/webapp/main/reviewHotel.xhtml deleted file mode 100644 index 43bb951c..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/main/reviewHotel.xhtml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - -
-

View Hotel

-
-
Name:
-
#{hotelController.hotel.name}
-
-
-
Address:
-
#{hotelController.hotel.address}
-
-
-
City:
-
#{hotelController.hotel.city}
-
-
-
State:
-
#{hotelController.hotel.state}
-
-
-
Zip:
-
#{hotelController.hotel.zip}
-
-
-
Country:
-
#{hotelController.hotel.country}
-
-
-
Nightly rate:
-
- - - -
-
-
- -
- -
-   - -
- -
- - - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/main/reviewHotels.xhtml b/spring-webflow-samples/jsf-booking/src/main/webapp/main/reviewHotels.xhtml deleted file mode 100644 index 7b4441a5..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/main/reviewHotels.xhtml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - -
-

Hotel Results

-

- -

- -
- - - - Name - #{hotel.name} - - - Address - #{hotel.address} - - - City, State - #{hotel.city}, #{hotel.state}, #{hotel.country} - - - Zip - #{hotel.zip} - - - Action - View Hotel - - - - -
-
- - - -
- -
- - - \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/main/webapp/styles/booking.css b/spring-webflow-samples/jsf-booking/src/main/webapp/styles/booking.css deleted file mode 100644 index 54c6c24d..00000000 --- a/spring-webflow-samples/jsf-booking/src/main/webapp/styles/booking.css +++ /dev/null @@ -1,187 +0,0 @@ - a, a:visited, a:link, a:active { - color: #59924B; - background-color: transparent; - text-decoration: none; - font-weight: bold; - } - - a:hover { - color: white; - background-color: #65a242; - text-decoration: none; - font-weight: bold; - } - - body.spring { - background-color: #9cac7c; - } - - #header.spring { - margin: 0 0 1em 0; - padding: 0px 0px; - background-color : #414f23; - } - - #branding.spring { - float: none; - width: 100%; - margin: 10px 0 0 0; - padding: 0 0 0 0; - text-align: none; - } - - #welcome { - padding: 10px 10px; - } - - #welcome div.left { - float: left; - } - - #welcome div.right { - float: right; - } - - #content.spring form div, - #content.spring form p { - padding: 0px; - margin: 0 0 .5em 0; - } - - #content.spring { - width: 740px; - background: #fff url(../images/bg.gif) 0 0 repeat; - margin-bottom: 0px; - } - - #content .section { - width: 505px; - float: left; - margin-bottom: 5px; - } - - #content.spring input[type="submit"], input[type="button"], button { - font-weight: bold; - color: #fff; - height: 20px; - background: #fff url(../images/btn.bg.gif) 0 0 repeat-x; - border-style: none; - vertical-align: middle; - } - - #content.spring button - { - font-size: 1em; - font-family: arial,helvetica,verdana,sans-serif; - margin-top: 0pt; - margin-right: 0pt; - margin-bottom: 0pt; - margin-left: 0pt; - padding-top: 2px; - padding-right: 2px; - padding-bottom: 2px; - padding-left: 2px; - } - - #content.spring button - { - vertical-align: middle; - } - - .errors { - font-weight: bold; - text-align: left; - color: #600; - } - - .errors ul { - list-style: none; - } - - #content .field { - float:left; - } - - #content .field .label { - float: left; - padding-top: 5px; - padding-right: 5px; - font-weight: bold; - width: 150px; - text-align: right; - } - - #content .field .output { - float: left; - width: 250px; - padding-top: 5px; - text-align: left; - } - - #content .field .input { - float: left; - width: 250px; - text-align: left; - } - - #content .searchGroup { - width: 35%; - } - - #content .buttonGroup { - clear: both; - text-align: right; - } - - #content .buttonGroup input[type="submit"], .buttonGroup input[type="button"] { - margin-right: 5px; - } - - #content .previous { - float: right; - } - - #content .next { - float: right; - } - - #content .next a { - margin-left: 20px; - } - - #content .summary { - width: 100%; - border: 1px solid #414f23; - border-collapse: collapse; - } - - #content .summary thead th { - border-left: 1px solid #414f23; - background: #fff url(../images/th.bg.gif) 0 100% repeat-x; - border-bottom: 1px solid #414f23; - padding: 6px; - text-align: left; - font-size: small; - } - - #content .summary tbody td { - border-left: 1px solid #9cac7c; - padding: 4px; - border-bottom: 1px solid #9cac7c; - font-size: 8pt; - } - - #local.spring{ - width: 215px; - } - - #footer.spring { - padding: 25px 0; - background-color : white; - border-top: 1px solid #C3BBB6; - } - - #footer.spring img { - float: right; - padding-right: 20px; - } \ No newline at end of file diff --git a/spring-webflow-samples/jsf-booking/src/test/java/.gitignore b/spring-webflow-samples/jsf-booking/src/test/java/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/spring-webflow-samples/jsf-booking/src/test/resources/.gitignore b/spring-webflow-samples/jsf-booking/src/test/resources/.gitignore deleted file mode 100644 index e69de29b..00000000 diff --git a/spring-webflow-samples/pom.xml b/spring-webflow-samples/pom.xml deleted file mode 100644 index ecb02cd8..00000000 --- a/spring-webflow-samples/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - org.springframework.webflow - spring-webflow-samples - pom - Spring Web Flow Samples - 2.3.2.BUILD-SNAPSHOT - - booking-mvc - booking-faces - booking-portlet-mvc - booking-portlet-faces - jsf-booking - - diff --git a/spring-webflow-samples/readme.txt b/spring-webflow-samples/readme.txt deleted file mode 100644 index 087587d8..00000000 --- a/spring-webflow-samples/readme.txt +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Hotel Booking Reference App Versions - * ------------------------------------ - * booking-mvc: Spring MVC + Web Flow + JSP - * booking-faces: Spring MVC + Web Flow + JavaServerFaces - * booking-portlet-mvc: Spring Portlet MVC + Web Flow + JSP version - * booking-portlet-faces: Spring Portlet MVC + Web Flow + JavaServerFaces version - * jsf-booking: Traditional JSF-based implementation; here to support comparison with "booking-faces" - */ - -Sample pre-requisites: ----------------------- -* JDK 1.5 or > must be installed and in your system path -* Ant 1.7 or > must be installed and in your system path - -Build Samples with Maven Central Dependencies: ----------------------------------------------- -Run 'mvn package' from the this directory to build all samples against Maven central dependencies. -You can find .war files under the appropriate '/target' directory. - -To import the samples into Eclipse: ------------------------------------ -Fulfill the requirements below and then import all existing projects found under this directory: - -1. Run 'mvn test' once from the command line in order to download required dependencies via Maven. - -2. Define an M2_REPO classpath variable in your Eclipse preferences pointing to your local Maven -repository. Note that this step can be skipped if using the SpringSource Tool Suite. - -To deploy a project, right-click on it and select 'Run on Server'. diff --git a/spring-webflow/.classpath b/spring-webflow/.classpath deleted file mode 100644 index e39f1b32..00000000 --- a/spring-webflow/.classpath +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-webflow/.project b/spring-webflow/.project deleted file mode 100644 index 13584d89..00000000 --- a/spring-webflow/.project +++ /dev/null @@ -1,27 +0,0 @@ - - - spring-webflow - NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - - spring-binding - spring-js - spring-js-resources - - - - org.eclipse.jdt.core.javabuilder - - - org.eclipse.wst.common.project.facet.core.builder - - - org.eclipse.wst.validation.validationbuilder - - - - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - - \ No newline at end of file diff --git a/spring-webflow/.settings/org.eclipse.jdt.core.prefs b/spring-webflow/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f2415669..00000000 --- a/spring-webflow/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,336 +0,0 @@ -#Wed Jun 09 09:15:34 BST 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes= -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=120 -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=8 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/spring-webflow/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index e69d22a8..00000000 --- a/spring-webflow/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,58 +0,0 @@ -#Thu Jul 10 09:39:53 BST 2008 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_Spring Java Conventions -formatter_settings_version=11 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=false -org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.format_source_code=true -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/spring-webflow/.settings/org.eclipse.wst.validation.prefs b/spring-webflow/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 68bb37d5..00000000 --- a/spring-webflow/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Fri May 05 18:13:37 EDT 2006 -DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator; -USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator; -USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator; -USER_PREFERENCE=overrideGlobalPreferencesfalse -eclipse.preferences.version=1 diff --git a/spring-webflow/build.xml b/spring-webflow/build.xml deleted file mode 100644 index 2e162434..00000000 --- a/spring-webflow/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml deleted file mode 100644 index c5ac8d3d..00000000 --- a/spring-webflow/ivy.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-webflow/pom.xml b/spring-webflow/pom.xml deleted file mode 100644 index 0f2de9e9..00000000 --- a/spring-webflow/pom.xml +++ /dev/null @@ -1,271 +0,0 @@ - - - 4.0.0 - org.springframework.webflow - spring-webflow - jar - Spring Web Flow - 2.3.3.BUILD-SNAPSHOT - - - commons-logging - commons-logging - 1.1.1 - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework.webflow - spring-binding - ${project.version} - - - org.springframework.webflow - spring-js - ${project.version} - - - backport-util-concurrent - backport-util-concurrent - 3.0 - true - - - javax.el - el-api - 1.0 - provided - - - javax.persistence - persistence-api - 1.0 - provided - - - javax.portlet - portlet-api - 2.0 - provided - - - javax.servlet - servlet-api - 2.4 - provided - - - org.hibernate - hibernate - 3.2.5.ga - true - - - javax.transaction - jta - - - - - ognl - ognl - 2.6.9 - true - - - org.springframework - spring-orm - ${spring.version} - true - - - org.springframework - spring-webmvc-portlet - ${spring.version} - true - - - org.springframework - spring-tx - ${spring.version} - true - - - org.springframework.security - spring-security-core - 3.1.3.RELEASE - true - - - javax.transaction - transaction-api - 1.1 - provided - - - - org.easymock - easymock - 2.5.2 - test - - - junit - junit - 3.8.2 - provided - - - org.springframework - spring-test - ${spring.version} - test - - - org.jboss.el - jboss-el - 2.0.1.GA - test - - - org.hsqldb - hsqldb - 1.8.0.10 - test - - - org.apache.openjpa - openjpa-lib-5 - 1.0.2 - test - - - org.apache.openjpa - openjpa-persistence - 1.0.2 - test - - - org.apache.openjpa - openjpa-persistence-jdbc - 1.0.2 - test - - - commons-collections - commons-collections - 3.2 - test - - - - - - maven2.java.net - http://download.java.net/maven/2 - - - jboss repository - https://repository.jboss.org/nexus/content/repositories/releases - - true - - - false - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-surefire-plugin - - junit:junit - - **/*Tests.java - - - - - maven-source-plugin - - - attach-sources - - jar - - - - - - - - false - src/main/java - - **/*.xsd - - - **/.svn/** - - - - false - src/main/resources - - META-INF/spring.* - - - - - - src/test/java - - **/*.xml - **/*.sql - **/*.properties - - - - - - 3.2.1.RELEASE - - diff --git a/spring-webflow/template.mf b/spring-webflow/template.mf deleted file mode 100644 index 2e1b3dae..00000000 --- a/spring-webflow/template.mf +++ /dev/null @@ -1,28 +0,0 @@ -Bundle-SymbolicName: org.springframework.webflow -Bundle-Name: Spring Web Flow -Bundle-Vendor: SpringSource -Bundle-ManifestVersion: 2 -Import-Template: - org.springframework.binding.*;version="[2.3.3, 2.4.0)", - org.springframework.js.*;version="[2.3.3, 2.4.0)", - org.springframework.*;version="[3.1.0.RELEASE, 3.3.0)", - org.springframework.orm.*;version="[3.1.0.RELEASE, 3.3.0)";resolution:=optional, - org.springframework.transaction.*;version="[3.1.0.RELEASE, 3.3.0)";resolution:=optional, - org.springframework.web.portlet.*;version="[3.1.0.RELEASE, 3.3.0)";resolution:=optional, - org.springframework.security.*;version="[3.0.0, 4.0.0)";resolution:=optional, - org.apache.commons.logging;version="[1.1.1, 2.0.0)", - javax.servlet;version="[2.4.0, 3.0.0)", - javax.servlet.http;version="[2.4.0, 3.0.0)", - javax.el;version="[1.0.0, 2.0.0)";resolution:=optional, - edu.emory.mathcs.backport.java.util.concurrent.*;version="[3.0.0, 4.0.0)";resolution:=optional, - javax.persistence;version="[1.0.0, 2.0.0)";resolution:=optional, - javax.portlet;version="[2.0.0, 3.0.0)";resolution:=optional, - ognl;version="[2.6.9, 3.0.0)";resolution:=optional, - junit.framework;resolution:=optional;version="[3.8.2, 4.0.0)", - org.hibernate;resolution:=optional;version="[3.2.6.ga, 4.0.0)", - org.hibernate.classic;resolution:=optional;version="[3.2.6.ga, 4.0.0)", - org.w3c.dom;version="0", - org.xml.sax;version="0", - javax.xml.parsers;version="0", - javax.xml.transform;version="0", - javax.xml.transform.stream;version="0" diff --git a/build-spring-webflow/resources/changelog.txt b/src/dist/changelog.txt similarity index 100% rename from build-spring-webflow/resources/changelog.txt rename to src/dist/changelog.txt diff --git a/build-spring-webflow/resources/javascript-copyright.txt b/src/dist/javascript-copyright.txt similarity index 100% rename from build-spring-webflow/resources/javascript-copyright.txt rename to src/dist/javascript-copyright.txt diff --git a/build-spring-webflow/resources/license.txt b/src/dist/license.txt similarity index 100% rename from build-spring-webflow/resources/license.txt rename to src/dist/license.txt diff --git a/src/dist/notice.txt b/src/dist/notice.txt new file mode 100644 index 00000000..7b4acaf2 --- /dev/null +++ b/src/dist/notice.txt @@ -0,0 +1,11 @@ +Spring Web Flow ${version} +Copyright (c) 2002-${copyright} SpringSource, a division of VMware, Inc. + +This product is licensed to you under the Apache License, Version 2.0 +(the "License"). You may not use this product except in compliance with +the License. + +This product may include a number of subcomponents with separate +copyright notices and license terms. Your use of the source code for +these subcomponents is subject to the terms and conditions of the +subcomponent's license, as noted in the license.txt file. diff --git a/build-spring-webflow/resources/readme.txt b/src/dist/readme.txt similarity index 100% rename from build-spring-webflow/resources/readme.txt rename to src/dist/readme.txt diff --git a/spring-webflow-reference/src/actions.xml b/src/reference/actions.xml similarity index 100% rename from spring-webflow-reference/src/actions.xml rename to src/reference/actions.xml diff --git a/spring-webflow-reference/src/defining-flows.xml b/src/reference/defining-flows.xml similarity index 100% rename from spring-webflow-reference/src/defining-flows.xml rename to src/reference/defining-flows.xml diff --git a/spring-webflow-reference/src/el.xml b/src/reference/el.xml similarity index 100% rename from spring-webflow-reference/src/el.xml rename to src/reference/el.xml diff --git a/spring-webflow-reference/src/flow-definition-field-mappings.xml b/src/reference/flow-definition-field-mappings.xml similarity index 100% rename from spring-webflow-reference/src/flow-definition-field-mappings.xml rename to src/reference/flow-definition-field-mappings.xml diff --git a/spring-webflow-reference/src/flow-inheritance.xml b/src/reference/flow-inheritance.xml similarity index 100% rename from spring-webflow-reference/src/flow-inheritance.xml rename to src/reference/flow-inheritance.xml diff --git a/spring-webflow-reference/src/flow-managed-persistence.xml b/src/reference/flow-managed-persistence.xml similarity index 100% rename from spring-webflow-reference/src/flow-managed-persistence.xml rename to src/reference/flow-managed-persistence.xml diff --git a/spring-webflow-reference/src/flow-security.xml b/src/reference/flow-security.xml similarity index 100% rename from spring-webflow-reference/src/flow-security.xml rename to src/reference/flow-security.xml diff --git a/spring-webflow-reference/images/flow-view-packaging.png b/src/reference/images/flow-view-packaging.png similarity index 100% rename from spring-webflow-reference/images/flow-view-packaging.png rename to src/reference/images/flow-view-packaging.png diff --git a/spring-webflow-reference/images/hotels-site-bookhotel-flow.png b/src/reference/images/hotels-site-bookhotel-flow.png similarity index 100% rename from spring-webflow-reference/images/hotels-site-bookhotel-flow.png rename to src/reference/images/hotels-site-bookhotel-flow.png diff --git a/spring-webflow-reference/images/hotels-site.png b/src/reference/images/hotels-site.png similarity index 100% rename from spring-webflow-reference/images/hotels-site.png rename to src/reference/images/hotels-site.png diff --git a/spring-webflow-reference/images/logo.jpg b/src/reference/images/logo.jpg similarity index 100% rename from spring-webflow-reference/images/logo.jpg rename to src/reference/images/logo.jpg diff --git a/spring-webflow-reference/images/s2-logo.png b/src/reference/images/s2-logo.png similarity index 100% rename from spring-webflow-reference/images/s2-logo.png rename to src/reference/images/s2-logo.png diff --git a/spring-webflow-reference/images/xdev-spring_logo.jpg b/src/reference/images/xdev-spring_logo.jpg similarity index 100% rename from spring-webflow-reference/images/xdev-spring_logo.jpg rename to src/reference/images/xdev-spring_logo.jpg diff --git a/spring-webflow-reference/src/spring-webflow-reference.xml b/src/reference/index.xml similarity index 100% rename from spring-webflow-reference/src/spring-webflow-reference.xml rename to src/reference/index.xml diff --git a/spring-webflow-reference/src/overview.xml b/src/reference/overview.xml similarity index 100% rename from spring-webflow-reference/src/overview.xml rename to src/reference/overview.xml diff --git a/spring-webflow-reference/src/portlet.xml b/src/reference/portlet.xml similarity index 100% rename from spring-webflow-reference/src/portlet.xml rename to src/reference/portlet.xml diff --git a/spring-webflow-reference/src/spring-faces.xml b/src/reference/spring-faces.xml similarity index 100% rename from spring-webflow-reference/src/spring-faces.xml rename to src/reference/spring-faces.xml diff --git a/spring-webflow-reference/src/spring-js.xml b/src/reference/spring-js.xml similarity index 100% rename from spring-webflow-reference/src/spring-js.xml rename to src/reference/spring-js.xml diff --git a/spring-webflow-reference/src/spring-mvc.xml b/src/reference/spring-mvc.xml similarity index 100% rename from spring-webflow-reference/src/spring-mvc.xml rename to src/reference/spring-mvc.xml diff --git a/spring-webflow-reference/src/system-setup.xml b/src/reference/system-setup.xml similarity index 100% rename from spring-webflow-reference/src/system-setup.xml rename to src/reference/system-setup.xml diff --git a/spring-webflow-reference/src/testing.xml b/src/reference/testing.xml similarity index 100% rename from spring-webflow-reference/src/testing.xml rename to src/reference/testing.xml diff --git a/spring-webflow-reference/src/upgrade-guide.xml b/src/reference/upgrade-guide.xml similarity index 100% rename from spring-webflow-reference/src/upgrade-guide.xml rename to src/reference/upgrade-guide.xml diff --git a/spring-webflow-reference/src/views.xml b/src/reference/views.xml similarity index 100% rename from spring-webflow-reference/src/views.xml rename to src/reference/views.xml diff --git a/spring-webflow-reference/src/whatsnew.xml b/src/reference/whatsnew.xml similarity index 100% rename from spring-webflow-reference/src/whatsnew.xml rename to src/reference/whatsnew.xml