struts git commit: Drops version of maven-compiler-plugin as this breaks build
Repository: struts Updated Branches: refs/heads/master 25cdfd62e -> 0a71c5c9a Drops version of maven-compiler-plugin as this breaks build Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0a71c5c9 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0a71c5c9 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0a71c5c9 Branch: refs/heads/master Commit: 0a71c5c9afd4e8ba8fe6c67106ab2d780ca0e091 Parents: 25cdfd6 Author: Lukasz Lenart Authored: Thu May 28 10:11:42 2015 +0200 Committer: Lukasz Lenart Committed: Thu May 28 10:11:42 2015 +0200 -- pom.xml | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/0a71c5c9/pom.xml -- diff --git a/pom.xml b/pom.xml index 1eaa7c7..9fdec9d 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,6 @@ maven-compiler-plugin -3.3 1.7 1.7
[1/4] struts git commit: WW-4505 Add plugin to support bean validation
Repository: struts Updated Branches: refs/heads/master 0a71c5c9a -> 6070b57f7 WW-4505 Add plugin to support bean validation Move links to validation examples to dropdown submenu Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/53962a05 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/53962a05 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/53962a05 Branch: refs/heads/master Commit: 53962a053115551660e3d9b8e6bec5e305a3bd67 Parents: b6afefe Author: Johannes Geppert Authored: Wed May 27 21:08:50 2015 +0200 Committer: Johannes Geppert Committed: Wed May 27 21:08:50 2015 +0200 -- .../src/main/webapp/WEB-INF/decorators/main.jsp | 24 +- .../main/webapp/WEB-INF/validation/index.jsp| 49 2 files changed, 23 insertions(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/53962a05/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp -- diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp index 1479f18..391d0c8 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -195,7 +195,29 @@ CRUD Execute & Wait Token -Validation + +Validation + + + + + + + + + + + +Field Validators +Field Validators with client-side JavaScript +Non Field Validator +Store across request using MessageStoreInterceptor (Example) +Validation (basic) +Validation (client) +Validation (client using css_xhtml theme) +Visitor Validator + + Model Driven http://git-wip-us.apache.org/repos/asf/struts/blob/53962a05/apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp -- diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp deleted file mode 100644 index cca10f1..000 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp +++ /dev/null @@ -1,49 +0,0 @@ -<%-- -index.jsp - -@author tm_jee -@version $Date$ $Id$ ---%> - -<%@taglib prefix="s" uri="/struts-tags" %> - - - - Struts2 Showcase - Validation - - - - - Validation Examples - - - - - - - - - - - - - - - - - - Field Validators - Field Validators with client-side JavaScript - Non Field Validator - Store across request using MessageStoreInterceptor (Example) - Validation (basic) - Validation (client) - Validation (client using css_xhtml theme) - Visitor Validator - - - - - - -
[4/4] struts git commit: Merge branch 'bean-validation-plugin'
Merge branch 'bean-validation-plugin' Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6070b57f Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6070b57f Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6070b57f Branch: refs/heads/master Commit: 6070b57f73a6db7e5e876801498a53f597b83efb Parents: 0a71c5c 3219764 Author: Johannes Geppert Authored: Thu May 28 20:14:45 2015 +0200 Committer: Johannes Geppert Committed: Thu May 28 20:14:45 2015 +0200 -- apps/showcase/pom.xml | 17 ++ .../validation/BeanValidationExampleAction.java | 170 +++ .../src/main/resources/struts-validation.xml| 8 + apps/showcase/src/main/resources/struts.xml | 2 +- .../WEB-INF/bean-validation/bean-validation.jsp | 57 +++ .../src/main/webapp/WEB-INF/decorators/main.jsp | 26 ++- .../src/main/webapp/WEB-INF/tags/ui/example.vm | 2 - .../webapp/WEB-INF/tags/ui/exampleSubmited.vm | 3 - .../validation/clientSideValidationExample.jsp | 3 - .../validation/fieldValidatorsExample.jsp | 2 - .../main/webapp/WEB-INF/validation/footer.jsp | 8 - .../main/webapp/WEB-INF/validation/index.jsp| 49 -- .../validation/nonFieldValidatorsExample.jsp| 3 - .../webapp/WEB-INF/validation/quiz-basic.jsp| 3 - .../WEB-INF/validation/quiz-client-css.jsp | 3 - .../webapp/WEB-INF/validation/quiz-client.jsp | 2 - .../webapp/WEB-INF/validation/quiz-success.jsp | 2 - .../storeErrorsAcrossRequestCancel.jsp | 2 - .../storeErrorsAcrossRequestExample.jsp | 2 - .../validation/storeErrorsAcrossRequestOk.jsp | 2 - .../successClientSideValidationExample.jsp | 2 - .../successFieldValidatorsExample.jsp | 2 - .../successNonFieldValidatorsExample.jsp| 28 ++- .../successVisitorValidatorsExample.jsp | 28 ++- .../validation/visitorValidatorsExample.jsp | 2 - 25 files changed, 303 insertions(+), 125 deletions(-) --
[2/4] struts git commit: WW-4505 Add plugin to support bean validation
WW-4505 Add plugin to support bean validation Remove not necessary url tag for back link Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a7f03e32 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a7f03e32 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a7f03e32 Branch: refs/heads/master Commit: a7f03e3254effbfa02e118256db520ff00a00964 Parents: 53962a0 Author: Johannes Geppert Authored: Wed May 27 21:09:33 2015 +0200 Committer: Johannes Geppert Committed: Wed May 27 21:09:33 2015 +0200 -- apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/a7f03e32/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp -- diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp index 391d0c8..0c296b1 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -206,7 +206,6 @@ - Field Validators Field Validators with client-side JavaScript
[3/4] struts git commit: WW-4505 Add plugin to support bean validation
WW-4505 Add plugin to support bean validation Add bean validation example to the showcase application Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3219764e Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3219764e Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3219764e Branch: refs/heads/master Commit: 3219764efcbce65d703f829bc37d71ac4b270f3f Parents: a7f03e3 Author: Johannes Geppert Authored: Thu May 28 20:12:53 2015 +0200 Committer: Johannes Geppert Committed: Thu May 28 20:12:53 2015 +0200 -- apps/showcase/pom.xml | 17 ++ .../validation/BeanValidationExampleAction.java | 170 +++ .../src/main/resources/struts-validation.xml| 8 + apps/showcase/src/main/resources/struts.xml | 2 +- .../WEB-INF/bean-validation/bean-validation.jsp | 57 +++ .../src/main/webapp/WEB-INF/decorators/main.jsp | 3 +- .../src/main/webapp/WEB-INF/tags/ui/example.vm | 2 - .../webapp/WEB-INF/tags/ui/exampleSubmited.vm | 3 - .../validation/clientSideValidationExample.jsp | 3 - .../validation/fieldValidatorsExample.jsp | 2 - .../main/webapp/WEB-INF/validation/footer.jsp | 8 - .../validation/nonFieldValidatorsExample.jsp| 3 - .../webapp/WEB-INF/validation/quiz-basic.jsp| 3 - .../WEB-INF/validation/quiz-client-css.jsp | 3 - .../webapp/WEB-INF/validation/quiz-client.jsp | 2 - .../webapp/WEB-INF/validation/quiz-success.jsp | 2 - .../storeErrorsAcrossRequestCancel.jsp | 2 - .../storeErrorsAcrossRequestExample.jsp | 2 - .../validation/storeErrorsAcrossRequestOk.jsp | 2 - .../successClientSideValidationExample.jsp | 2 - .../successFieldValidatorsExample.jsp | 2 - .../successNonFieldValidatorsExample.jsp| 28 ++- .../successVisitorValidatorsExample.jsp | 28 ++- .../validation/visitorValidatorsExample.jsp | 2 - 24 files changed, 281 insertions(+), 75 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts/blob/3219764e/apps/showcase/pom.xml -- diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index bf70001..e1c9b77 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -87,6 +87,11 @@ +org.apache.struts +struts2-bean-validation-plugin + + + javax.servlet servlet-api provided @@ -160,6 +165,18 @@ + + +org.hibernate +hibernate-validator +5.1.3.Final + + +org.glassfish +javax.el +3.0.0 + + http://git-wip-us.apache.org/repos/asf/struts/blob/3219764e/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java -- diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java new file mode 100644 index 000..b9f2b35 --- /dev/null +++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/BeanValidationExampleAction.java @@ -0,0 +1,170 @@ +/* + * $Id$ + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ +package org.apache.struts2.showcase.validation; + +import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts.beanvalidation.constraints.FieldMatch; +import org.apache.struts2.convention.annotation.Action; +import org.apache.struts2.convention.annotation.Namespace; +import org.apache.struts2.convention.annotation.ParentPackage; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.interceptor.validation.SkipValidation; +import org.hibernate.validator.constraints.Email; +import org.hibernate.validator.constr
[05/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/styles/bootstrap-theme.css.map
--
diff --git a/apps/showcase/src/main/webapp/styles/bootstrap-theme.css.map
b/apps/showcase/src/main/webapp/styles/bootstrap-theme.css.map
new file mode 100644
index 000..5a12d63
--- /dev/null
+++ b/apps/showcase/src/main/webapp/styles/bootstrap-theme.css.map
@@ -0,0 +1 @@
+{"version":3,"sources":["less/theme.less","less/mixins/vendor-prefixes.less","bootstrap-theme.css","less/mixins/gradients.less","less/mixins/reset-filter.less"],"names":[],"mappings":"AAcA;;EAME,0CAAA;ECgDA,6FAAA;EACQ,qFAAA;EC5DT;AFgBCEC2CA,0DAAA;EACQ,kDAAA;EC7CT;AFVD;;EAiBI,mBAAA;EECH;AFiCC;;EAEE,wBAAA;EE/BH;AFoCD;EGnDI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EAEA,wHAAA;ECnBF,qEAAA;EJiCA,6BAAA;EACA,uBAAA;EAgC2C,2BAAA;EAA2B,oBAAA;EEzBvE;AFLC;;EAEE,2BAAA;EACA,8BAAA;EEOH;AFJC;;EAEE,2BAAA;EACA,uBAAA;EEMH;AFHC;;;EAGE,2BAAA;EACA,wBAAA;EEKH;AFUD;EGpDI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EAEA,wHAAA;ECnBF,qEAAA;EJiCA,6BAAA;EACA,uBAAA;EEgCD;AF9BC;;EAEE,2BAAA;EACA,8BAAA;EEgCH;AF7BC;;EAEE,2BAAA;EACA,uBAAA;EE+BH;AF5BC;;;EAGE,2BAAA;EACA,wBAAA;EE8BH;AFdD;EGrDI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EAEA,wHAAA;ECnBF,qEAAA;EJiCA,6BAAA;EACA,uBAAA;EEyDD;AFvDC;;EAEE,2BAAA;EACA,8BAAA;EEyDH;AFtDC;;EAEE,2BAAA;EACA,uBAAA;EEwDH;AFrDC;;;EAGE,2BAAA;EACA,wBAAA;EEuDH;AFtCD;EGtDI,0EAAA;EAC
A,qEAAA;EACA,+FAAA;EAAA,wEAAA;EAEA,wHAAA;ECnBF,qEAAA;EJiCA,6BAAA;EACA,uBAAA;EEkFD;AFhFC;;EAEE,2BAAA;EACA,8BAAA;EEkFH;AF/EC;;EAEE,2BAAA;EACA,uBAAA;EEiFH;AF9EC;;;EAGE,2BAAA;EACA,wBAAA;EEgFH;AF9DD;EGvDI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EAEA,wHAAA;ECnBF,qEAAA;EJiCA,6BAAA;EACA,uBAAA;EE2GD;AFzGC;;EAEE,2BAAA;EACA,8BAAA;EE2GH;AFxGC;;EAEE,2BAAA;EACA,uBAAA;EE0GH;AFvGC;;;EAGE,2BAAA;EACA,wBAAA;EEyGH;AFtFD;EGxDI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EAEA,wHAAA;ECnBF,qEAAA;EJiCA,6BAAA;EACA,uBAAA;EEoID;AFlIC;;EAEE,2BAAA;EACA,8BAAA;EEoIH;AFjIC;;EAEE,2BAAA;EACA,uBAAA;EEmIH;AFhIC;;;EAGE,2BAAA;EACA,wBAAA;EEkIH;AFxGD;;EChBE,oDAAA;EACQ,4CAAA;EC4HT;AFnGD;;EGzEI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EHwEF,2BAAA;EEyGD;AFvGD;;;EG9EI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EH8EF,2BAAA;EE6GD;AFpGD;EG3FI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;ECnBF,qEAAA;EJ6GA,oBAAA;EC/CA,6FAAA;EACQ,qFAAA;EC0JT;AF/GD;;EG3FI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAA
A,wEAAA;EACA,6BAAA;EACA,wHAAA;EF2CF,0DAAA;EACQ,kDAAA;ECoKT;AF5GD;;EAEE,gDAAA;EE8GD;AF1GD;EG9GI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;ECnBF,qEAAA;EF+OD;AFlHD;;EG9GI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EF2CF,yDAAA;EACQ,iDAAA;EC0LT;AF5HD;;EAYI,2CAAA;EEoHH;AF/GD;;;EAGE,kBAAA;EEiHD;AF5FD;EAfI;;;IAGE,aAAA;IG3IF,0EAAA;IACA,qEAAA;IACA,+FAAA;IAAA,wEAAA;IACA,6BAAA;IACA,wHAAA;ID0PD;EACF;AFxGD;EACE,+CAAA;ECzGA,4FAAA;EACQ,oFAAA;ECoNT;AFhGD;EGpKI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EH4JF,uBAAA;EE4GD;AFvGD;EGrKI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EH4JF,uBAAA;EEoHD;AF9GD;EGtKI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EH4JF,uBAAA;EE4HD;AFrHD;EGvKI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EH4JF,uBAAA;EEoID;AFrHD;EG/KI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EDuSH;AFlHD;EGzLI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;ED8SH;AF
xHD;EG1LI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EDqTH;AF9HD;EG3LI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;ED4TH;AFpID;EG5LI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EDmUH;AF1ID;EG7LI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;ED0UH;AF7ID;EGhKI,+MAAA;EACA,0MAAA;EACA,uMAAA;EDgTH;AFzID;EACE,oBAAA;EC5JA,oDAAA;EACQ,4CAAA;ECwST;AF1ID;;;EAGE,+BAAA;EGjNE,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EH+MF,uBAAA;EEgJD;AFrJD;;;EAQI,mBAAA;EEkJH;AFxID;ECjLE,mDAAA;EACQ,2CAAA;EC4TT;AFlID;EG1OI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;ED+WH;AFxID;EG3OI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EDsXH;AF9ID;EG5OI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;ED6XH;AFpJD;EG7OI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EDoYH;AF1JD;EG9OI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;ED2YH;AFhKD;EG/OI,0EAAA;EACA,qEAAA;EAC
A,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EDkZH;AFhKD;EGtPI,0EAAA;EACA,qEAAA;EACA,+FAAA;EAAA,wEAAA;EACA,6BAAA;EACA,wHAAA;EHoPF,uBAAA;ECzMA,2FAAA;EACQ,mFAAA;ECgXT","file":"bootstrap-theme.css","sourcesContent":["\n//\n//
Load core variables and mixins\n//
--\n\n@import
\"variables.less\";\n@import \"mixins.less\";\n\n\n//\n// Buttons\n//
--\n\n// Common
styles\n.btn-default,\n.btn-primary,\n.btn-success,\n.btn-info,\n.btn-warn
[02/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/styles/bootstrap.min.css
--
diff --git a/apps/showcase/src/main/webapp/styles/bootstrap.min.css
b/apps/showcase/src/main/webapp/styles/bootstrap.min.css
index 31d8b96..cd1c616 100644
--- a/apps/showcase/src/main/webapp/styles/bootstrap.min.css
+++ b/apps/showcase/src/main/webapp/styles/bootstrap.min.css
@@ -1,9 +1,5 @@
/*!
- * Bootstrap v2.1.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
-
*/article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin
dotted #333;outline:5px auto
-webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas
img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}input[type="search"]{-webkit-box-sizing:content-box;-moz-b
ox-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0
a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{margin:0;font-family:"Helvetica
Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px
solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit
-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px
rgba(0,0,0,0.1);box-shadow:0 1px 3px
rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top
.container,.navbar-fixed-top .container,.navbar-fixed-bottom
.container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.off
set2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid
[class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid
[class*="span"]:first-child{margin-left:0}.row-fluid
.span12{width:100%;*width:99.94680851063829%}.row-fluid
.span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid
.span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid
.span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid
.span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid
.span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid
.span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid
.span5{width:40.42553191489362%;*width:40.37234042553192%}
.row-fluid
.span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid
.span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid
.span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid
.span1{width:6.382978723404255
[17/17] struts git commit: Refactor showcase and migrate to bootstrap 3
Refactor showcase and migrate to bootstrap 3 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/72e6f707 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/72e6f707 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/72e6f707 Branch: refs/heads/master Commit: 72e6f70733bc4feb2138a21a04dfd0d6bfe51cac Parents: 6070b57 Author: Johannes Geppert Authored: Thu May 28 21:26:48 2015 +0200 Committer: Johannes Geppert Committed: Thu May 28 21:26:48 2015 +0200 -- .../webapp/WEB-INF/content/orders-index.jsp | 2 +- .../src/main/webapp/css/bootstrap-theme.css | 124 +- .../src/main/webapp/css/bootstrap-theme.css.map | 2 +- .../src/main/webapp/css/bootstrap-theme.min.css | 6 +- .../src/main/webapp/css/bootstrap.css | 803 +- .../src/main/webapp/css/bootstrap.css.map | 2 +- .../src/main/webapp/css/bootstrap.min.css | 6 +- .../fonts/glyphicons-halflings-regular.eot | Bin 20335 -> 20127 bytes .../fonts/glyphicons-halflings-regular.svg | 485 +- .../fonts/glyphicons-halflings-regular.ttf | Bin 41280 -> 45404 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23320 -> 23424 bytes .../fonts/glyphicons-halflings-regular.woff2| Bin 0 -> 18028 bytes apps/showcase/src/main/resources/struts.xml | 4 + .../actionchaining/actionChainingResult.jsp | 4 +- .../WEB-INF/bean-validation/bean-validation.jsp | 4 +- .../WEB-INF/conversion/enterAddressInfo.jsp | 4 +- .../WEB-INF/conversion/enterOperations.jsp | 4 +- .../WEB-INF/conversion/enterPersonInfo.jsp | 4 +- .../main/webapp/WEB-INF/conversion/index.jsp| 4 +- .../WEB-INF/conversion/showAddressInfo.jsp | 4 +- .../WEB-INF/conversion/showOperations.jsp | 4 +- .../WEB-INF/conversion/showPersonInfo.jsp | 4 +- .../src/main/webapp/WEB-INF/decorators/main.jsp | 268 +- .../webapp/WEB-INF/empmanager/editEmployee.jsp | 7 +- .../webapp/WEB-INF/empmanager/editSkill.jsp | 6 +- .../webapp/WEB-INF/empmanager/listEmployees.jsp | 6 +- .../webapp/WEB-INF/empmanager/listSkills.jsp| 6 +- .../main/webapp/WEB-INF/filedownload/index.jsp | 6 +- .../fileupload/multipleUploadUsingArray.jsp | 4 +- .../fileupload/multipleUploadUsingList.jsp | 4 +- .../WEB-INF/fileupload/upload-success.jsp | 4 +- .../main/webapp/WEB-INF/fileupload/upload.jsp | 4 +- .../freemarker/customFreemarkerManagerUsage.ftl | 4 +- .../webapp/WEB-INF/freemarker/standardTags.ftl | 4 +- .../webapp/WEB-INF/hangman/hangmanNonAjax.ftl | 4 +- apps/showcase/src/main/webapp/WEB-INF/help.jsp |14 +- .../webapp/WEB-INF/modelDriven/modelDriven.jsp | 4 +- .../WEB-INF/modelDriven/modelDrivenResult.jsp | 4 +- .../main/webapp/WEB-INF/person/edit-person.jsp | 6 +- .../main/webapp/WEB-INF/person/list-people.ftl | 6 +- .../main/webapp/WEB-INF/person/new-person.ftl | 6 +- .../src/main/webapp/WEB-INF/showcase.jsp| 4 +- .../tags/non-ui/actionPrefix/actionPrefix.ftl | 4 +- .../non-ui/actionPrefix/actionPrefixExample.ftl | 4 +- .../tags/non-ui/actionPrefix/methodPrefix.ftl | 4 +- .../tags/non-ui/actionPrefix/normalSubmit.ftl | 4 +- .../actionPrefix/redirectActionPrefix.ftl | 4 +- .../tags/non-ui/actionTag/showActionTagDemo.jsp | 4 +- .../main/webapp/WEB-INF/tags/non-ui/date.jsp| 4 +- .../main/webapp/WEB-INF/tags/non-ui/debug.jsp | 4 +- .../webapp/WEB-INF/tags/non-ui/ifTag/testIf.ftl | 4 +- .../webapp/WEB-INF/tags/non-ui/ifTag/testIf.jsp | 4 +- .../iteratorTag/appendIteratorTagDemoResult.jsp | 4 +- .../iteratorGeneratorTagDemoResult.jsp | 4 +- .../iteratorTag/mergeIteratorTagDemoResult.jsp | 4 +- .../iteratorTag/showAppendIteratorTagDemo.jsp | 4 +- .../showIteratorGeneratorTagDemo.jsp| 4 +- .../iteratorTag/showMergeIteratorTagDemo.jsp| 4 +- .../iteratorTag/subsetIteratorTagDemo.jsp | 4 +- .../iteratorTag/subsetIteratorTagDemoResult.jsp | 4 +- .../WEB-INF/tags/ui/actionTagExampleCalling.jsp | 4 +- .../WEB-INF/tags/ui/componentTagExample.jsp | 4 +- .../src/main/webapp/WEB-INF/tags/ui/example.jsp | 9 +- .../src/main/webapp/WEB-INF/tags/ui/example.vm | 4 +- .../webapp/WEB-INF/tags/ui/exampleSubmited.jsp | 4 +- .../webapp/WEB-INF/tags/ui/exampleSubmited.vm | 4 +- .../tags/ui/lotsOfOptiontransferselect.jsp | 4 +- .../ui/lotsOfOptiontransferselectSubmit.jsp | 4 +- .../main/webapp/WEB-INF/tags/ui/moreSelects.jsp | 4 +- .../WEB-INF/tags/ui/moreSelectsSubmit.jsp | 4 +- .../src/main/webapp/WEB-INF/tiles/body.ftl | 4 +- .../src/main/webapp/WEB-INF/tiles/body.jsp | 4 +-
[10/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestCancel.jsp -- diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestCancel.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestCancel.jsp index 23565a8..cbd70a5 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestCancel.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestCancel.jsp @@ -12,8 +12,8 @@ - - + + http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestExample.jsp -- diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestExample.jsp index 7d2e7b4..e33d954 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestExample.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestExample.jsp @@ -12,8 +12,8 @@ - - + + This is an example demonstrating the use of MessageStoreInterceptor. http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestOk.jsp -- diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestOk.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestOk.jsp index 27d4331..6cc4918 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestOk.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/validation/storeErrorsAcrossRequestOk.jsp @@ -12,8 +12,8 @@ - - + + http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/validation/successClientSideValidationExample.jsp -- diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/successClientSideValidationExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/successClientSideValidationExample.jsp index 103785e..dc683e9 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/successClientSideValidationExample.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/validation/successClientSideValidationExample.jsp @@ -18,8 +18,8 @@ - - + + http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp -- diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp index 2847d29..12cfa30 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/validation/successFieldValidatorsExample.jsp @@ -19,8 +19,8 @@ - - + + http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/validation/successNonFieldValidatorsExample.jsp -- diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/successNonFieldValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/successNonFieldValidatorsExample.jsp index 95024f1..e397c75 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/successNonFieldValidatorsExample.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/validation/successNonFieldValidatorsExample.jsp @@ -19,8 +19,8 @@ - - + + http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/validation/successVisitorValidatorsExample.jsp -- diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation/successVisitorValidatorsExample.jsp b/apps/showcase/src/main/webapp/WEB-INF/validation/successVisitorValidatorsExample.jsp index 1e8ad50..06c1bb7 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/validation/suc
[15/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/rest-showcase/src/main/webapp/css/bootstrap.css.map
--
diff --git a/apps/rest-showcase/src/main/webapp/css/bootstrap.css.map
b/apps/rest-showcase/src/main/webapp/css/bootstrap.css.map
index bfb5616..2fd84f3 100644
--- a/apps/rest-showcase/src/main/webapp/css/bootstrap.css.map
+++ b/apps/rest-showcase/src/main/webapp/css/bootstrap.css.map
@@ -1 +1 @@
-{"version":3,"file":"bootstrap.css","sources":["bootstrap.css","less/normalize.less","less/print.less","less/glyphicons.less","less/scaffolding.less","less/mixins/vendor-prefixes.less","less/mixins/tab-focus.less","less/mixins/image.less","less/type.less","less/mixins/text-emphasis.less","less/mixins/background-variant.less","less/mixins/text-overflow.less","less/code.less","less/grid.less","less/mixins/grid.less","less/mixins/grid-framework.less","less/tables.less","less/mixins/table-row.less","less/forms.less","less/mixins/forms.less","less/buttons.less","less/mixins/buttons.less","less/mixins/opacity.less","less/component-animations.less","less/dropdowns.less","less/mixins/nav-divider.less","less/mixins/reset-filter.less","less/button-groups.less","less/mixins/border-radius.less","less/input-groups.less","less/navs.less","less/navbar.less","less/mixins/nav-vertical-align.less","less/utilities.less","less/breadcrumbs.less","less/pagination.less","less/mixins/pagination.less","less
/pager.less","less/labels.less","less/mixins/labels.less","less/badges.less","less/jumbotron.less","less/thumbnails.less","less/alerts.less","less/mixins/alerts.less","less/progress-bars.less","less/mixins/gradients.less","less/mixins/progress-bar.less","less/media.less","less/list-group.less","less/mixins/list-group.less","less/panels.less","less/mixins/panels.less","less/responsive-embed.less","less/wells.less","less/close.less","less/modals.less","less/tooltip.less","less/popovers.less","less/carousel.less","less/mixins/clearfix.less","less/mixins/center-block.less","less/mixins/hide-text.less","less/responsive-utilities.less","less/mixins/responsive-visibility.less"],"names":[],"mappings":",6DAA4D;ACQ5D;EACE,yBAAA;EACA,4BAAA;EACA,gCAAA;EDND;ACaD;EACE,WAAA;EDXD;ACuBDEAYE,gBAAA;EDrBD;AC6BDEAIE,uBAAA;EACA,0BAAA;ED3BD;ACmCD;EACE,eAAA;EACA,WAAA;EDjCD;ACyCD;;EAEE,eAAA;EDvCD;ACiDD;EACE,yBAAA;ED/CD;ACsDD;;EAEE,YAAA;EDpDD;AC8DD;EACE,2BAAA;ED5DD;ACmED;;EAEE,mBAAA;EDjED
;ACwED;EACE,oBAAA;EDtED;AC8ED;EACE,gBAAA;EACA,kBAAA;ED5ED;ACmFD;EACE,kBAAA;EACA,aAAA;EDjFD;ACwFD;EACE,gBAAA;EDtFD;AC6FD;;EAEE,gBAAA;EACA,gBAAA;EACA,oBAAA;EACA,0BAAA;ED3FD;AC8FD;EACE,aAAA;ED5FD;AC+FD;EACE,iBAAA;ED7FD;ACuGD;EACE,WAAA;EDrGD;AC4GD;EACE,kBAAA;ED1GD;ACoHD;EACE,kBAAA;EDlHD;ACyHD;EACE,8BAAA;EACA,iCAAA;EAAA,yBAAA;EACA,WAAA;EDvHD;AC8HD;EACE,gBAAA;ED5HD;ACmIDEAIE,mCAAA;EACA,gBAAA;EDjID;ACmJD;EAKE,gBAAA;EACA,eAAA;EACA,WAAA;EDjJD;ACwJD;EACE,mBAAA;EDtJD;ACgKD;;EAEE,sBAAA;ED9JD;ACyKDEAIE,4BAAA;EACA,iBAAA;EDvKD;AC8KD;;EAEE,iBAAA;ED5KD;ACmLD;;EAEE,WAAA;EACA,YAAA;EDjLD;ACyLD;EACE,qBAAA;EDvLD;ACkMD;;EAEE,gCAAA;EAAA,6BAAA;EAAA,wBAAA;EACA,YAAA;EDhMD;ACyMD;;EAEE,cAAA;EDvMD;ACgND;EACE,+BAAA;EACA,8BAAA;EACA,iCAAA;EACA,yBAAA;ED9MD;ACuND;;EAEE,0BAAA;EDrND;AC4ND;EACE,2BAAA;EACA,eAAA;EACA,gCAAA;ED1ND;ACkOD;EACE,WAAA;EACA,YAAA;EDhOD;ACuOD;EACE,gBAAA;EDrOD;AC6OD;EACE,mBAAA;ED3OD;ACqPD;EACE,2BAAA;EACA,mBAAA;EDnPD;ACsPD;;EAEE,YAAA;EDpPD;AE9ED;EA9FE;IACE,8BAAA;IACA,wBAAA;IACA,oCAAA;IACA
,qCAAA;IAAA,6BAAA;IF+KD;EE5KD;;IAEE,4BAAA;IF8KD;EE3KD;IACE,8BAAA;IF6KD;EE1KD;IACE,+BAAA;IF4KD;EExKD;;IAEE,aAAA;IF0KD;EEvKD;;IAEE,wBAAA;IACA,0BAAA;IFyKD;EEtKD;IACE,6BAAA;IFwKD;EErKD;;IAEE,0BAAA;IFuKD;EEpKD;IACE,4BAAA;IFsKD;EEnKD;;;IAGE,YAAA;IACA,WAAA;IFqKD;EElKD;;IAEE,yBAAA;IFoKD;EE/JD;IACE,6BAAA;IFiKD;EE7JD;IACE,eAAA;IF+JD;EE7JD;;IAGI,mCAAA;IF8JH;EE3JD;;IAGI,mCAAA;IF4JH;EEzJD;IACE,wBAAA;IF2JD;EExJD;IACE,sCAAA;IF0JD;EExJD;;IAGI,mCAAA;IFyJH;EACF;AGhPD;EACE,qCAAA;EACA,uDAAA;EACA,6TAAA;EHkPD;AG3OD;EACE,oBAAA;EACA,UAAA;EACA,uBAAA;EACA,qCAAA;EACA,oBAAA;EACA,qBAAA;EACA,gBAAA;EACA,qCAAA;EACA,oCAAA;EH6OD;AGzOmC;EAAW,gBAAA;EH4O9C;AG3OmC;EAAW,gBAAA;EH8O9C;AG7OmC;EAAW,kBAAA;EHgP9C;AG/OmC;EAAW,kBAAA;EHkP9C;AGjPmC;EAAW,kBAAA;EHoP9C;AGnPmC;EAAW,kBAAA;EHsP9C;AGrPmC;EAAW,kBAAA;EHwP9C;AGvPmC;EAAW,kBAAA;EH0P9C;AGzPmC;EAAW,kBAAA;EH4P9C;AG3PmC;EAAW,kBAAA;EH8P9C;AG7PmC;EAAW,kBAAA;EHgQ9C;AG/PmC;EAAW,kBAAA;EHkQ9C;AGjQmC;EAAW,kBAAA;EHoQ9C;AGnQmC;EAAW,kBAAA;EHsQ9C;AGrQmC;EAAW,kBAAA;EHwQ9C;AGvQmC;EAAW,kBAAA;E
H0Q9C;AGzQmC;EAAW,kBAAA;EH4Q9C;AG3QmC;EAAW,kBAAA;EH8Q9C;AG7QmC;EAAW,kBAAA;EHgR9C;AG/QmC;EAAW,kBAAA;EHkR9C;AGjRmC;EAAW,kBAAA;EHoR9C;AGnRmC;EAAW,kBAAA;EHsR9C;AGrRmC;EAAW,kBAAA;EHwR9C;AGvRmC;EAAW,kBAAA;EH0R9C;AGzRmC;EAAW,kBAAA;EH4R9C;AG3RmC;EAAW,kBAAA;EH8R9C;AG7RmC;EAAW,kBAAA;EHgS9C;AG/RmC;EAAW,kBAAA;EHkS9C;AGjSmC;EAAW,kBAAA;EHoS9C;AGnSmC;EAAW,kBAAA;EHsS9C;AGrSmC;EAAW,kBAAA;EHwS9C;AGvSmC;EAAW,kBAAA;EH0S9C;AGzSmC;EAAW,kBAAA;EH4S9C;AG3SmC;EAAW,kBAAA;EH8S9C;AG7SmC;EAAW,kBAAA;EHgT9C;AG/SmC;EAAW,kBAAA;EHkT9C;AGjTmC
[16/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/rest-showcase/src/main/webapp/css/bootstrap-theme.min.css
--
diff --git a/apps/rest-showcase/src/main/webapp/css/bootstrap-theme.min.css
b/apps/rest-showcase/src/main/webapp/css/bootstrap-theme.min.css
index 2e97597..cefa3d1 100644
--- a/apps/rest-showcase/src/main/webapp/css/bootstrap-theme.min.css
+++ b/apps/rest-showcase/src/main/webapp/css/bootstrap-theme.min.css
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v3.2.0 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
+ * Bootstrap v3.3.4 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
-
*/.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0
-1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0
1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px
1px
rgba(0,0,0,.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset
0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px
rgba(0,0,0,.125)}.btn:active,.btn.active{background-image:none}.btn-default{text-shadow:0
1px 0 #fff;background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0
100%);background-image:-o-linear-gradient(top,#fff 0,#e0e0e0
100%);background-image:-webkit-gradient(linear,left top,left
bottom,from(#fff),to(#e0e0e0));background-image:linear-gradient(to bottom,#fff
0,#e0e0e0 100%);filter:progid:DXImageTransform.Microsof
t.gradient(startColorstr='#', endColorstr='#ffe0e0e0',
GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#dbdbdb;border-color:#ccc}.btn-default:hover,.btn-default:focus{background-color:#e0e0e0;background-position:0
-15px}.btn-default:active,.btn-default.active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-default:disabled,.btn-default[disabled]{background-color:#e0e0e0;background-image:none}.btn-primary{background-image:-webkit-linear-gradient(top,#428bca
0,#2d6ca2 100%);background-image:-o-linear-gradient(top,#428bca 0,#2d6ca2
100%);background-image:-webkit-gradient(linear,left top,left
bottom,from(#428bca),to(#2d6ca2));background-image:linear-gradient(to
bottom,#428bca 0,#2d6ca2
100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',
endColorstr='#ff2d6ca2',
GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border
-color:#2b669a}.btn-primary:hover,.btn-primary:focus{background-color:#2d6ca2;background-position:0
-15px}.btn-primary:active,.btn-primary.active{background-color:#2d6ca2;border-color:#2b669a}.btn-primary:disabled,.btn-primary[disabled]{background-color:#2d6ca2;background-image:none}.btn-success{background-image:-webkit-linear-gradient(top,#5cb85c
0,#419641 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#419641
100%);background-image:-webkit-gradient(linear,left top,left
bottom,from(#5cb85c),to(#419641));background-image:linear-gradient(to
bottom,#5cb85c 0,#419641
100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',
endColorstr='#ff419641',
GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0
-15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.bt
n-success:disabled,.btn-success[disabled]{background-color:#419641;background-image:none}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de
0,#2aabd2 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#2aabd2
100%);background-image:-webkit-gradient(linear,left top,left
bottom,from(#5bc0de),to(#2aabd2));background-image:linear-gradient(to
bottom,#5bc0de 0,#2aabd2
100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',
endColorstr='#ff2aabd2',
GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0
-15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.btn-info:disabled,.btn-info[disabled]{background-color:#2aabd2;background-image:none}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e
0,#eb9316 100%);background-image:-o-linear-gradient(top,#f0ad
4e 0,#eb9316 100%);background-image:-webkit-gradient(linear,left top,left
bottom,from(#f0ad4e),to(#eb9316));background-image:linear-gradient(to
bottom,#f0ad4e 0,#eb9316
100%);filte
[08/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.ttf
--
diff --git
a/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.ttf
b/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.ttf
new file mode 100644
index 000..1413fc6
Binary files /dev/null and
b/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.ttf differ
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff
--
diff --git
a/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff
b/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff
new file mode 100644
index 000..9e61285
Binary files /dev/null and
b/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff differ
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff2
--
diff --git
a/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff2
b/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff2
new file mode 100644
index 000..64539b5
Binary files /dev/null and
b/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 differ
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/js/bootstrap.min.js
--
diff --git a/apps/showcase/src/main/webapp/js/bootstrap.min.js
b/apps/showcase/src/main/webapp/js/bootstrap.min.js
index 0e33fb1..c8f82e5 100644
--- a/apps/showcase/src/main/webapp/js/bootstrap.min.js
+++ b/apps/showcase/src/main/webapp/js/bootstrap.min.js
@@ -1,6 +1,7 @@
/*!
-* Bootstrap.js by @fat & @mdo
-* Copyright 2012 Twitter, Inc.
-* http://www.apache.org/licenses/LICENSE-2.0.txt
-*/
-!function(e){e(function(){"use strict";e.support.transition=function(){var
e=function(){var
e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd
otransitionend",transition:"transitionend"},n;for(n in
t)if(e.style[n]!==undefined)return t[n]}();return
e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var
t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function
s(){i.trigger("closed").remove()}var
n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return
this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new
n(this)),type
of
t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(function(){e("body").on("click.alert.data-api",t,n.prototype.close)})}(window.jQuery),!function(e){"use
strict";var
t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var
t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var
e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return
this.each(function(){var r=e(this),i=r.data("button"),s=typeof
n=="object"&&n;i||r.data("button",i=new
t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(function(){e("body"
).on("click.button.data-api","[data-toggle^=button]",function(t){var
n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})})}(window.jQuery),!function(e){"use
strict";var
t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return
t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var
n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return
this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:f
[14/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/rest-showcase/src/main/webapp/css/bootstrap.min.css
--
diff --git a/apps/rest-showcase/src/main/webapp/css/bootstrap.min.css
b/apps/rest-showcase/src/main/webapp/css/bootstrap.min.css
index a9f35ce..cd1c616 100644
--- a/apps/rest-showcase/src/main/webapp/css/bootstrap.min.css
+++ b/apps/rest-showcase/src/main/webapp/css/bootstrap.min.css
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v3.2.0 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
+ * Bootstrap v3.3.4 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.1 | MIT License | git.io/normalize
*/html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0
0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px
dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em
0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em
40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,s
elect,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html
input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html
input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em
.625em .75em;margin:0 2px;border:1px solid
silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table
{border-spacing:0;border-collapse:collapse}td,th{padding:0}@media
print{*{color:#000!important;text-shadow:none!important;background:transparent!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:"
(" attr(href) ")"}abbr[title]:after{content:" (" attr(title)
")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px
solid
#999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.table
td,.table
th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px
solid #000}.table{border-collapse:collapse!important}.table-bordered
th,.table-bordered td{border:1px solid
#ddd!important}}@font-face{font-family:'Glyphicons
Halflings';src:url(../fonts/glyphicons-
halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix)
format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff)
format('woff'),url(../fonts/glyphicons-halflings-regular.ttf)
format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular)
format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons
Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:be
fore{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.
[13/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.eot -- diff --git a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.eot b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.eot index 4a4ca86..b93a495 100644 Binary files a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.eot and b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.eot differ
[06/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/styles/bootstrap-responsive.css
--
diff --git a/apps/showcase/src/main/webapp/styles/bootstrap-responsive.css
b/apps/showcase/src/main/webapp/styles/bootstrap-responsive.css
deleted file mode 100644
index 9259d26..000
--- a/apps/showcase/src/main/webapp/styles/bootstrap-responsive.css
+++ /dev/null
@@ -1,1058 +0,0 @@
-/*!
- * Bootstrap Responsive v2.1.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-.clearfix {
- *zoom: 1;
-}
-
-.clearfix:before,
-.clearfix:after {
- display: table;
- line-height: 0;
- content: "";
-}
-
-.clearfix:after {
- clear: both;
-}
-
-.hide-text {
- font: 0/0 a;
- color: transparent;
- text-shadow: none;
- background-color: transparent;
- border: 0;
-}
-
-.input-block-level {
- display: block;
- width: 100%;
- min-height: 30px;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-
-.hidden {
- display: none;
- visibility: hidden;
-}
-
-.visible-phone {
- display: none !important;
-}
-
-.visible-tablet {
- display: none !important;
-}
-
-.hidden-desktop {
- display: none !important;
-}
-
-.visible-desktop {
- display: inherit !important;
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
- .hidden-desktop {
-display: inherit !important;
- }
- .visible-desktop {
-display: none !important ;
- }
- .visible-tablet {
-display: inherit !important;
- }
- .hidden-tablet {
-display: none !important;
- }
-}
-
-@media (max-width: 767px) {
- .hidden-desktop {
-display: inherit !important;
- }
- .visible-desktop {
-display: none !important;
- }
- .visible-phone {
-display: inherit !important;
- }
- .hidden-phone {
-display: none !important;
- }
-}
-
-@media (min-width: 1200px) {
- .row {
-margin-left: -30px;
-*zoom: 1;
- }
- .row:before,
- .row:after {
-display: table;
-line-height: 0;
-content: "";
- }
- .row:after {
-clear: both;
- }
- [class*="span"] {
-float: left;
-min-height: 1px;
-margin-left: 30px;
- }
- .container,
- .navbar-static-top .container,
- .navbar-fixed-top .container,
- .navbar-fixed-bottom .container {
-width: 1170px;
- }
- .span12 {
-width: 1170px;
- }
- .span11 {
-width: 1070px;
- }
- .span10 {
-width: 970px;
- }
- .span9 {
-width: 870px;
- }
- .span8 {
-width: 770px;
- }
- .span7 {
-width: 670px;
- }
- .span6 {
-width: 570px;
- }
- .span5 {
-width: 470px;
- }
- .span4 {
-width: 370px;
- }
- .span3 {
-width: 270px;
- }
- .span2 {
-width: 170px;
- }
- .span1 {
-width: 70px;
- }
- .offset12 {
-margin-left: 1230px;
- }
- .offset11 {
-margin-left: 1130px;
- }
- .offset10 {
-margin-left: 1030px;
- }
- .offset9 {
-margin-left: 930px;
- }
- .offset8 {
-margin-left: 830px;
- }
- .offset7 {
-margin-left: 730px;
- }
- .offset6 {
-margin-left: 630px;
- }
- .offset5 {
-margin-left: 530px;
- }
- .offset4 {
-margin-left: 430px;
- }
- .offset3 {
-margin-left: 330px;
- }
- .offset2 {
-margin-left: 230px;
- }
- .offset1 {
-margin-left: 130px;
- }
- .row-fluid {
-width: 100%;
-*zoom: 1;
- }
- .row-fluid:before,
- .row-fluid:after {
-display: table;
-line-height: 0;
-content: "";
- }
- .row-fluid:after {
-clear: both;
- }
- .row-fluid [class*="span"] {
-display: block;
-float: left;
-width: 100%;
-min-height: 30px;
-margin-left: 2.564102564102564%;
-*margin-left: 2.5109110747408616%;
--webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
-box-sizing: border-box;
- }
- .row-fluid [class*="span"]:first-child {
-margin-left: 0;
- }
- .row-fluid .span12 {
-width: 100%;
-*width: 99.94680851063829%;
- }
- .row-fluid .span11 {
-width: 91.45299145299145%;
-*width: 91.39979996362975%;
- }
- .row-fluid .span10 {
-width: 82.90598290598291%;
-*width: 82.8527914166212%;
- }
- .row-fluid .span9 {
-width: 74.35897435897436%;
-*width: 74.30578286961266%;
- }
- .row-fluid .span8 {
-width: 65.81196581196582%;
-*width: 65.75877432260411%;
- }
- .row-fluid .span7 {
-width: 57.26495726495726%;
-*width: 57.21176577559556%;
- }
- .row-fluid .span6 {
-width: 48.717948717948715%;
-*width: 48.664757228587014%;
- }
- .row-fluid .span5 {
-width: 40.17094017094017%;
-*width: 40.11774868157847%;
- }
- .row-fluid .span4 {
-width: 31.623931623931625%;
-*width: 31.570740134569924%;
- }
- .row-fluid .span3 {
-width: 23.076923076923077%;
-*width: 23.023731587561375%;
- }
- .row-fluid .
[12/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.svg -- diff --git a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.svg b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.svg index e3e2dc7..94fb549 100644 --- a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.svg +++ b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.svg @@ -6,224 +6,283 @@ - - - + + - - + + - - - - - - - - - + + + + + + + + + + - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[03/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/styles/bootstrap.css.map
--
diff --git a/apps/showcase/src/main/webapp/styles/bootstrap.css.map
b/apps/showcase/src/main/webapp/styles/bootstrap.css.map
new file mode 100644
index 000..2fd84f3
--- /dev/null
+++ b/apps/showcase/src/main/webapp/styles/bootstrap.css.map
@@ -0,0 +1 @@
+{"version":3,"sources":["bootstrap.css","less/normalize.less","less/print.less","less/glyphicons.less","less/scaffolding.less","less/mixins/vendor-prefixes.less","less/mixins/tab-focus.less","less/mixins/image.less","less/type.less","less/mixins/text-emphasis.less","less/mixins/background-variant.less","less/mixins/text-overflow.less","less/code.less","less/grid.less","less/mixins/grid.less","less/mixins/grid-framework.less","less/tables.less","less/mixins/table-row.less","less/forms.less","less/mixins/forms.less","less/buttons.less","less/mixins/buttons.less","less/mixins/opacity.less","less/component-animations.less","less/dropdowns.less","less/mixins/nav-divider.less","less/mixins/reset-filter.less","less/button-groups.less","less/mixins/border-radius.less","less/input-groups.less","less/navs.less","less/navbar.less","less/mixins/nav-vertical-align.less","less/utilities.less","less/breadcrumbs.less","less/pagination.less","less/mixins/pagination.less","less/pager.less","less/labe
ls.less","less/mixins/labels.less","less/badges.less","less/jumbotron.less","less/thumbnails.less","less/alerts.less","less/mixins/alerts.less","less/progress-bars.less","less/mixins/gradients.less","less/mixins/progress-bar.less","less/media.less","less/list-group.less","less/mixins/list-group.less","less/panels.less","less/mixins/panels.less","less/responsive-embed.less","less/wells.less","less/close.less","less/modals.less","less/tooltip.less","less/popovers.less","less/carousel.less","less/mixins/clearfix.less","less/mixins/center-block.less","less/mixins/hide-text.less","less/responsive-utilities.less","less/mixins/responsive-visibility.less"],"names":[],"mappings":"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
[11/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.ttf -- diff --git a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.ttf b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.ttf index 67fa00b..1413fc6 100644 Binary files a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.ttf and b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.ttf differ http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff -- diff --git a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff index 8c54182..9e61285 100644 Binary files a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff and b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff differ http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 -- diff --git a/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 000..64539b5 Binary files /dev/null and b/apps/rest-showcase/src/main/webapp/fonts/glyphicons-halflings-regular.woff2 differ http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/resources/struts.xml -- diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml index 5a12a9e..dcf9a91 100644 --- a/apps/showcase/src/main/resources/struts.xml +++ b/apps/showcase/src/main/resources/struts.xml @@ -71,6 +71,10 @@ /WEB-INF/showcase.jsp + +/WEB-INF/help.jsp + + /WEB-INF/viewSource.jsp http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp -- diff --git a/apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp index 87566e8..b5696d6 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/actionchaining/actionChainingResult.jsp @@ -10,8 +10,8 @@ - - + + http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp -- diff --git a/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp b/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp index 101ef23..67f375f 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/bean-validation/bean-validation.jsp @@ -11,8 +11,8 @@ - - + + http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/conversion/enterAddressInfo.jsp -- diff --git a/apps/showcase/src/main/webapp/WEB-INF/conversion/enterAddressInfo.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/enterAddressInfo.jsp index b0e3e79..04eed7a 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/conversion/enterAddressInfo.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/conversion/enterAddressInfo.jsp @@ -9,8 +9,8 @@ - - + + An example populating a Set of object (Address.java) into Struts' action (AddressAction.java) http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/WEB-INF/conversion/enterOperations.jsp -- diff --git a/apps/showcase/src/main/webapp/WEB-INF/conversion/enterOperations.jsp b/apps/showcase/src/main/webapp/WEB-INF/conversion/enterOperations.jsp index 817e81f..803cd98 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/conversion/enterOperations.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/conversion/enterOperations.jsp @@ -9,8 +9,8 @@ - -
[09/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.svg -- diff --git a/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.svg b/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.svg new file mode 100644 index 000..94fb549 --- /dev/null +++ b/apps/showcase/src/main/webapp/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,288 @@ + +http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"; > +http://www.w3.org/2000/svg";> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[01/17] struts git commit: Refactor showcase and migrate to bootstrap 3
Repository: struts
Updated Branches:
refs/heads/master 6070b57f7 -> 72e6f7073
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/styles/main.css
--
diff --git a/apps/showcase/src/main/webapp/styles/main.css
b/apps/showcase/src/main/webapp/styles/main.css
index ae5f084..92e23b1 100644
--- a/apps/showcase/src/main/webapp/styles/main.css
+++ b/apps/showcase/src/main/webapp/styles/main.css
@@ -16,4 +16,12 @@ body {
.errorMessage, label.errorLabel {
color: red;
}
-label.errorLabel
\ No newline at end of file
+
+.wwFormTable tr {
+ padding-bottom: 5px;
+}
+
+.page-header, .footer {
+ margin-left: 10px;
+ margin-right: 10px;
+}
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/token/index.html
--
diff --git a/apps/showcase/src/main/webapp/token/index.html
b/apps/showcase/src/main/webapp/token/index.html
index f8d0f8f..b224dd7 100644
--- a/apps/showcase/src/main/webapp/token/index.html
+++ b/apps/showcase/src/main/webapp/token/index.html
@@ -10,8 +10,8 @@
-
-
+
+
These examples illustrate Struts build in
support of using tokens to prevent double post.
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/wait/index.html
--
diff --git a/apps/showcase/src/main/webapp/wait/index.html
b/apps/showcase/src/main/webapp/wait/index.html
index d354965..08cb153 100644
--- a/apps/showcase/src/main/webapp/wait/index.html
+++ b/apps/showcase/src/main/webapp/wait/index.html
@@ -11,8 +11,8 @@
-
-
+
+
These examples illustrate Struts build in
support for execute and wait.
[04/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/styles/bootstrap.css
--
diff --git a/apps/showcase/src/main/webapp/styles/bootstrap.css
b/apps/showcase/src/main/webapp/styles/bootstrap.css
index 9fa6f76..fb15e3d 100644
--- a/apps/showcase/src/main/webapp/styles/bootstrap.css
+++ b/apps/showcase/src/main/webapp/styles/bootstrap.css
@@ -1,13 +1,18 @@
/*!
- * Bootstrap v2.1.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ * Bootstrap v3.3.4 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
+/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+html {
+ font-family: sans-serif;
+ -webkit-text-size-adjust: 100%;
+ -ms-text-size-adjust: 100%;
+}
+body {
+ margin: 0;
+}
article,
aside,
details,
@@ -16,40 +21,56 @@ figure,
footer,
header,
hgroup,
+main,
+menu,
nav,
-section {
+section,
+summary {
display: block;
}
-
audio,
canvas,
+progress,
video {
display: inline-block;
- *display: inline;
- *zoom: 1;
+ vertical-align: baseline;
}
-
audio:not([controls]) {
display: none;
+ height: 0;
}
-
-html {
- font-size: 100%;
- -webkit-text-size-adjust: 100%;
- -ms-text-size-adjust: 100%;
+[hidden],
+template {
+ display: none;
}
-
-a:focus {
- outline: thin dotted #333;
- outline: 5px auto -webkit-focus-ring-color;
- outline-offset: -2px;
+a {
+ background-color: transparent;
}
-
-a:hover,
-a:active {
+a:active,
+a:hover {
outline: 0;
}
-
+abbr[title] {
+ border-bottom: 1px dotted;
+}
+b,
+strong {
+ font-weight: bold;
+}
+dfn {
+ font-style: italic;
+}
+h1 {
+ margin: .67em 0;
+ font-size: 2em;
+}
+mark {
+ color: #000;
+ background: #ff0;
+}
+small {
+ font-size: 80%;
+}
sub,
sup {
position: relative;
@@ -57,4982 +78,5808 @@ sup {
line-height: 0;
vertical-align: baseline;
}
-
sup {
- top: -0.5em;
+ top: -.5em;
}
-
sub {
- bottom: -0.25em;
+ bottom: -.25em;
}
-
img {
- width: auto\9;
- height: auto;
- max-width: 100%;
- vertical-align: middle;
border: 0;
- -ms-interpolation-mode: bicubic;
}
-
-#map_canvas img {
- max-width: none;
+svg:not(:root) {
+ overflow: hidden;
+}
+figure {
+ margin: 1em 40px;
+}
+hr {
+ height: 0;
+ -webkit-box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+}
+pre {
+ overflow: auto;
+}
+code,
+kbd,
+pre,
+samp {
+ font-family: monospace, monospace;
+ font-size: 1em;
}
-
button,
input,
+optgroup,
select,
textarea {
margin: 0;
- font-size: 100%;
- vertical-align: middle;
+ font: inherit;
+ color: inherit;
+}
+button {
+ overflow: visible;
}
-
button,
-input {
- *overflow: visible;
- line-height: normal;
+select {
+ text-transform: none;
+}
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+ -webkit-appearance: button;
+ cursor: pointer;
+}
+button[disabled],
+html input[disabled] {
+ cursor: default;
}
-
button::-moz-focus-inner,
input::-moz-focus-inner {
padding: 0;
border: 0;
}
-
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
- cursor: pointer;
- -webkit-appearance: button;
+input {
+ line-height: normal;
+}
+input[type="checkbox"],
+input[type="radio"] {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ padding: 0;
+}
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+ height: auto;
}
-
input[type="search"] {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
-webkit-appearance: textfield;
}
-
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
-
+fieldset {
+ padding: .35em .625em .75em;
+ margin: 0 2px;
+ border: 1px solid #c0c0c0;
+}
+legend {
+ padding: 0;
+ border: 0;
+}
textarea {
overflow: auto;
- vertical-align: top;
}
-
-.clearfix {
- *zoom: 1;
+optgroup {
+ font-weight: bold;
}
-
-.clearfix:before,
-.clearfix:after {
- display: table;
- line-height: 0;
- content: "";
+table {
+ border-spacing: 0;
+ border-collapse: collapse;
}
-
-.clearfix:after {
- clear: both;
+td,
+th {
+ padding: 0;
}
+/*! Source:
https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
+@media print {
+ *,
+ *:before,
+ *:after {
+color: #000 !important;
+text-shadow: none !important;
+background: transparent !important;
+-webkit-box-shadow: none !important;
+box-shadow: n
[07/17] struts git commit: Refactor showcase and migrate to bootstrap 3
http://git-wip-us.apache.org/repos/asf/struts/blob/72e6f707/apps/showcase/src/main/webapp/js/jquery-1.8.2.min.js
--
diff --git a/apps/showcase/src/main/webapp/js/jquery-1.8.2.min.js
b/apps/showcase/src/main/webapp/js/jquery-1.8.2.min.js
deleted file mode 100644
index f65cf1d..000
--- a/apps/showcase/src/main/webapp/js/jquery-1.8.2.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v1.8.2 jquery.com | jquery.org/license */
-(function(a,b){function G(a){var b=F[a]={};return
p.each(a.split(s),function(a,c){b[c]=!0}),b}function
J(a,c,d){if(d===b&&a.nodeType===1){var
e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof
d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else
d=b}return d}function K(a){var b;for(b in
a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function
ba(){return!1}function bb(){return!0}function
bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do
a=a[b];while(a&&a.nodeType!==1);return a}function
bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var
e=!!b.call(a,d,a);return e===c});if(b.nodeType)return
p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var
d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return
p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(
a,b)>=0===c})}function bk(a){var
b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return
c}function bC(a,b){return
a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function
bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var
c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete
g.handle,g.events={};for(c in
h)for(d=0,e=h[c].length;d").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.
createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write(""),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return
bS[a]=c,c}function ci(a,b,c,d){var
e;if(p.isArray(b))p.each(b,function(b,e){c||ce.test(a)?d(a,e):ci(a+"["+(typeof
e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in
b)ci(a+"["+e+"]",b[e],c,d);else d(a,b)}function cz(a){return
function(b,c){typeof b!="string"&&(c=b,b="*");var
d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init
:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return
this.context=this[0]=a,this.length=1,this;if(typeof
a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return
c=c instanceof
p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return
d.find(a);this.length=1,this[0]=g}return
this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return
p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.2",length:0,size:function(){return
this.length},toArray:function(){return k.call(this)},get:function(a){return
a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var
d=p.merge(this.constructor(),a);ret
urn
d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?"
":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return
p.each(this,a,b)},ready:function(a){return
p.ready.promise().done(a),this},eq:function(a){return
a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return
this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return
this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return
this.pushStack(p.map(this,function(b,c){return
a.call(b,c,b)}))},end:function(){return
this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var
a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;ty
