WW-5234 Improves DTD definitions to use proper URL

10088 · Sep 27, 2022 · 3774ffa · 3774ffa
1 parent e0e7e3c
commit 3774ffa
Show file tree

Hide file tree

Showing 181 changed files with 559 additions and 476 deletions.
diff --git a/apps/rest-showcase/src/main/resources/struts.xml b/apps/rest-showcase/src/main/resources/struts.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 
 <struts>
@@ -41,4 +41,4 @@
     <package name="rest-showcase" extends="rest-default">
         <global-allowed-methods>index,show,create,update,destroy,deleteConfirm,edit,editNew</global-allowed-methods>
     </package>
-</struts>
+</struts>
diff --git a/...che/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml b/...che/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml
@@ -21,31 +21,31 @@
 -->
 <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0.2//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-  		
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
 <validators>
 	<field name="description1">
 		<field-validator type="requiredstring">
 			<message>Description1 Is Required !!!</message>
 		</field-validator>
 	</field>
-	
+
 	<field name="description2">
 		<field-validator type="requiredstring">
 			<message>Description2 Is Required !!!</message>
 		</field-validator>
 	</field>
-	
+
 	<field name="description3">
 		<field-validator type="requiredstring">
 			<message>Description3 Is Required !!!</message>
 		</field-validator>
 	</field>
-	
+
 	<field name="description4">
 		<field-validator type="requiredstring">
 			<message>Description4 Is Required !!!</message>
 		</field-validator>
 	</field>
-</validators>  		
- 
+</validators>
+
diff --git a/...wcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction-validation.xml b/...wcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <!-- Field-Validator Syntax -->
     <field name="currentEmployee.empId">

diff --git a/...showcase/src/main/resources/org/apache/struts2/showcase/action/SkillAction-validation.xml b/...showcase/src/main/resources/org/apache/struts2/showcase/action/SkillAction-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <!-- Field-Validator Syntax -->
     <field name="currentSkill.name">

diff --git a/...src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml b/...src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0.2//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
 <validators>
 	<field name="upload">
@@ -35,5 +35,4 @@
 			<message>Caption cannot be empty</message>
 		</field-validator>
 	</field>
-</validators>  		
-
+</validators>
diff --git a/...case/src/main/resources/org/apache/struts2/showcase/person/NewPersonAction-validation.xml b/...case/src/main/resources/org/apache/struts2/showcase/person/NewPersonAction-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="person">
         <field-validator type="visitor">

diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/Person-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/Person-validation.xml
@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="name">
         <field-validator type="requiredstring">

diff --git a/...org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml b/...org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml
@@ -21,22 +21,22 @@
 -->
 <!DOCTYPE validators PUBLIC
 	"-//Apache Struts//XWork Validator 1.0.2//EN"
-	"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-	
+	"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
 <validators>
 	<field name="value">
 		<field-validator type="requiredstring">
 			<param name="trim">true</param>
 			<message>Value must not be empty</message>
 		</field-validator>
 	</field>
-	
-	
+
+
 	<field name="count">
 		<field-validator type="int">
 			<message>Count must be an integer</message>
-		</field-validator>	
+		</field-validator>
 	</field>
-</validators>	
+</validators>
 
 
diff --git a/.../validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml b/.../validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml
@@ -21,10 +21,10 @@
 -->
 <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-  		
-<!-- START SNIPPET: fieldValidatorsExample -->  		
-  		
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
+<!-- START SNIPPET: fieldValidatorsExample -->
+
 <validators>
 	<field name="requiredValidatorField">
 		<field-validator type="required">

diff --git a/...case/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml b/...case/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml
@@ -19,12 +19,12 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC 
+<!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-  		
-<!-- START SNIPPET: fieldValidatorsExample -->  		
-  		
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
+<!-- START SNIPPET: fieldValidatorsExample -->
+
 <validators>
 	<field name="requiredValidatorField">
 		<field-validator type="required">

diff --git a/...alidation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml b/...alidation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml
@@ -19,13 +19,13 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC 
+<!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-  		
-  		
-<!-- START SNIPPET: nonFieldValidatorsExample -->  		
-  		
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
+
+<!-- START SNIPPET: nonFieldValidatorsExample -->
+
 <validators>
 	<validator type="expression">
 		<param name="expression"><![CDATA[ ( (someText == someTextRetype) && (someTextRetype == someTextRetypeAgain) ) ]]></param>

diff --git a/...wcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation.xml b/...wcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation.xml
@@ -19,11 +19,11 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 <!--  START SNIPPET: quizValidators -->
 <!--
     Add the following DOCTYPE declaration as first line of your XXX-validation.xml file:
-    <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+    <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 -->
 <validators>
     <field name="name">

diff --git a/...org/apache/struts2/showcase/validation/SubmitApplication-submitApplication-validation.xml b/...org/apache/struts2/showcase/validation/SubmitApplication-submitApplication-validation.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 
 <validators>
 	<field name="name">

diff --git a/...src/main/resources/org/apache/struts2/showcase/validation/User-userContext-validation.xml b/...src/main/resources/org/apache/struts2/showcase/validation/User-userContext-validation.xml
@@ -19,17 +19,17 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC 
+<!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-  		
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
 <validators>
 	<field name="name">
 		<field-validator type="requiredstring">
 			<message>Name Required</message>
 		</field-validator>
 	</field>
-	<field name="age">	
+	<field name="age">
 		<field-validator type="int">
 			<param name="min">1</param>
 			<param name="max">100</param>
@@ -41,6 +41,6 @@
 			<message>Birthday Required</message>
 		</field-validator>
 	</field>
-</validators>  		
+</validators>
 
 
diff --git a/.../validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml b/.../validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml
@@ -19,10 +19,10 @@
  * under the License.
  */
 -->
-<!DOCTYPE validators PUBLIC 
+<!DOCTYPE validators PUBLIC
   		"-//Apache Struts//XWork Validator 1.0//EN"
-  		"http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
-  		
+  		"https://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+
 <!-- START SNIPPET: visitorValidatorsExample -->
 
 <validators>

diff --git a/apps/showcase/src/main/resources/struts-actionchaining.xml b/apps/showcase/src/main/resources/struts-actionchaining.xml
@@ -21,12 +21,12 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
-	
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
+
 <struts>
 	<package name="actionchaining" extends="struts-default" namespace="/actionchaining">
 		<action name="actionChain1" class="org.apache.struts2.showcase.actionchaining.ActionChain1">
-			<result type="chain">actionChain2</result>		
+			<result type="chain">actionChain2</result>
 		</action>
 		<action name="actionChain2" class="org.apache.struts2.showcase.actionchaining.ActionChain2">
 			<result type="chain">actionChain3</result>

diff --git a/apps/showcase/src/main/resources/struts-async.xml b/apps/showcase/src/main/resources/struts-async.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <package name="async" extends="json-default" namespace="/async">

diff --git a/apps/showcase/src/main/resources/struts-conversion.xml b/apps/showcase/src/main/resources/struts-conversion.xml
@@ -21,15 +21,15 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
-	
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
+
 <struts>
 	<package name="conversion" namespace="/conversion" extends="struts-default">
-	
+
         <action name="index">
             <result>/WEB-INF/conversion/index.jsp</result>
         </action>
-        
+
 		<!-- Example populating a List inside an Action -->
 		<action name="enterPersonsInfo" method="input"
 				class="org.apache.struts2.showcase.conversion.PersonAction">
@@ -49,8 +49,8 @@
 		<action name="showPersonJavaCode">
 			<result type="plainText">/WEB-INF/conversion/Person.java.txt</result>
 		</action>
-		
-		
+
+
 		<!-- Example populating a Set inside an Action -->
 		<action name="enterAddressesInfo" class="org.apache.struts2.showcase.conversion.AddressAction" method="input">
 			<result>/WEB-INF/conversion/enterAddressInfo.jsp</result>
@@ -68,9 +68,9 @@
 		<action name="showAddressJavaCode">
 			<result type="plainText">/WEB-INF/conversion/Address.java.txt</result>
 		</action>
-		
-		
-		<!-- Example populating a List with Tiger 5 Enum  -->		
+
+
+		<!-- Example populating a List with Tiger 5 Enum  -->
 		<action name="enterOperationEnumInfo" class="org.apache.struts2.showcase.conversion.OperationsEnumAction" method="input">
 			<result>/WEB-INF/conversion/enterOperations.jsp</result>
 		</action>
@@ -93,6 +93,6 @@
 		<action name="showOperationsEnumActionConversionProperties">
 			<result type="plainText">/WEB-INF/conversion/OperationsEnumActionConversion.txt</result>
 		</action>
-		
+
 	</package>
-</struts>	
+</struts>
diff --git a/apps/showcase/src/main/resources/struts-dispatcher.xml b/apps/showcase/src/main/resources/struts-dispatcher.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
         "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-        "http://struts.apache.org/dtds/struts-2.5.dtd">
+        "https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
     <package name="dispatcher" extends="struts-default" namespace="/dispatcher">

diff --git a/apps/showcase/src/main/resources/struts-filedownload.xml b/apps/showcase/src/main/resources/struts-filedownload.xml
@@ -21,7 +21,7 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
 	<package name="filedownload" extends="struts-default" namespace="/filedownload">

diff --git a/apps/showcase/src/main/resources/struts-fileupload.xml b/apps/showcase/src/main/resources/struts-fileupload.xml
@@ -21,11 +21,11 @@
 -->
 <!DOCTYPE struts PUBLIC
 	"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
-	"http://struts.apache.org/dtds/struts-2.5.dtd">
+	"https://struts.apache.org/dtds/struts-2.5.dtd">
 
 <struts>
 	<package name="fileupload" extends="struts-default" namespace="/fileupload">
-        
+
         <action name="upload" class="org.apache.struts2.showcase.fileupload.FileUploadAction" method="input">
 			<result>/WEB-INF/fileupload/upload.jsp</result>
 		</action>
@@ -34,11 +34,11 @@
         	<result name="input">/WEB-INF/fileupload/upload.jsp</result>
 			<result>/WEB-INF/fileupload/upload-success.jsp</result>
 		</action>
-		
+
 		<action name="multipleUploadUsingList">
 			<result>/WEB-INF/fileupload/multipleUploadUsingList.jsp</result>
 		</action>
-		
+
 		<action name="doMultipleUploadUsingList" class="org.apache.struts2.showcase.fileupload.MultipleFileUploadUsingListAction" method="upload">
                         <result name="input">/WEB-INF/fileupload/multipleUploadUsingList.jsp</result>
 			<result>/WEB-INF/fileupload/multiple-success.jsp</result>