Merge pull request #1189 from stormpath/issue/1188

Issue/1188

Author: dogeared

ci/publish_docs.sh

@@ -24,6 +24,13 @@ cp -r ../docs/build/springboot/build/html source/java/spring-boot-web
 cp -r ../docs/build/springboot/build/html source/java/spring-boot-web/latest
 cp -r ../docs/build/springboot/build/html source/java/spring-boot-web/$RELEASE_VERSION
 
+info "Copying over spring docs"
+rm -rf source/java/spring-web
+cp -r ../docs/build/spring/build/html source/java/spring-web
+cp -r ../docs/build/spring/build/html source/java/spring-web/latest
+cp -r ../docs/build/spring/build/html source/java/spring-web/$RELEASE_VERSION
+
+
 info "Copying over spring cloud zuul docs"
 rm -rf source/java/spring-cloud-zuul
 cp -r ../docs/build/sczuul/build/html source/java/spring-cloud-zuul

docs/.scms.groovy

@@ -34,15 +34,11 @@ environments {
                         //    WARNING: document isn't included in any toctree
                         ['source/forwarded-request.rst',
                         'source/about_sczuul.rst',
+                        'source/tutorial.rst',
                         'source/appendix/default-stormpath-properties.rst',
                         'source/appendix/spring-boot-core-properties.rst',
                         'source/appendix/spring-boot-web-properties.rst',
-                        'source/appendix/forgot-password.rst',
-                        'source/appendix/change-password.rst',
-                        'source/appendix/head.rst',
-                        'source/appendix/login.rst',
-                        'source/appendix/register.rst',
-                        'source/appendix/verify.rst']
+                        'source/appendix/head.rst']
             model {
                 servlet = true
                 maven.project.groupId = 'com.stormpath.sdk'
@@ -53,7 +49,7 @@ environments {
 
     sczuul {
         scms {
-            excludes = springExcludes
+            excludes = springExcludes + ['source/tutorial.rst']
             model {
                 sczuul = true
                 apptype = 'gateway'
@@ -74,4 +70,15 @@ environments {
             }
         }
     }
+
+    spring {
+        scms {
+            excludes = springExcludes + ['source/about_sczuul.rst', 'source/forwarded-request.rst', 'source/appendix/head.rst']
+            model {
+                spring = true
+                maven.project.groupId = 'com.stormpath.spring'
+                maven.project.artifactId = 'stormpath-spring-security-webmvc'
+            }
+        }
+    }
 }

docs/build.sh

@@ -4,7 +4,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 CWD="$(pwd -P)"
 
 if [ -z "$1" ]; then
-  targets=( 'servlet' 'springboot' 'sczuul' )
+  targets=( 'servlet' 'spring' 'springboot' 'sczuul' )
 else
   targets=( "$1" )
 fi
@@ -15,10 +15,11 @@ command -v sphinx-build >/dev/null 2>&1 || { echo >&2 "The docs/build.sh require
 cd "$SCRIPT_DIR"
 
 for target in "${targets[@]}"; do
+  echo Working on building: $target
   scms -e "$target" "$SCRIPT_DIR/build/$target"
   cd "$SCRIPT_DIR/build/$target"
   sphinx-build -n -b html -E -d build/doctrees source -t "$target" build/html
   cd "$SCRIPT_DIR"
 done
 
-cd "$CWD"
+cd "$CWD"

docs/readme.md

@@ -63,6 +63,7 @@ Where `<name>` is the unique identifier of the guide to generate.
 The current possible values for `<name>` are:
 
 - `servlet`
+- `spring`
 - `springboot`
 - `sczuul`
 

docs/source/_static/idsite-config.png

@@ -30,7 +30,7 @@ your web application to do things like:
 
 Stormpath provides a simple REST API for all of the above.  For instance, if you wanted to create a new user account given an email address and password, you could send Stormpath an ``HTTP POST`` request and Stormpath would create a new user account for you, securely hash its password using security best practices and and store it securely in Stormpath's cloud service.
 
-In addition to allowing you to create users and groups, Stormpath also allows you to store custom data with each user account.  Let's say you want to store a user's birthday -- you can send Stormpath an ``HTTP POST`` request to the user's account URL and store *any* variable JSON data (birthdays, images, movies, links, etc.).  This information is encrypted and authenticated end-to-end, ensuring your user data is secure.
+In addition to allowing you to create users and groups, Stormpath also allows you to store custom data with each user account.  Let's say you want to store a user's birthday -- you can send Stormpath an ``HTTP POST`` request to the user's account URL and store *any* variable JSON data (birthdays, images, movies, links, etc.).  This information is cryptographically verifiable and is authenticated end-to-end, ensuring your user data is secure.
 
 What is the |project|?
 ----------------------
@@ -64,7 +64,7 @@ You might want to use Stormpath if:
 - You would like to configure and customize password strength rules.
 - You'd like to keep your user data separate from your other applications to increase platform stability / availability.
 - You are building a service oriented application or using a microservices based architecture, in which multiple independent services need access to the same user data.
-- You who would like to use Stormpath, but need to host it yourself (Stormpath has private and on-premise editions you can use internally).
+- You would like to use Stormpath, but need to host it yourself (Stormpath has private and on-premise editions you can use internally).
 
 **Stormpath is a great match for applications of any size where security, development speed, and simplicity are top priorities.**
 

docs/source/_static/login-page-facebook.png

@@ -6,18 +6,18 @@ Appendix
 .. toctree::
    :maxdepth: 1
 
-#if($servlet)
+#if( $servlet )
    appendix/web-stormpath-properties
 #else
    appendix/default-stormpath-properties
 #end
    appendix/i18n-properties
    appendix/stormpath-css
-#if(!$servlet)
    appendix/change-password
    appendix/forgot-password
+#if( $springboot or $sczuul )
    appendix/head
+#end
    appendix/login
    appendix/register
    appendix/verify
-#end