From 0b6fccb4ee14612576fd634cab78a5c157df40ae Mon Sep 17 00:00:00 2001
From: Wendy Smoak <wsmoak@apache.org>
Date: Thu, 23 Nov 2006 17:31:52 +0000
Subject: [PATCH] Fixed eol-style and keywords svn properties. WW-1483

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@478625 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/resources/example/package.properties |   10 +-
 .../resources/example/package_es.properties   |   10 +-
 apps/blank/src/main/webapp/index.html         |   20 +-
 .../mailreader2/MailreaderSupport.properties  |  186 +--
 .../MailreaderSupport_ja.properties           |  178 +--
 .../MailreaderSupport_ru.properties           |  178 +--
 .../src/main/java/struts.properties           |    8 +-
 .../struts2/showcase/ajax/Example5Action.java |    2 +-
 .../struts2/showcase/conversion/Address.java  |    2 +-
 .../showcase/conversion/AddressAction.java    |    2 +-
 .../conversion/EnumTypeConverter.java         |    2 +-
 .../showcase/conversion/OperationsEnum.java   |    2 +-
 .../conversion/OperationsEnumAction.java      |    2 +-
 .../MultipleFileUploadUsingArrayAction.java   |  132 +-
 .../MultipleFileUploadUsingListAction.java    |  166 +--
 .../integration/EditGangsterAction.java       |    2 +-
 .../showcase/integration/GangsterForm.java    |    2 +-
 .../integration/SaveGangsterAction.java       |    2 +-
 .../showcase/person/NewPersonAction.java      |    2 +-
 .../showcase/source/ViewSourceAction.java     |    2 +-
 ...ploadUsingListAction-conversion.properties |    2 +-
 backport/readme.html                          | 1098 ++++++++---------
 .../struts2/annotations/taglib/StrutsTag.java |   66 +-
 .../taglib/StrutsTagAttribute.java            |   70 +-
 .../apt/TLDAnnotationProcessorFactory.java    |  152 +--
 .../struts2/annotations/taglib/apt/Tag.java   |  184 +--
 .../taglib/apt/TagAnnotationProcessor.java    |  598 ++++-----
 .../annotations/taglib/apt/TagAttribute.java  |  130 +-
 .../components/AbstractRemoteCallUIBean.java  |    2 +-
 .../components/DropdownDateTimePicker.java    |    2 +-
 .../struts2/config/BeanSelectionProvider.java |    2 +-
 .../ClasspathConfigurationProvider.java       |    2 +-
 ...LegacyPropertiesConfigurationProvider.java |    2 +-
 .../org/apache/struts2/config/Namespace.java  |    2 +-
 .../org/apache/struts2/config/NullResult.java |    2 +-
 .../apache/struts2/config/ParentPackage.java  |    2 +-
 .../org/apache/struts2/config/Result.java     |   72 +-
 .../org/apache/struts2/config/Results.java    |   64 +-
 .../mapper/CompositeActionMapper.java         |    2 +-
 .../mapper/Restful2ActionMapper.java          |    2 +-
 .../interceptor/CheckboxInterceptor.java      |    2 +-
 .../ProfilingActivationInterceptor.java       |    2 +-
 .../struts2/interceptor/RolesInterceptor.java |    2 +-
 .../tags/DropdownDateTimePickerModel.java     |    2 +-
 .../views/jsp/ui/AbstractRemoteCallUITag.java |    2 +-
 .../jsp/ui/DropdownDateTimePickerTag.java     |    2 +-
 .../DropdownDateTimePickerDirective.java      |    2 +-
 .../ClasspathConfigurationProviderTest.java   |    2 +-
 .../struts2/config/CustomNamespaceAction.java |    2 +-
 .../config/CustomParentPackageAction.java     |    2 +-
 .../struts2/config/cltest/ActionImpl.java     |    2 +-
 .../config/cltest/OneResultAction.java        |    2 +-
 .../config/cltest/TwoResultAction.java        |    2 +-
 .../dispatcher/ActionContextCleanUpTest.java  |    2 +-
 .../apache/struts2/dispatcher/FilterTest.java |    2 +-
 .../mapper/CompositeActionMapperTest.java     |    2 +-
 .../mapper/Restful2ActionMapperTest.java      |    2 +-
 .../interceptor/RolesInterceptorTest.java     |    2 +-
 .../apache/struts2/util/ContainUtilTest.java  |    2 +-
 .../codebehind/CodebehindUnknownHandler.java  |    2 +-
 .../CodebehindUnknownHandlerTest.java         |    2 +-
 .../s1/ActionFormResetInterceptor.java        |    2 +-
 .../s1/ActionFormValidationInterceptor.java   |    2 +-
 .../tiles/StrutsTilesRequestContext.java      |    2 +-
 64 files changed, 1707 insertions(+), 1707 deletions(-)

diff --git a/apps/blank/src/main/resources/example/package.properties b/apps/blank/src/main/resources/example/package.properties
index 77d589daf..c1f4b330d 100644
--- a/apps/blank/src/main/resources/example/package.properties
+++ b/apps/blank/src/main/resources/example/package.properties
@@ -1,5 +1,5 @@
-HelloWorld.message= Struts is up and running ...
-requiredstring = ${getText(fieldName)} is required.
-password = Password
-username = User Name
-Missing.message =  This feature is under construction. Please try again in the next interation.
+HelloWorld.message= Struts is up and running ...
+requiredstring = ${getText(fieldName)} is required.
+password = Password
+username = User Name
+Missing.message =  This feature is under construction. Please try again in the next interation.
diff --git a/apps/blank/src/main/resources/example/package_es.properties b/apps/blank/src/main/resources/example/package_es.properties
index e4740a48b..a967fc67d 100644
--- a/apps/blank/src/main/resources/example/package_es.properties
+++ b/apps/blank/src/main/resources/example/package_es.properties
@@ -1,5 +1,5 @@
-HelloWorld.message= ¡Struts está bien! ...
-requiredstring = ${getText(fieldName)} se requiere.
-password = Contraseña
-username = Nombre de Usuario
-Missing.message =   ¡en obras! ¡seguir intentando!
+HelloWorld.message= ¡Struts está bien! ...
+requiredstring = ${getText(fieldName)} se requiere.
+password = Contraseña
+username = Nombre de Usuario
+Missing.message =   ¡en obras! ¡seguir intentando!
diff --git a/apps/blank/src/main/webapp/index.html b/apps/blank/src/main/webapp/index.html
index 8747c2483..dc2bbd023 100644
--- a/apps/blank/src/main/webapp/index.html
+++ b/apps/blank/src/main/webapp/index.html
@@ -1,10 +1,10 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-    <META HTTP-EQUIV="Refresh" CONTENT="0;URL=example/HelloWorld.action">
-</head>
-
-<body>
-<p>Loading ...</p>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+    <META HTTP-EQUIV="Refresh" CONTENT="0;URL=example/HelloWorld.action">
+</head>
+
+<body>
+<p>Loading ...</p>
+</body>
+</html>
diff --git a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.properties b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.properties
index 6fd171ba2..d364e0d06 100644
--- a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.properties
+++ b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.properties
@@ -1,93 +1,93 @@
-button.cancel=Cancel
-button.confirm=Confirm
-button.doSubmit=DO_SUBMIT
-button.doReset=DO_RESULT
-button.doCancel=org.apache.struts.taglib.html.CANCEL
-button.reset=Reset
-button.save=Save
-change.message=Your password has expired.  Please ask the system administrator to change it.
-change.try=Try Again
-change.title=Password Has Expired
-database.load=Cannot load database from {0}
-error.database.missing=User database is missing, cannot validate login credentials
-error.fromAddress.format=Invalid format for From Address
-error.fromAddress.required=From Address is required
-error.fullName.required=Full Name is required
-error.host.required=Mail Server is required
-error.noSubscription=No Subscription bean in user session
-error.password.expired=Your password has expired for username {0}
-error.password.required=Password is required
-error.password2.required=Confirmation password is required
-error.password.match=Password and confirmation password must match
-error.password.mismatch=Invalid username and/or password, please try again
-error.replyToAddress.format=Invalid format for Reply To Address
-struts.messages.invalid.token=Cannot submit this form out of order
-error.type.invalid=Server Type must be 'imap' or 'pop3'
-error.type.required=Server Type is required
-error.username.required=Username is required
-error.username.unique=That username is already in use - please select another
-errors.footer=</ul><hr>
-errors.header=<h3><font color="red">Validation Error</font></h3><p>You must correct the following error(s) before proceeding:</p><ul>
-errors.prefix=<li>
-errors.suffix=</li>
-errors.ioException=I/O exception rendering error messages: {0}
-expired.password=User Password has expired for {0}
-heading.autoConnect=Auto
-heading.subscriptions=Current Subscriptions
-heading.host=Host Name
-heading.user=User Name
-heading.type=Server Type
-heading.action=Action
-index.heading=MailReader Demonstration Application Options
-index.login=Log on to the MailReader Demonstration Application
-index.registration=Register with the MailReader Demonstration Application
-index.title=MailReader Demonstration Application
-index.tour=A Walking Tour of the MailReader Demonstration Application
-linkSubscription.io=I/O Error: {0}
-linkSubscription.noSubscription=No subscription under attribute {0}
-linkUser.io=I/O Error: {0}
-linkUser.noUser=No user under attribute {0}
-login.title=MailReader Demonstration Application - Login
-mainMenu.heading=Main Menu Options for 
-mainMenu.logout=Log off MailReader Demonstration Application
-mainMenu.registration=Edit your user registration profile
-mainMenu.title=MailReader Demonstration Application - Main Menu
-option.imap=IMAP Protocol
-option.pop3=POP3 Protocol
-# prompt.
-autoConnect=Auto Connect
-fromAddress=From Address
-fullName=Full Name
-mailHostname=Mail Server
-mailPassword=Mail Password
-mailServerType=Server Type
-mailUsername=Mail Username
-password=Password
-password2=(Repeat) Password
-replyToAddress=Reply To Address
-username=Username
-registration.addSubscription=Add
-registration.deleteSubscription=Delete
-registration.editSubscription=Edit
-registration.title.create=Register for the MailReader Demonstration Application
-registration.title.edit=Edit Registration for the MailReader Demonstration Application
-subscription.title.create=Create New Mail Subscription
-subscription.title.delete=Delete Existing Mail Subscription
-subscription.title.edit=Edit Existing Mail Subscription
-
-# Standard error messages for validator framework checks
-errors.required=${getText(fieldName)} is required.
-errors.minlength=${getText(fieldName)} cannot be less than {1} characters.
-errors.maxlength=${getText(fieldName)} cannot be greater than {1} characters.
-errors.invalid=${getText(fieldName)} is invalid.
-errors.byte=${getText(fieldName)} must be an byte.
-errors.short=${getText(fieldName)} must be an short.
-errors.integer=${getText(fieldName)} must be an integer.
-errors.long=${getText(fieldName)} must be an long.
-errors.float=${getText(fieldName)} must be an float.
-errors.double=${getText(fieldName)} must be an double.
-errors.date=${getText(fieldName)} is not a date.
-errors.range=${getText(fieldName)} is not in the range ${minLength} through ${maxLength}.
-errors.creditcard=${getText(fieldName)} is not a valid credit card number.
-errors.email=${getText(fieldName)} is an invalid e-mail address.
-errors.literal=${getText(fieldName)}
+button.cancel=Cancel
+button.confirm=Confirm
+button.doSubmit=DO_SUBMIT
+button.doReset=DO_RESULT
+button.doCancel=org.apache.struts.taglib.html.CANCEL
+button.reset=Reset
+button.save=Save
+change.message=Your password has expired.  Please ask the system administrator to change it.
+change.try=Try Again
+change.title=Password Has Expired
+database.load=Cannot load database from {0}
+error.database.missing=User database is missing, cannot validate login credentials
+error.fromAddress.format=Invalid format for From Address
+error.fromAddress.required=From Address is required
+error.fullName.required=Full Name is required
+error.host.required=Mail Server is required
+error.noSubscription=No Subscription bean in user session
+error.password.expired=Your password has expired for username {0}
+error.password.required=Password is required
+error.password2.required=Confirmation password is required
+error.password.match=Password and confirmation password must match
+error.password.mismatch=Invalid username and/or password, please try again
+error.replyToAddress.format=Invalid format for Reply To Address
+struts.messages.invalid.token=Cannot submit this form out of order
+error.type.invalid=Server Type must be 'imap' or 'pop3'
+error.type.required=Server Type is required
+error.username.required=Username is required
+error.username.unique=That username is already in use - please select another
+errors.footer=</ul><hr>
+errors.header=<h3><font color="red">Validation Error</font></h3><p>You must correct the following error(s) before proceeding:</p><ul>
+errors.prefix=<li>
+errors.suffix=</li>
+errors.ioException=I/O exception rendering error messages: {0}
+expired.password=User Password has expired for {0}
+heading.autoConnect=Auto
+heading.subscriptions=Current Subscriptions
+heading.host=Host Name
+heading.user=User Name
+heading.type=Server Type
+heading.action=Action
+index.heading=MailReader Demonstration Application Options
+index.login=Log on to the MailReader Demonstration Application
+index.registration=Register with the MailReader Demonstration Application
+index.title=MailReader Demonstration Application
+index.tour=A Walking Tour of the MailReader Demonstration Application
+linkSubscription.io=I/O Error: {0}
+linkSubscription.noSubscription=No subscription under attribute {0}
+linkUser.io=I/O Error: {0}
+linkUser.noUser=No user under attribute {0}
+login.title=MailReader Demonstration Application - Login
+mainMenu.heading=Main Menu Options for 
+mainMenu.logout=Log off MailReader Demonstration Application
+mainMenu.registration=Edit your user registration profile
+mainMenu.title=MailReader Demonstration Application - Main Menu
+option.imap=IMAP Protocol
+option.pop3=POP3 Protocol
+# prompt.
+autoConnect=Auto Connect
+fromAddress=From Address
+fullName=Full Name
+mailHostname=Mail Server
+mailPassword=Mail Password
+mailServerType=Server Type
+mailUsername=Mail Username
+password=Password
+password2=(Repeat) Password
+replyToAddress=Reply To Address
+username=Username
+registration.addSubscription=Add
+registration.deleteSubscription=Delete
+registration.editSubscription=Edit
+registration.title.create=Register for the MailReader Demonstration Application
+registration.title.edit=Edit Registration for the MailReader Demonstration Application
+subscription.title.create=Create New Mail Subscription
+subscription.title.delete=Delete Existing Mail Subscription
+subscription.title.edit=Edit Existing Mail Subscription
+
+# Standard error messages for validator framework checks
+errors.required=${getText(fieldName)} is required.
+errors.minlength=${getText(fieldName)} cannot be less than {1} characters.
+errors.maxlength=${getText(fieldName)} cannot be greater than {1} characters.
+errors.invalid=${getText(fieldName)} is invalid.
+errors.byte=${getText(fieldName)} must be an byte.
+errors.short=${getText(fieldName)} must be an short.
+errors.integer=${getText(fieldName)} must be an integer.
+errors.long=${getText(fieldName)} must be an long.
+errors.float=${getText(fieldName)} must be an float.
+errors.double=${getText(fieldName)} must be an double.
+errors.date=${getText(fieldName)} is not a date.
+errors.range=${getText(fieldName)} is not in the range ${minLength} through ${maxLength}.
+errors.creditcard=${getText(fieldName)} is not a valid credit card number.
+errors.email=${getText(fieldName)} is an invalid e-mail address.
+errors.literal=${getText(fieldName)}
diff --git a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ja.properties b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ja.properties
index 6bb198a05..2b9d2e4b6 100644
--- a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ja.properties
+++ b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ja.properties
@@ -1,89 +1,89 @@
-button.cancel=\u30ad\u30e3\u30f3\u30bb\u30eb
-button.confirm=\u78ba\u8a8d
-button.reset=\u30ea\u30bb\u30c3\u30c8
-button.save=\u4fdd\u5b58
-change.message=\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u6709\u52B9\u671F\u9650\u304C\u904E\u304E\u307E\u3057\u305F\u3002\u30B7\u30B9\u30C6\u30E0\u7BA1\u7406\u8005\u306B\u304A\u554F\u3044\u5408\u308F\u305B\u4E0B\u3055\u3044
-change.try=\u518D\u8A66\u884C
-change.title=\u30d1\u30b9\u30ef\u30fc\u30c9\u671f\u9650\u5207\u308c
-database.load= {0} \u304B\u3089\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
-error.database.missing=\u30E6\u30FC\u30B6\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u30ED\u30B0\u30AA\u30F3\u306E\u8A8D\u8A3C\u304C\u51FA\u6765\u307E\u305B\u3093
-error.fromAddress.format=From\u30A2\u30C9\u30EC\u30B9\u306E\u66F8\u5F0F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
-error.fromAddress.required=From\u30A2\u30C9\u30EC\u30B9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
-error.fullName.required=\u30D5\u30EB\u30CD\u30FC\u30E0\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
-error.host.required=\u30E1\u30FC\u30EB\u30B5\u30FC\u30D0\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
-error.noSubscription=Subscription bean \u304c\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u4e2d\u306b\u3042\u308a\u307e\u305b\u3093
-error.password.expired=\u30E6\u30FC\u30B6 {0} \u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u6709\u52B9\u671F\u9650\u304C\u904E\u304E\u307E\u3057\u305F
-error.password.required=\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u5FC5\u8981\u3067\u3059
-error.password2.required=\u30D1\u30B9\u30EF\u30FC\u30C9(\u78BA\u8A8D\u7528)\u304C\u5FC5\u8981\u3067\u3059
-error.password.match=\u30D1\u30B9\u30EF\u30FC\u30C9\u3068\u78BA\u8A8D\u7528\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u4E00\u81F4\u3057\u3066\u3044\u307E\u305B\u3093
-error.password.mismatch=\u30E6\u30FC\u30B6\u540D\u307E\u305F\u306F\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u4E0D\u6B63\u3067\u3059\u3002\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
-error.replyToAddress.format=\u8FD4\u4FE1\u30A2\u30C9\u30EC\u30B9\u306E\u66F8\u5F0F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
-struts.messages.invalid.token=\u3053\u306E\u30D5\u30A9\u30FC\u30E0\u306E\u5185\u5BB9\u304C\u6B63\u3057\u304F\u306A\u3044\u305F\u3081\u9001\u4FE1\u3059\u308B\u3053\u3068\u304C\u51FA\u6765\u307E\u305B\u3093
-error.type.invalid=\u30B5\u30FC\u30D0\u30BF\u30A4\u30D7\u306F 'imap' \u304B 'pop3'\u306E\u3069\u3061\u3089\u304B\u3067\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093
-error.type.required=\u30B5\u30FC\u30D0\u30BF\u30A4\u30D7\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
-error.username.required=\u30E6\u30FC\u30B6\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
-error.username.unique=\u305D\u306E\u30E6\u30FC\u30B6\u540D\u306F\u65E2\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002 \u5225\u306E\u30E6\u30FC\u30B6\u540D\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044
-errors.footer=</ul><hr>
-errors.header=<h3><font color="red">\u5165\u529b\u30c1\u30a7\u30c3\u30af\u30a8\u30e9\u30fc</font></h3><p>\u4ee5\u4e0b\u306e\u30a8\u30e9\u30fc\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044:</p><ul>
-errors.prefix=<li>
-errors.suffix=</li>
-errors.ioException=I/O\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f: {0}
-expired.password=\u30E6\u30FC\u30B6 {0} \u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u6709\u52B9\u671F\u9650\u304C\u904E\u304E\u307E\u3057\u305F
-heading.autoConnect=\u81ea\u52d5\u63a5\u7d9a
-heading.subscriptions=\u73fe\u5728\u306e\u8cfc\u8aad\u60c5\u5831
-heading.host=\u30db\u30b9\u30c8\u540d
-heading.user=\u30e6\u30fc\u30b6\u540d
-heading.type=\u30b5\u30fc\u30d0\u30bf\u30a4\u30d7
-heading.action=\u64cd\u4f5c
-index.heading=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 \u30aa\u30d7\u30b7\u30e7\u30f3
-index.login=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30ed\u30b0\u30aa\u30f3
-index.registration=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30e6\u30fc\u30b6\u767b\u9332
-index.title=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3(Struts 1.1-dev)
-index.tour=\u30b5\u30f3\u30d7\u30eb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u6563\u7b56\u3059\u308b
-linkSubscription.io=I/O\u30a8\u30e9\u30fc: {0}
-linkSubscription.noSubscription=\u5c5e\u6027 {0} \u306b\u8cfc\u8aad\u60c5\u5831\u304c\u5b58\u5728\u3057\u307e\u305b\u3093  
-linkUser.io=I/O\u30a8\u30e9\u30fc: {0}
-linkUser.noUser=\u5c5e\u6027 {0} \u306b\u30e6\u30fc\u30b6\u60c5\u5831\u304c\u5b58\u5728\u3057\u307e\u305b\u3093
-login.title=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30ed\u30b0\u30aa\u30f3
-mainMenu.heading=\u30e1\u30a4\u30f3\u30e1\u30cb\u30e5\u30fc
-mainMenu.logout=MailReader \u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30ed\u30b0\u30aa\u30d5
-mainMenu.registration=\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306e\u7de8\u96c6
-mainMenu.title=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30e1\u30a4\u30f3\u30e1\u30cb\u30e5\u30fc
-option.imap=IMAP \u30d7\u30ed\u30c8\u30b3\u30eb
-option.pop3=POP3 \u30d7\u30ed\u30c8\u30b3\u30eb
-# prompt.
-autoConnect=\u81ea\u52d5\u63a5\u7d9a
-fromAddress=From\u30a2\u30c9\u30ec\u30b9
-fullName=\u30d5\u30eb\u30cd\u30fc\u30e0
-mailHostname=\u30e1\u30fc\u30eb\u30b5\u30fc\u30d0
-mailPassword=\u30e1\u30fc\u30eb\u30d1\u30b9\u30ef\u30fc\u30c9
-mailServerType=\u30b5\u30fc\u30d0\u30bf\u30a4\u30d7
-mailUsername=\u30e1\u30fc\u30eb\u30e6\u30fc\u30b6\u540d
-.password=\u30d1\u30b9\u30ef\u30fc\u30c9
-password2=\u30d1\u30b9\u30ef\u30fc\u30c9(\u78ba\u8a8d\u7528)
-replyToAddress=\u8fd4\u4fe1\u30a2\u30c9\u30ec\u30b9
-username=\u30e6\u30fc\u30b6\u540d
-registration.addSubscription=\u65b0\u898f\u4f5c\u6210
-registration.deleteSubscription=\u524a\u9664
-registration.editSubscription=\u7de8\u96c6
-registration.title.create=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30e6\u30fc\u30b6\u767b\u9332
-registration.title.edit=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u7de8\u96c6
-subscription.title.create=\u30e1\u30fc\u30eb\u8cfc\u8aad\u60c5\u5831\u306e\u65b0\u898f\u4f5c\u6210
-subscription.title.delete=\u30e1\u30fc\u30eb\u8cfc\u8aad\u60c5\u5831\u306e\u524a\u9664
-subscription.title.edit=\u30e1\u30fc\u30eb\u8cfc\u8aad\u60c5\u5831\u306e\u7de8\u96c6
-
-# Standard error messages for validator framework checks
-errors.required=${getText(fieldName)} \u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-errors.minlength=${getText(fieldName)} \u306f {1} \u6587\u5b57\u4ee5\u4e0a\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.maxlength=${getText(fieldName)} \u306f {2} \u6587\u5b57\u4ee5\u4e0b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.invalid=${getText(fieldName)} \u306f\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002
-errors.byte=${getText(fieldName)} \u306fbyte\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.short=${getText(fieldName)} \u306fshort\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.integer=${getText(fieldName)} \u306finteger\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.long=${getText(fieldName)} \u306flong\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.float=${getText(fieldName)} \u306ffloat\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.double=${getText(fieldName)} \u306fdouble\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.date=${getText(fieldName)} \u306f\u65e5\u4ed8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
-errors.range=${getText(fieldName)} \u306f {1} \u304b\u3089 {2} \u306e\u9593\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
-errors.creditcard=${getText(fieldName)} \u306f\u6b63\u3057\u3044\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u756a\u53f7\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
-errors.email=${getText(fieldName)} \u306f\u6b63\u3057\u3044\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+button.cancel=\u30ad\u30e3\u30f3\u30bb\u30eb
+button.confirm=\u78ba\u8a8d
+button.reset=\u30ea\u30bb\u30c3\u30c8
+button.save=\u4fdd\u5b58
+change.message=\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u6709\u52B9\u671F\u9650\u304C\u904E\u304E\u307E\u3057\u305F\u3002\u30B7\u30B9\u30C6\u30E0\u7BA1\u7406\u8005\u306B\u304A\u554F\u3044\u5408\u308F\u305B\u4E0B\u3055\u3044
+change.try=\u518D\u8A66\u884C
+change.title=\u30d1\u30b9\u30ef\u30fc\u30c9\u671f\u9650\u5207\u308c
+database.load= {0} \u304B\u3089\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30ED\u30FC\u30C9\u3067\u304D\u307E\u305B\u3093
+error.database.missing=\u30E6\u30FC\u30B6\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u30ED\u30B0\u30AA\u30F3\u306E\u8A8D\u8A3C\u304C\u51FA\u6765\u307E\u305B\u3093
+error.fromAddress.format=From\u30A2\u30C9\u30EC\u30B9\u306E\u66F8\u5F0F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
+error.fromAddress.required=From\u30A2\u30C9\u30EC\u30B9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+error.fullName.required=\u30D5\u30EB\u30CD\u30FC\u30E0\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+error.host.required=\u30E1\u30FC\u30EB\u30B5\u30FC\u30D0\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+error.noSubscription=Subscription bean \u304c\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u4e2d\u306b\u3042\u308a\u307e\u305b\u3093
+error.password.expired=\u30E6\u30FC\u30B6 {0} \u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u6709\u52B9\u671F\u9650\u304C\u904E\u304E\u307E\u3057\u305F
+error.password.required=\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u5FC5\u8981\u3067\u3059
+error.password2.required=\u30D1\u30B9\u30EF\u30FC\u30C9(\u78BA\u8A8D\u7528)\u304C\u5FC5\u8981\u3067\u3059
+error.password.match=\u30D1\u30B9\u30EF\u30FC\u30C9\u3068\u78BA\u8A8D\u7528\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u4E00\u81F4\u3057\u3066\u3044\u307E\u305B\u3093
+error.password.mismatch=\u30E6\u30FC\u30B6\u540D\u307E\u305F\u306F\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u4E0D\u6B63\u3067\u3059\u3002\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+error.replyToAddress.format=\u8FD4\u4FE1\u30A2\u30C9\u30EC\u30B9\u306E\u66F8\u5F0F\u304C\u6B63\u3057\u304F\u3042\u308A\u307E\u305B\u3093
+struts.messages.invalid.token=\u3053\u306E\u30D5\u30A9\u30FC\u30E0\u306E\u5185\u5BB9\u304C\u6B63\u3057\u304F\u306A\u3044\u305F\u3081\u9001\u4FE1\u3059\u308B\u3053\u3068\u304C\u51FA\u6765\u307E\u305B\u3093
+error.type.invalid=\u30B5\u30FC\u30D0\u30BF\u30A4\u30D7\u306F 'imap' \u304B 'pop3'\u306E\u3069\u3061\u3089\u304B\u3067\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093
+error.type.required=\u30B5\u30FC\u30D0\u30BF\u30A4\u30D7\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+error.username.required=\u30E6\u30FC\u30B6\u540D\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044
+error.username.unique=\u305D\u306E\u30E6\u30FC\u30B6\u540D\u306F\u65E2\u306B\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002 \u5225\u306E\u30E6\u30FC\u30B6\u540D\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044
+errors.footer=</ul><hr>
+errors.header=<h3><font color="red">\u5165\u529b\u30c1\u30a7\u30c3\u30af\u30a8\u30e9\u30fc</font></h3><p>\u4ee5\u4e0b\u306e\u30a8\u30e9\u30fc\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044:</p><ul>
+errors.prefix=<li>
+errors.suffix=</li>
+errors.ioException=I/O\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f: {0}
+expired.password=\u30E6\u30FC\u30B6 {0} \u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u6709\u52B9\u671F\u9650\u304C\u904E\u304E\u307E\u3057\u305F
+heading.autoConnect=\u81ea\u52d5\u63a5\u7d9a
+heading.subscriptions=\u73fe\u5728\u306e\u8cfc\u8aad\u60c5\u5831
+heading.host=\u30db\u30b9\u30c8\u540d
+heading.user=\u30e6\u30fc\u30b6\u540d
+heading.type=\u30b5\u30fc\u30d0\u30bf\u30a4\u30d7
+heading.action=\u64cd\u4f5c
+index.heading=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 \u30aa\u30d7\u30b7\u30e7\u30f3
+index.login=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30ed\u30b0\u30aa\u30f3
+index.registration=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30e6\u30fc\u30b6\u767b\u9332
+index.title=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3(Struts 1.1-dev)
+index.tour=\u30b5\u30f3\u30d7\u30eb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u6563\u7b56\u3059\u308b
+linkSubscription.io=I/O\u30a8\u30e9\u30fc: {0}
+linkSubscription.noSubscription=\u5c5e\u6027 {0} \u306b\u8cfc\u8aad\u60c5\u5831\u304c\u5b58\u5728\u3057\u307e\u305b\u3093  
+linkUser.io=I/O\u30a8\u30e9\u30fc: {0}
+linkUser.noUser=\u5c5e\u6027 {0} \u306b\u30e6\u30fc\u30b6\u60c5\u5831\u304c\u5b58\u5728\u3057\u307e\u305b\u3093
+login.title=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30ed\u30b0\u30aa\u30f3
+mainMenu.heading=\u30e1\u30a4\u30f3\u30e1\u30cb\u30e5\u30fc
+mainMenu.logout=MailReader \u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306e\u30ed\u30b0\u30aa\u30d5
+mainMenu.registration=\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306e\u7de8\u96c6
+mainMenu.title=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30e1\u30a4\u30f3\u30e1\u30cb\u30e5\u30fc
+option.imap=IMAP \u30d7\u30ed\u30c8\u30b3\u30eb
+option.pop3=POP3 \u30d7\u30ed\u30c8\u30b3\u30eb
+# prompt.
+autoConnect=\u81ea\u52d5\u63a5\u7d9a
+fromAddress=From\u30a2\u30c9\u30ec\u30b9
+fullName=\u30d5\u30eb\u30cd\u30fc\u30e0
+mailHostname=\u30e1\u30fc\u30eb\u30b5\u30fc\u30d0
+mailPassword=\u30e1\u30fc\u30eb\u30d1\u30b9\u30ef\u30fc\u30c9
+mailServerType=\u30b5\u30fc\u30d0\u30bf\u30a4\u30d7
+mailUsername=\u30e1\u30fc\u30eb\u30e6\u30fc\u30b6\u540d
+.password=\u30d1\u30b9\u30ef\u30fc\u30c9
+password2=\u30d1\u30b9\u30ef\u30fc\u30c9(\u78ba\u8a8d\u7528)
+replyToAddress=\u8fd4\u4fe1\u30a2\u30c9\u30ec\u30b9
+username=\u30e6\u30fc\u30b6\u540d
+registration.addSubscription=\u65b0\u898f\u4f5c\u6210
+registration.deleteSubscription=\u524a\u9664
+registration.editSubscription=\u7de8\u96c6
+registration.title.create=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30e6\u30fc\u30b6\u767b\u9332
+registration.title.edit=MailReader\u30c7\u30e2\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 - \u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u7de8\u96c6
+subscription.title.create=\u30e1\u30fc\u30eb\u8cfc\u8aad\u60c5\u5831\u306e\u65b0\u898f\u4f5c\u6210
+subscription.title.delete=\u30e1\u30fc\u30eb\u8cfc\u8aad\u60c5\u5831\u306e\u524a\u9664
+subscription.title.edit=\u30e1\u30fc\u30eb\u8cfc\u8aad\u60c5\u5831\u306e\u7de8\u96c6
+
+# Standard error messages for validator framework checks
+errors.required=${getText(fieldName)} \u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+errors.minlength=${getText(fieldName)} \u306f {1} \u6587\u5b57\u4ee5\u4e0a\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.maxlength=${getText(fieldName)} \u306f {2} \u6587\u5b57\u4ee5\u4e0b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.invalid=${getText(fieldName)} \u306f\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002
+errors.byte=${getText(fieldName)} \u306fbyte\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.short=${getText(fieldName)} \u306fshort\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.integer=${getText(fieldName)} \u306finteger\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.long=${getText(fieldName)} \u306flong\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.float=${getText(fieldName)} \u306ffloat\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.double=${getText(fieldName)} \u306fdouble\u578b\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.date=${getText(fieldName)} \u306f\u65e5\u4ed8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+errors.range=${getText(fieldName)} \u306f {1} \u304b\u3089 {2} \u306e\u9593\u3067\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
+errors.creditcard=${getText(fieldName)} \u306f\u6b63\u3057\u3044\u30af\u30ec\u30b8\u30c3\u30c8\u30ab\u30fc\u30c9\u756a\u53f7\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+errors.email=${getText(fieldName)} \u306f\u6b63\u3057\u3044\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
diff --git a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ru.properties b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ru.properties
index e7d1772f5..6c7a88ba2 100644
--- a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ru.properties
+++ b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ru.properties
@@ -1,89 +1,89 @@
-button.cancel=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c
-button.confirm=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c
-button.reset=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c
-button.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
-change.message=Your password has expired.  Please ask the system administrator to change it.
-change.try=Try Again
-change.title=Password Has Expired
-database.load=\u0411\u0430\u0437\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u0430 \u0438\u0437 {0}
-error.database.missing=\u041d\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u043e \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f - \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0440\u043e\u0432\u0435\u0441\u0442\u0438 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044e.
-error.fromAddress.format=\u0412 \u043f\u043e\u043b\u0435 '\u0410\u0434\u0440\u0435\u0441 \u041e\u0442:' \u0443\u043a\u0430\u0437\u0430\u043d \u0430\u0434\u0440\u0435\u0441 \u0432 \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u043c \u0444\u043e\u0440\u043c\u0430\u0442\u0435.
-error.fromAddress.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0430\u0434\u0440\u0435\u0441 \u0432 \u043f\u043e\u043b\u0435 '\u0410\u0434\u0440\u0435\u0441 \u041e\u0442:'.
-error.fullName.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u043e\u043b\u043d\u043e\u0435 \u0438\u043c\u044f.
-error.host.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u043e\u0447\u0442\u043e\u0432\u044b\u0439 \u0441\u0435\u0440\u0432\u0435\u0440.
-error.noSubscription=\u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430 \u0432 \u0441\u0435\u0441\u0441\u0438\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
-error.password.expired=Your password has expired for username {0}
-error.password.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c.
-error.password2.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u043f\u0430\u0440\u043e\u043b\u044f.
-error.password.match=\u041f\u0430\u0440\u043e\u043b\u044c \u0438 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u043f\u0430\u0440\u043e\u043b\u044f \u043d\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0442.
-error.password.mismatch=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0435 \u0438\u043c\u044f \u0438/\u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c - \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0441\u043d\u043e\u0432\u0430.
-error.replyToAddress.format=\u0412 \u043f\u043e\u043b\u0435 '\u0410\u0434\u0440\u0435\u0441 \u041e\u0442\u0432\u0435\u0442\u0438\u0442\u044c \u043d\u0430:' \u0443\u043a\u0430\u0437\u0430\u043d \u0430\u0434\u0440\u0435\u0441 \u0432 \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u043c \u0444\u043e\u0440\u043c\u0430\u0442\u0435.
-struts.messages.invalid.token=\u042d\u0442\u0430 \u0444\u043e\u0440\u043c\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0430\u043d\u0430 - \u043d\u0430\u0440\u0443\u0448\u0435\u043d\u0438\u0435 \u043f\u043e\u0440\u044f\u0434\u043a\u0430 \u0437\u0430\u043d\u0435\u0441\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445.
-error.type.invalid=\u0412 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u0442\u0438\u043f\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u043c\u043e\u0433\u0443\u0442 \u0431\u044b\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d\u044b \u043b\u0438\u0448\u044c 'imap' \u0438\u043b\u0438 'pop3'
-error.type.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0442\u0438\u043f \u0441\u0435\u0440\u0432\u0435\u0440\u0430
-error.username.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
-error.username.unique=\u0423\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0435 \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f - \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0434\u0440\u0443\u0433\u043e\u0435 \u0438\u043c\u044f.
-errors.footer=</ul><hr>
-errors.header=<h3><font color="red">\u041e\u0448\u0438\u0431\u043a\u0438 \u043f\u0440\u0438 \u0437\u0430\u043d\u0435\u0441\u0435\u043d\u0438\u0438 \u0434\u0430\u043d\u043d\u044b\u0445</font></h3><p>\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u0441\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0435 \u043d\u0438\u0436\u0435 \u043e\u0448\u0438\u0431\u043a\u0438:</p><ul>
-errors.prefix=<li>
-errors.suffix=</li>
-errors.ioException=\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0432\u043e\u0434\u0430/\u0432\u044b\u0432\u043e\u0434\u0430 \u043f\u0440\u0438 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0438 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 \u043e\u0431 \u043e\u0448\u0438\u0431\u043a\u0430\u0445: {0}
-expired.password=User Password has expired for {0}
-heading.autoConnect=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438
-heading.subscriptions=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438
-heading.host=\u0421\u0435\u0440\u0432\u0435\u0440
-heading.user=\u0418\u043c\u044f
-heading.type=\u0422\u0438\u043f \u0441\u0435\u0440\u0432\u0435\u0440\u0430
-heading.action=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435
-index.heading=\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 '\u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b'
-index.login=\u0412\u043e\u0439\u0442\u0438 \u043a\u0430\u043a \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
-index.registration=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f
-index.title=\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 '\u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b' (Struts 1.1-dev)
-index.tour=\u041e\u0431\u0437\u043e\u0440 \u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0433\u043e \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f '\u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b'
-linkSubscription.io=\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0432\u043e\u0434\u0430/\u0432\u044b\u0432\u043e\u0434\u0430 (\u0434\u043b\u044f \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438): {0}
-linkSubscription.noSubscription=\u0410\u0442\u0440\u0438\u0431\u0443\u0442 {0} \u043d\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0435 \u0438\u043b\u0438 \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.
-linkUser.io=\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0432\u043e\u0434\u0430/\u0432\u044b\u0432\u043e\u0434\u0430 (\u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f): {0}
-linkUser.noUser=\u0410\u0442\u0440\u0438\u0431\u0443\u0442 {0} \u043d\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435 \u0438\u043b\u0438 \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.
-login.title=\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b - \u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u0438\u043c\u0435\u043d\u0438 \u0438 \u043f\u0430\u0440\u043e\u043b\u044f.
-mainMenu.heading=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0433\u043b\u0430\u0432\u043d\u043e\u0433\u043e \u043c\u0435\u043d\u044e \u0434\u043b\u044f
-mainMenu.logout=\u0412\u044b\u0439\u0442\u0438
-mainMenu.registration=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0432\u043e\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
-mainMenu.title=\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 '\u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b' - \u041e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u043c\u0435\u043d\u044e
-option.imap=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b IMAP 
-option.pop3=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b POP3 
-# prompt.
-autoConnect=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435:
-fromAddress=\u0410\u0434\u0440\u0435\u0441 \u041e\u0442:
-fullName=\u041f\u043e\u043b\u043d\u043e\u0435 \u0438\u043c\u044f:
-mailHostname=\u041f\u043e\u0447\u0442\u043e\u0432\u044b\u0439 \u0441\u0435\u0440\u0432\u0435\u0440:
-mailPassword=\u041f\u0430\u0440\u043e\u043b\u044c \u0434\u043b\u044f \u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430:
-mailServerType=\u0422\u0438\u043f \u0441\u0435\u0440\u0432\u0435\u0440\u0430:
-mailUsername=\u0418\u043c\u044f \u0434\u043b\u044f \u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430:
-password=\u041f\u0430\u0440\u043e\u043b\u044c:
-password2=(\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435) \u041f\u0430\u0440\u043e\u043b\u044c:
-replyToAddress=\u0410\u0434\u0440\u0435\u0441 \u041e\u0442\u0432\u0435\u0442\u0438\u0442\u044c \u043d\u0430:
-username=\u0418\u043c\u044f:
-registration.addSubscription=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c
-registration.deleteSubscription=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
-registration.editSubscription=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
-registration.title.create=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f
-registration.title.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0435 \u043e \u0441\u0432\u043e\u0435\u0439 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
-subscription.title.create=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u043e\u0432\u0443\u044e \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0443
-subscription.title.delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0443\u044e \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0443
-subscription.title.edit=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0443\u044e \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0443
-
-# Standard error messages for validator framework checks
-errors.required=${getText(fieldName)} is required.
-errors.minlength=${getText(fieldName)} cannot be less than {1} characters.
-errors.maxlength=${getText(fieldName)} cannot be greater than {2} characters.
-errors.invalid=${getText(fieldName)} is invalid.
-errors.byte=${getText(fieldName)} must be an byte.
-errors.short=${getText(fieldName)} must be an short.
-errors.integer=${getText(fieldName)} must be an integer.
-errors.long=${getText(fieldName)} must be an long.
-errors.float=${getText(fieldName)} must be an float.
-errors.double=${getText(fieldName)} must be an double.
-errors.date=${getText(fieldName)} is not a date.
-errors.range=${getText(fieldName)} is not in the range {1} through {2}.
-errors.creditcard=${getText(fieldName)} is not a valid credit card number.
-errors.email=${getText(fieldName)} is an invalid e-mail address.
+button.cancel=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c
+button.confirm=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c
+button.reset=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c
+button.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
+change.message=Your password has expired.  Please ask the system administrator to change it.
+change.try=Try Again
+change.title=Password Has Expired
+database.load=\u0411\u0430\u0437\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u0430 \u0438\u0437 {0}
+error.database.missing=\u041d\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u043e \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f - \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0440\u043e\u0432\u0435\u0441\u0442\u0438 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044e.
+error.fromAddress.format=\u0412 \u043f\u043e\u043b\u0435 '\u0410\u0434\u0440\u0435\u0441 \u041e\u0442:' \u0443\u043a\u0430\u0437\u0430\u043d \u0430\u0434\u0440\u0435\u0441 \u0432 \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u043c \u0444\u043e\u0440\u043c\u0430\u0442\u0435.
+error.fromAddress.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0430\u0434\u0440\u0435\u0441 \u0432 \u043f\u043e\u043b\u0435 '\u0410\u0434\u0440\u0435\u0441 \u041e\u0442:'.
+error.fullName.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u043e\u043b\u043d\u043e\u0435 \u0438\u043c\u044f.
+error.host.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u043e\u0447\u0442\u043e\u0432\u044b\u0439 \u0441\u0435\u0440\u0432\u0435\u0440.
+error.noSubscription=\u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430 \u0432 \u0441\u0435\u0441\u0441\u0438\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+error.password.expired=Your password has expired for username {0}
+error.password.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c.
+error.password2.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u043f\u0430\u0440\u043e\u043b\u044f.
+error.password.match=\u041f\u0430\u0440\u043e\u043b\u044c \u0438 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u043f\u0430\u0440\u043e\u043b\u044f \u043d\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0442.
+error.password.mismatch=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0435 \u0438\u043c\u044f \u0438/\u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c - \u043f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0441\u043d\u043e\u0432\u0430.
+error.replyToAddress.format=\u0412 \u043f\u043e\u043b\u0435 '\u0410\u0434\u0440\u0435\u0441 \u041e\u0442\u0432\u0435\u0442\u0438\u0442\u044c \u043d\u0430:' \u0443\u043a\u0430\u0437\u0430\u043d \u0430\u0434\u0440\u0435\u0441 \u0432 \u043d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u043c \u0444\u043e\u0440\u043c\u0430\u0442\u0435.
+struts.messages.invalid.token=\u042d\u0442\u0430 \u0444\u043e\u0440\u043c\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u0430\u043d\u0430 - \u043d\u0430\u0440\u0443\u0448\u0435\u043d\u0438\u0435 \u043f\u043e\u0440\u044f\u0434\u043a\u0430 \u0437\u0430\u043d\u0435\u0441\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445.
+error.type.invalid=\u0412 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u0442\u0438\u043f\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u043c\u043e\u0433\u0443\u0442 \u0431\u044b\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d\u044b \u043b\u0438\u0448\u044c 'imap' \u0438\u043b\u0438 'pop3'
+error.type.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0442\u0438\u043f \u0441\u0435\u0440\u0432\u0435\u0440\u0430
+error.username.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+error.username.unique=\u0423\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0435 \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f - \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0434\u0440\u0443\u0433\u043e\u0435 \u0438\u043c\u044f.
+errors.footer=</ul><hr>
+errors.header=<h3><font color="red">\u041e\u0448\u0438\u0431\u043a\u0438 \u043f\u0440\u0438 \u0437\u0430\u043d\u0435\u0441\u0435\u043d\u0438\u0438 \u0434\u0430\u043d\u043d\u044b\u0445</font></h3><p>\u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u0441\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0435 \u043d\u0438\u0436\u0435 \u043e\u0448\u0438\u0431\u043a\u0438:</p><ul>
+errors.prefix=<li>
+errors.suffix=</li>
+errors.ioException=\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0432\u043e\u0434\u0430/\u0432\u044b\u0432\u043e\u0434\u0430 \u043f\u0440\u0438 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0438 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0439 \u043e\u0431 \u043e\u0448\u0438\u0431\u043a\u0430\u0445: {0}
+expired.password=User Password has expired for {0}
+heading.autoConnect=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438
+heading.subscriptions=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438
+heading.host=\u0421\u0435\u0440\u0432\u0435\u0440
+heading.user=\u0418\u043c\u044f
+heading.type=\u0422\u0438\u043f \u0441\u0435\u0440\u0432\u0435\u0440\u0430
+heading.action=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435
+index.heading=\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 '\u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b'
+index.login=\u0412\u043e\u0439\u0442\u0438 \u043a\u0430\u043a \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
+index.registration=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f
+index.title=\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 '\u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b' (Struts 1.1-dev)
+index.tour=\u041e\u0431\u0437\u043e\u0440 \u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0433\u043e \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f '\u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b'
+linkSubscription.io=\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0432\u043e\u0434\u0430/\u0432\u044b\u0432\u043e\u0434\u0430 (\u0434\u043b\u044f \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438): {0}
+linkSubscription.noSubscription=\u0410\u0442\u0440\u0438\u0431\u0443\u0442 {0} \u043d\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0435 \u0438\u043b\u0438 \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.
+linkUser.io=\u041e\u0448\u0438\u0431\u043a\u0430 \u0432\u0432\u043e\u0434\u0430/\u0432\u044b\u0432\u043e\u0434\u0430 (\u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f): {0}
+linkUser.noUser=\u0410\u0442\u0440\u0438\u0431\u0443\u0442 {0} \u043d\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435 \u0438\u043b\u0438 \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.
+login.title=\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b - \u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u0438\u043c\u0435\u043d\u0438 \u0438 \u043f\u0430\u0440\u043e\u043b\u044f.
+mainMenu.heading=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0433\u043b\u0430\u0432\u043d\u043e\u0433\u043e \u043c\u0435\u043d\u044e \u0434\u043b\u044f
+mainMenu.logout=\u0412\u044b\u0439\u0442\u0438
+mainMenu.registration=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0432\u043e\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
+mainMenu.title=\u0414\u0435\u043c\u043e\u043d\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435 '\u0427\u0442\u0435\u043d\u0438\u0435 \u043f\u043e\u0447\u0442\u044b' - \u041e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u043c\u0435\u043d\u044e
+option.imap=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b IMAP 
+option.pop3=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b POP3 
+# prompt.
+autoConnect=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435:
+fromAddress=\u0410\u0434\u0440\u0435\u0441 \u041e\u0442:
+fullName=\u041f\u043e\u043b\u043d\u043e\u0435 \u0438\u043c\u044f:
+mailHostname=\u041f\u043e\u0447\u0442\u043e\u0432\u044b\u0439 \u0441\u0435\u0440\u0432\u0435\u0440:
+mailPassword=\u041f\u0430\u0440\u043e\u043b\u044c \u0434\u043b\u044f \u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430:
+mailServerType=\u0422\u0438\u043f \u0441\u0435\u0440\u0432\u0435\u0440\u0430:
+mailUsername=\u0418\u043c\u044f \u0434\u043b\u044f \u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430:
+password=\u041f\u0430\u0440\u043e\u043b\u044c:
+password2=(\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435) \u041f\u0430\u0440\u043e\u043b\u044c:
+replyToAddress=\u0410\u0434\u0440\u0435\u0441 \u041e\u0442\u0432\u0435\u0442\u0438\u0442\u044c \u043d\u0430:
+username=\u0418\u043c\u044f:
+registration.addSubscription=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c
+registration.deleteSubscription=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
+registration.editSubscription=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
+registration.title.create=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f
+registration.title.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0435 \u043e \u0441\u0432\u043e\u0435\u0439 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
+subscription.title.create=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u043e\u0432\u0443\u044e \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0443
+subscription.title.delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0443\u044e \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0443
+subscription.title.edit=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0443\u044e \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0443
+
+# Standard error messages for validator framework checks
+errors.required=${getText(fieldName)} is required.
+errors.minlength=${getText(fieldName)} cannot be less than {1} characters.
+errors.maxlength=${getText(fieldName)} cannot be greater than {2} characters.
+errors.invalid=${getText(fieldName)} is invalid.
+errors.byte=${getText(fieldName)} must be an byte.
+errors.short=${getText(fieldName)} must be an short.
+errors.integer=${getText(fieldName)} must be an integer.
+errors.long=${getText(fieldName)} must be an long.
+errors.float=${getText(fieldName)} must be an float.
+errors.double=${getText(fieldName)} must be an double.
+errors.date=${getText(fieldName)} is not a date.
+errors.range=${getText(fieldName)} is not in the range {1} through {2}.
+errors.creditcard=${getText(fieldName)} is not a valid credit card number.
+errors.email=${getText(fieldName)} is an invalid e-mail address.
diff --git a/apps/mailreader/src/main/java/struts.properties b/apps/mailreader/src/main/java/struts.properties
index 14f925247..db976c553 100644
--- a/apps/mailreader/src/main/java/struts.properties
+++ b/apps/mailreader/src/main/java/struts.properties
@@ -1,4 +1,4 @@
-struts.objectFactory = spring
-struts.devMode = false
-struts.action.extension = do
-struts.enable.DynamicMethodInvocation = false
+struts.objectFactory = spring
+struts.devMode = false
+struts.action.extension = do
+struts.enable.DynamicMethodInvocation = false
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example5Action.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example5Action.java
index 1d5f0f0fb..4fcc516eb 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example5Action.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/Example5Action.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/Address.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/Address.java
index e928c64cc..371def7b6 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/Address.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/Address.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java
index d7f316d62..a0d20d903 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/EnumTypeConverter.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/EnumTypeConverter.java
index cb3df2673..6efa44cf3 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/EnumTypeConverter.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/EnumTypeConverter.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnum.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnum.java
index 3c23398ea..e9a77988f 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnum.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnum.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java
index cb0259195..2769858a3 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java
index 0b494e4ec..944db2df3 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingArrayAction.java
@@ -1,66 +1,66 @@
-/*
- * $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.fileupload;
-
-import java.io.File;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-/**
- * Showcase action - mutiple file upload using array.
- *
- * @version $Date$ $Id$
- */
-public class MultipleFileUploadUsingArrayAction extends ActionSupport {
-
-    private File[] uploads;
-    private String[] uploadFileNames;
-    private String[] uploadContentTypes;
-
-    public File[] getUpload() { return this.uploads; }
-    public void setUpload(File[] upload) { this.uploads = upload; }
-
-    public String[] getUploadFileName() { return this.uploadFileNames; }
-    public void setUploadFileName(String[] uploadFileName) { this.uploadFileNames = uploadFileName; }
-
-    public String[] getUploadContentType() { return this.uploadContentTypes; }
-    public void setUploadContentType(String[] uploadContentType) { this.uploadContentTypes = uploadContentType; }
-
-
-    public String upload() throws Exception {
-        System.out.println("\n\n upload2");
-        System.out.println("files:");
-        for (File u: uploads) {
-            System.out.println("*** "+u+"\t"+u.length());
-        }
-        System.out.println("filenames:");
-        for (String n: uploadFileNames) {
-            System.out.println("*** "+n);
-        }
-        System.out.println("content types:");
-        for (String c: uploadContentTypes) {
-            System.out.println("*** "+c);
-        }
-        System.out.println("\n\n");
-        return SUCCESS;
-    }
-
-}
+/*
+ * $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.fileupload;
+
+import java.io.File;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+/**
+ * Showcase action - mutiple file upload using array.
+ *
+ * @version $Date$ $Id$
+ */
+public class MultipleFileUploadUsingArrayAction extends ActionSupport {
+
+    private File[] uploads;
+    private String[] uploadFileNames;
+    private String[] uploadContentTypes;
+
+    public File[] getUpload() { return this.uploads; }
+    public void setUpload(File[] upload) { this.uploads = upload; }
+
+    public String[] getUploadFileName() { return this.uploadFileNames; }
+    public void setUploadFileName(String[] uploadFileName) { this.uploadFileNames = uploadFileName; }
+
+    public String[] getUploadContentType() { return this.uploadContentTypes; }
+    public void setUploadContentType(String[] uploadContentType) { this.uploadContentTypes = uploadContentType; }
+
+
+    public String upload() throws Exception {
+        System.out.println("\n\n upload2");
+        System.out.println("files:");
+        for (File u: uploads) {
+            System.out.println("*** "+u+"\t"+u.length());
+        }
+        System.out.println("filenames:");
+        for (String n: uploadFileNames) {
+            System.out.println("*** "+n);
+        }
+        System.out.println("content types:");
+        for (String c: uploadContentTypes) {
+            System.out.println("*** "+c);
+        }
+        System.out.println("\n\n");
+        return SUCCESS;
+    }
+
+}
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java
index 69124711e..2e6ea7d15 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction.java
@@ -1,83 +1,83 @@
-/*
- * $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.fileupload;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-/**
- * Showcase action - multiple file upload using List
- * @version $Date$ $Id$
- */
-public class MultipleFileUploadUsingListAction extends ActionSupport {
-
-    private List<File> uploads = new ArrayList<File>();
-    private List<String> uploadFileNames = new ArrayList<String>();
-    private List<String> uploadContentTypes = new ArrayList<String>();
-
-
-    public List<File> getUpload() {
-        return this.uploads;
-    }
-    public void setUpload(List<File> uploads) {
-        this.uploads = uploads;
-    }
-
-    public List<String> getUploadFileName() {
-        return this.uploadFileNames;
-    }
-    public void setUploadFileName(List<String> uploadFileNames) {
-        this.uploadFileNames = uploadFileNames;
-    }
-
-    public List<String> getUploadContentType() {
-        return this.uploadContentTypes;
-    }
-    public void setUploadContentType(List<String> contentTypes) {
-        this.uploadContentTypes = contentTypes;
-    }
-
-
-
-
-    public String upload() throws Exception {
-
-        System.out.println("\n\n upload1");
-        System.out.println("files:");
-        for (File u: uploads) {
-            System.out.println("*** "+u+"\t"+u.length());
-        }
-        System.out.println("filenames:");
-        for (String n: uploadFileNames) {
-            System.out.println("*** "+n);
-        }
-        System.out.println("content types:");
-        for (String c: uploadContentTypes) {
-            System.out.println("*** "+c);
-        }
-        System.out.println("\n\n");
-        return SUCCESS;
-    }
-
-
-}
+/*
+ * $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.fileupload;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+/**
+ * Showcase action - multiple file upload using List
+ * @version $Date$ $Id$
+ */
+public class MultipleFileUploadUsingListAction extends ActionSupport {
+
+    private List<File> uploads = new ArrayList<File>();
+    private List<String> uploadFileNames = new ArrayList<String>();
+    private List<String> uploadContentTypes = new ArrayList<String>();
+
+
+    public List<File> getUpload() {
+        return this.uploads;
+    }
+    public void setUpload(List<File> uploads) {
+        this.uploads = uploads;
+    }
+
+    public List<String> getUploadFileName() {
+        return this.uploadFileNames;
+    }
+    public void setUploadFileName(List<String> uploadFileNames) {
+        this.uploadFileNames = uploadFileNames;
+    }
+
+    public List<String> getUploadContentType() {
+        return this.uploadContentTypes;
+    }
+    public void setUploadContentType(List<String> contentTypes) {
+        this.uploadContentTypes = contentTypes;
+    }
+
+
+
+
+    public String upload() throws Exception {
+
+        System.out.println("\n\n upload1");
+        System.out.println("files:");
+        for (File u: uploads) {
+            System.out.println("*** "+u+"\t"+u.length());
+        }
+        System.out.println("filenames:");
+        for (String n: uploadFileNames) {
+            System.out.println("*** "+n);
+        }
+        System.out.println("content types:");
+        for (String c: uploadContentTypes) {
+            System.out.println("*** "+c);
+        }
+        System.out.println("\n\n");
+        return SUCCESS;
+    }
+
+
+}
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java
index d35a4dc95..d90b67547 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
index deded4659..5bb5c4142 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java
index bf3448e57..ab68d7e58 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java
index 95340b580..b477c5a5e 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
index 21f3d8e7f..ea546c9c6 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction-conversion.properties b/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction-conversion.properties
index 9e29b2560..fbf3d7730 100644
--- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction-conversion.properties
+++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/MultipleFileUploadUsingListAction-conversion.properties
@@ -1 +1 @@
-Element_upload=java.io.File
+Element_upload=java.io.File
diff --git a/backport/readme.html b/backport/readme.html
index d4cafcf89..602e42122 100644
--- a/backport/readme.html
+++ b/backport/readme.html
@@ -1,549 +1,549 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-    <title>Retrotranslator</title>
-</head>
-
-<body>
-<table border="0" width="98%">
-    <tr>
-        <td><h2>Retrotranslator</h2></td>
-        <td width="125" align="left"><a href="http://sourceforge.net"><img
-                src="http://sflogo.sourceforge.net/sflogo.php?group_id=153566&amp;type=2"
-                width="125" height="37" border="0" alt="SourceForge.net Logo"/></a>
-        </td>
-    </tr>
-</table>
-
-<h4>Contents</h4>
-<ol>
-    <li><a href="#what">What is Retrotranslator?</a></li>
-    <li><a href="#features">What Java 5 features are supported?</a></li>
-    <li><a href="#commandline">How to use Retrotranslator from a command line?</a></li>
-    <li><a href="#ant">How to use Retrotranslator from Apache Ant or Maven?</a></li>
-    <li><a href="#idea">How to use Retrotranslator from IntelliJ IDEA?</a></li>
-    <li><a href="#jit">How to use Just-in-Time Retrotranslator?</a></li>
-    <li><a href="#supported">What Java 5 classes and methods are supported?</a></li>
-    <li><a href="#extension">How to write an extension for Retrotranslator?</a></li>
-    <li><a href="#limitations">What are the limitations?</a></li>
-    <li><a href="#alternative">Alternative tools</a></li>
-    <li><a href="#contact">Contact</a></li>
-    <li><a href="#license">License</a></li>
-</ol>
-
-<h4><a name="what">What is Retrotranslator?</a></h4>
-<a href="http://sourceforge.net/projects/retrotranslator">Retrotranslator</a> is a Java bytecode transformer
-that translates Java classes compiled with JDK 5.0 into classes that can be run on JVM 1.4.
-It is a free, open-source tool based on the <a href="http://asm.objectweb.org/">ASM bytecode manipulation framework</a>
-and concurrency utilities
-<a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php">backported to Java 1.4</a>.
-
-<h4><a name="features">What Java 5 features are supported?</a></h4>
-<ul>
-    <li>Generics (generic types)</li>
-    <li>Annotations (metadata)</li>
-    <li>Reflection on generics and annotations</li>
-    <li>Typesafe enums (enumerated types)</li>
-    <li>Autoboxing/unboxing</li>
-    <li>Enhanced for loop (for-each loop)</li>
-    <li>Varargs (variable arguments)</li>
-    <li>Covariant return types</li>
-    <li>Static import</li>
-    <li>Concurrency utilities</li>
-    <li>Collections framework enhancements</li>
-</ul>
-
-<h4><a name="commandline">How to use Retrotranslator from a command line?</a></h4>
-<ol>
-    <li><a href="http://sourceforge.net/project/showfiles.php?group_id=153566">Download</a>
-        and unzip the binary distribution file <code>Retrotranslator-<i>n.n.n</i>-bin.zip</code>,
-        where <i>n.n.n</i> is the latest Retrotranslator release number.
-    </li>
-    <li>
-        Compile your classes with JDK 5.0 and put them into some directory, e.g. <code>myclasses</code>.
-    </li>
-    <li>
-        Go to the unzipped directory <code>Retrotranslator-<i>n.n.n</i>-bin</code> and execute:<br>
-        <code>java -jar retrotranslator-transformer-<i>n.n.n</i>.jar -srcdir myclasses</code>
-    </li>
-    <li>
-        If you use Java 5 API put <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code> and
-        <code>backport-util-concurrent.jar</code> into the classpath of your application.
-    </li>
-    <li>
-        Run or debug the application as usual on any JVM 1.4, preferably JRE 1.4.2.
-    </li>
-</ol>
-
-<p>The full command line syntax:<br>
-    <code>java -jar retrotranslator-transformer-<i>n.n.n</i>.jar &lt;options&gt;</code>
-    <br>or<br>
-    <code>java -cp retrotranslator-transformer-<i>n.n.n</i>.jar net.sf.retrotranslator.transformer.Retrotranslator &lt;options&gt;</code></p>
-<table border="1" cellspacing="0" cellpadding="5">
-    <tr><th>Option</th><th>Description</th><th>Default</th></tr>
-    <tr>
-        <td nowrap><code>-srcdir</code></td>
-        <td>Directory with classes compiled using JDK 5.0 (may be specified several times).</td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-srcjar</code></td>
-        <td>JAR file with classes compiled using JDK 5.0 (may be specified several times).</td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-destdir</code></td>
-        <td>Directory to place classes compatible with J2SE 1.4.</td>
-        <td>Location of sources</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-destjar</code></td>
-        <td>JAR file to place classes compatible with J2SE 1.4.</td>
-        <td>Location of sources</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-stripsign</code></td>
-        <td>Asks the translator to strip signature (generics) information.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-verbose</code></td>
-        <td>Asks the translator for verbose output.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-lazy</code></td>
-        <td>Asks the translator to transform only Java 5 classes.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-advanced</code></td>
-        <td>Allows to override Java 1.4 methods for better Java 5 compatibility.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-verify</code></td>
-        <td>Asks the translator for warnings when references to unknown classes, methods, or fields are found.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-classpath</code></td>
-        <td>The classpath to use for verification including <code>rt.jar</code>, <code>jce.jar</code>,
-            <code>jsse.jar</code> (from JRE 1.4), <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code>,
-            and <code>backport-util-concurrent.jar</code>.</td>
-        <td>Current classpath</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-srcmask</code></td>
-        <td>Files to translate (either bytecode or UTF-8 text) , e.g. "<code>*.class;*.tld</code>".
-            Only three special characters are supported: "<code>*?;</code>".</td>
-        <td>*.class</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-embed</code></td>
-        <td>Package name for a private copy of <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code> and
-            <code>backport-util-concurrent.jar</code> to be put into <code>-destdir</code> or <code>-destjar</code>.
-            This makes your application independent of other versions of Retrotranslator present in the classpath.
-            </td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-retainapi</code></td>
-        <td>Asks the translator to modify classes for JVM 1.4 compatibility but keep use of Java 5 API.
-            References introduced by a compiler will also remain unchanged,
-            like the use of <code>java.lang.StringBuilder</code> for string concatenation
-            or the implicit <code>valueOf</code> method call for autoboxing.</td>
-        <td>Off</td>
-    </tr>
-</table>
-<p>
-    For example, if you have a Java 5 application <code>myapplication5.jar</code> you can use the following command
-    to produce <code>myapplication4.jar</code> that will run on J2SE 1.4 and is independent of Retrotranslator,
-    since required classes are added to the translated application with a different package name:
-</p>
-<p>
-    <code>java -jar retrotranslator-transformer-<i>n.n.n</i>.jar
-    -srcjar myapplication5.jar -destjar myapplication4.jar -embed com.mycompany.internal</code><br>
-</p>
-
-<h4><a name="ant">How to use Retrotranslator from Apache Ant or Maven?</a></h4>
-
-<p>The distribution contains an integrated <a href="http://ant.apache.org/">Apache Ant</a> task
-    <code>net.sf.retrotranslator.transformer.RetrotranslatorTask</code>. It has the following syntax:</p>
-<table border="1" cellspacing="0" cellpadding="5">
-    <tr><th>Attribute</th><th>Description</th><th>Default</th></tr>
-    <tr>
-        <td><code>srcdir</code></td>
-        <td>Directory with classes compiled using JDK 5.0.</td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td><code>srcjar</code></td>
-        <td>JAR file with classes compiled using JDK 5.0.</td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td><code>destdir</code></td>
-        <td>Directory to place classes compatible with J2SE 1.4.</td>
-        <td>Location of sources</td>
-    </tr>
-    <tr>
-        <td><code>destjar</code></td>
-        <td>JAR file to place classes compatible with J2SE 1.4.</td>
-        <td>Location of sources</td>
-    </tr>
-    <tr>
-        <td><code>stripsign</code></td>
-        <td>Asks the translator to strip signature (generics) information.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td><code>verbose</code></td>
-        <td>Asks the translator for verbose output.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td><code>lazy</code></td>
-        <td>Asks the translator to transform only Java 5 classes.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td><code>advanced</code></td>
-        <td>Allows to override Java 1.4 methods for better Java 5 compatibility.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td><code>verify</code></td>
-        <td>Asks the translator for warnings when references to unknown classes, methods, or fields are found.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td><code>classpath</code></td>
-        <td>The classpath to use for verification including <code>rt.jar</code>, <code>jce.jar</code>,
-            <code>jsse.jar</code> (from JRE 1.4), <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code>,
-            and <code>backport-util-concurrent.jar</code>.
-        </td>
-        <td>Current classpath</td>
-    </tr>
-    <tr>
-        <td><code>srcmask</code></td>
-        <td>Files to translate (either bytecode or UTF-8 text) , e.g. "<code>*.class;*.tld</code>".
-            Only three special characters are supported: "<code>*?;</code>".</td>
-        <td>*.class</td>
-    </tr>
-    <tr>
-        <td><code>embed</code></td>
-        <td>Package name for a private copy of <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code> and
-            <code>backport-util-concurrent.jar</code> to be put into <code>-destdir</code> or <code>-destjar</code>.
-            This makes your application independent of other versions of Retrotranslator present in the classpath.
-            </td>
-        <td>-</td>
-    </tr>
-    <tr>
-        <td><code>retainapi</code></td>
-        <td>Asks the translator to modify classes for JVM 1.4 compatibility but keep use of Java 5 API.
-            References introduced by a compiler will also remain unchanged,
-            like the use of <code>java.lang.StringBuilder</code> for string concatenation
-            or the implicit <code>valueOf</code> method call for autoboxing.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td><code>failonwarning</code></td>
-        <td>Indicates whether the build will fail when there are verification warnings.</td>
-        <td>On</td>
-    </tr>
-</table>
-<p>
-    You may use nested <code>src</code> elements to specify source directories or JAR files, and nested
-    <code>classpath</code> elements to specify classpath for verification. For example:
-</p>
-<pre>
-    &lt;path id="classpath"&gt;
-        &lt;fileset dir="lib" includes="**/*.jar"/&gt;
-    &lt;/path&gt;
-    &lt;taskdef name="retrotranslator" classpathref="classpath"
-             classname="net.sf.retrotranslator.transformer.RetrotranslatorTask" /&gt;
-    &lt;retrotranslator destdir="build/classes14" verify="true"&gt;
-        &lt;src path="build/classes15"/&gt;
-        &lt;classpath location="${java14_home}/jre/lib/rt.jar"/&gt;
-        &lt;classpath refid="classpath"/&gt;
-    &lt;/retrotranslator&gt;
-</pre>
-<p>
-    For <a href="http://maven.apache.org/">Maven</a> there is a
-    <a href="http://mojo.codehaus.org/retrotranslator-maven-plugin/">Retrotranslator plugin</a>
-    from the <a href="http://mojo.codehaus.org/">Mojo Project</a>.
-</p>
-<h4><a name="idea">How to use Retrotranslator from IntelliJ IDEA?</a></h4>
-<p>
-    To automatically translate and verify classes compiled by <a href="http://www.jetbrains.com/idea/">IntelliJ IDEA</a>
-    you may <a href="http://plugins.intellij.net/plugin/?id=145">download a plugin</a>
-    that generates classes compatible with 1.4 virtual machines from your Java 5 source code.
-</p>
-
-<h4><a name="jit">How to use Just-in-Time Retrotranslator?</a></h4>
-
-<p>
-    JIT Retrotranslator is able to translate at runtime Java classes loaded with any classloader.
-    It works on J2SE 1.4 from Sun, IBM, BEA, and Apple, but does nothing on J2SE 5.0 and other platforms.
-    However translation at runtime consumes additional memory and processing resources and it will not
-	work if your classes make use of Java 5 API but were compiled with "<code>-target 1.4</code>".
-</p>
-<ul>
-    <li>
-        If you want to run a JAR file with the JIT, execute:<br>
-        <code>java -cp retrotranslator-transformer-<i>n.n.n</i>.jar
-            net.sf.retrotranslator.transformer.JITRetrotranslator -jar &lt;jarfile&gt; [&lt;args...&gt;]</code>
-    </li>
-    <li>
-        When the first option does not work or if you just want to run a class from your classpath, execute:<br>
-        <code>java -cp retrotranslator-transformer-<i>n.n.n</i>.jar:&lt;classpath&gt;
-            net.sf.retrotranslator.transformer.JITRetrotranslator &lt;class&gt; [&lt;args...&gt;]</code>
-    </li>
-    <li>
-        Alternatively you may simply call <code>JITRetrotranslator.install()</code> from some JVM 1.4 compatible class
-        before Java 5 classes are loaded.
-    </li>
-</ul>
-
-<h4><a name="supported">What Java 5 classes and methods are supported?</a></h4>
-<table border="1" cellspacing="0" cellpadding="5">
-    <tr><th>Package</th><th>Class</th><th>Methods and fields</th><th>Compatibility notes</th></tr>
-    <tr><td><code>java.lang.annotation</code></td><td>* (all classes)</td><td>* (all methods)</td><td>&nbsp;</td></tr>
-    <tr><td><code>java.util.concurrent,<br>java.util.concurrent.atomic,<br>java.util.concurrent.locks</code></td>
-        <td>almost all classes</td><td>almost all methods</td>
-        <td>
-            <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php"> Backport of JSR 166</a><br>
-            <code>Condition.awaitNanos(long)</code> method is supported but with
-        <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/doc/api/edu/emory/mathcs/backport/java/util/concurrent/helpers/Utils.html#awaitNanos(edu.emory.mathcs.backport.java.util.concurrent.locks.Condition, long)">
-        very little</a> accuracy guarantees.
-        </td></tr>
-    <tr><td rowspan="6"><code>java.io</code></td><td><code>Closeable</code></td><td><code>*</code></td><td>
-            <code>new Closeable[...]</code> is replaced with <code>new Object[...]</code>
-        </td></tr>
-    <tr><td><code>Flushable</code></td><td><code>*</code></td><td>
-            <code>new Flushable[...]</code> is replaced with <code>new Object[...]</code>
-        </td></tr>
-    <tr><td><code>PrintStream</code></td><td>
-        <code>append(CharSequence), append(CharSequence, int, int), append(char)</code>
-        </td><td>&nbsp;</td></tr>
-    <tr><td><code>PrintWriter</code></td><td>
-        <code>PrintWriter(File), PrintWriter(File, String), PrintWriter(String), PrintWriter(String, String)</code>
-        </td><td>&nbsp;</td></tr>
-    <tr><td><code>Reader</code></td><td><code>read(CharBuffer)</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>Writer</code></td><td>
-        <code>append(CharSequence), append(CharSequence, int, int), append(char)</code>
-        </td><td>&nbsp;</td></tr>
-    <tr><td rowspan="24"><code>java.lang</code></td><td><code>Appendable</code></td><td>*
-    </td><td>
-        <code>new Appendable[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
-    <tr><td><code>Boolean</code></td><td><code>parseBoolean(String), compareTo(Boolean)</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>Byte</code></td><td><code>valueOf(byte)</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>Character</code></td><td><code>valueOf(char)</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>Class</code></td><td>* (21 new methods)</td><td>
-        <code>Class.getMethod(String, Class...)</code> and <code>Class.getDeclaredMethod(String, Class...)</code> are
-        intercepted in advanced mode to better support generics and covariant return types on several JVM implementations.
-    </td></tr>
-    <tr><td><code>Deprecated</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>Double</code></td><td><code>valueOf(double)</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>Enum</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>Float</code></td><td><code>valueOf(float)</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>IllegalArgumentException</code></td><td><code>IllegalArgumentException(String, Throwable),<br>
-        IllegalArgumentException(Throwable)</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>IllegalStateException</code></td><td><code>IllegalStateException(String, Throwable),<br>
-        IllegalStateException(Throwable)</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>Integer</code></td><td><code>valueOf(int)</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>Iterable</code></td><td>*</td><td>
-        <code>new Iterable[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
-    <tr><td><code>Long</code></td><td><code>valueOf(long)</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>Package</code></td><td>* (4 new methods)</td><td>&nbsp;</td></tr>
-    <tr><td><code>Readable</code></td><td>*</td><td>
-        <code>new Readable[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
-    <tr><td><code>Short</code></td><td><code>valueOf(short)</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>String</code></td><td><code>contains(CharSequence),<br> contentEquals(CharSequence),<br>
-        replace(CharSequence, CharSequence)</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>StringBuffer</code></td><td><code>
-        StringBuffer(CharSequence), append(CharSequence), append(CharSequence, int, int),
-        insert(int, CharSequence), insert(int, CharSequence, int, int)
-    </code></td><td>&nbsp;</td></tr>
-    <tr><td><code>StringBuilder</code></td><td>
-        All methods supported in <code>StringBuffer</code>
-    </td><td><code>StringBuilder</code> is replaced with <code>StringBuffer</code></td></tr>
-    <tr><td><code>SuppressWarnings</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>System</code></td><td><code>nanoTime(), clearProperty(String)</code></td><td>
-        <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php"> Backport of JSR 166</a><br>
-        <code>System.nanoTime()</code> method precision
-        <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/doc/api/edu/emory/mathcs/backport/java/util/concurrent/helpers/Utils.html#nanoTime()">
-            may vary</a> on different platforms.
-    </td></tr>
-    <tr><td><code>Thread</code></td><td><code>getStackTrace(), getId()
-    </code></td><td><code>Thread.getStackTrace()</code> returns non-empty stack trace only for the current thread;<br>
-        <code>Thread.getId()</code> does not reflect the order in which threads are created.</td></tr>
-    <tr><td><code>TypeNotPresentException</code></td><td>*</td><td>&nbsp;</td></tr>
-
-    <tr><td rowspan="12"><code>java.lang.reflect</code></td><td><code>AnnotatedElement</code></td><td>*</td><td>
-        <code>new AnnotatedElement[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
-    <tr><td><code>Constructor</code></td><td>* (11 new methods)</td><td>&nbsp;</td></tr>
-    <tr><td><code>Field</code></td><td>* (8 new methods)</td><td>&nbsp;</td></tr>
-    <tr><td><code>GenericArrayType</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>GenericDeclaration</code></td><td>*</td><td>
-        <code>new GenericDeclaration[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
-    <tr><td><code>GenericSignatureFormatError</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>MalformedParameterizedTypeException</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>Method</code></td><td>* (14 new methods)</td><td>&nbsp;</td></tr>
-    <tr><td><code>ParameterizedType</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>Type</code></td><td>*</td><td>
-        <code>new Type[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
-    <tr><td><code>TypeVariable</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>WildcardType</code></td><td>*</td><td>&nbsp;</td></tr>
-
-    <tr><td ><code>java.math</code></td><td><code>BigDecimal</code></td><td>
-        <code>BigDecimal(int), BigDecimal(long), ZERO, ONE, TEN, divideAndRemainder(BigDecimal),
-            divideToIntegralValue(BigDecimal), pow(int), remainder(BigDecimal), toPlainString(), valueOf(double),
-            valueOf(long)</code></td><td><code>BigDecimal.setScale(int, int)</code> supports negative scales in advanced mode.</td></tr>
-
-    <tr><td ><code>java.rmi.server</code></td><td><code>RemoteObjectInvocationHandler</code></td>
-        <td>*</td><td>&nbsp;</td></tr>
-
-    <tr><td><code>java.util.nio</code></td><td><code>CharBuffer</code></td><td>
-        <code>append(CharSequence), append(CharSequence, int, int), append(char), read(CharBuffer)</code>
-        </td><td>&nbsp;</td></tr>
-
-    <tr><td rowspan="9"><code>java.util</code></td><td><code>AbstractQueue</code></td><td>*</td><td>
-        &nbsp;</td></tr>
-    <tr><td><code>Arrays</code></td><td>* (21 new methods)</td><td>&nbsp;</td></tr>
-    <tr><td><code>Collections</code></td><td>* (13 new methods)</td><td>
-        <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php"> Backport of JSR 166</a>
-    </td></tr>
-    <tr><td><code>EnumMap</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>EnumSet</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>LinkedList</code></td><td>* (5 new methods)</td><td>&nbsp;</td></tr>
-    <tr><td><code>PriorityQueue</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>Queue</code></td><td>*</td><td>
-        <code>new Queue[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
-    <tr><td><code>UUID</code></td><td>*</td><td>&nbsp;</td></tr>
-
-    <tr><td rowspan="3"><code>java.util.regex</code></td><td><code>Matcher</code></td><td>
-        <code>quoteReplacement(String), toMatchResult()</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>MatchResult</code></td><td>*</td><td>
-        <code>new MatchResult[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
-    <tr><td><code>Pattern</code></td><td><code>quote(String)</code></td><td>&nbsp;</td></tr>
-</table>
-
-<h4><a name="extension">How to write an extension for Retrotranslator?</a></h4>
-
-<p>
-    Since most backported classes are discovered by Retrotranslator at translation time,
-    you may write an extension and simply put it into the Retrotranslator classpath to make it work.
-    For example, all references to
-    <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/EnumSet.html"><code>java.util.EnumSet</code></a>
-    are replaced with references to
-    <a href="http://cvs.sourceforge.net/viewcvs.py/retrotranslator/Retrotranslator/src/net/sf/retrotranslator/runtime/java/util/EnumSet_.java?view=markup">
-    <code>net.sf.retrotranslator.runtime.java.util.EnumSet<b>_</b></code></a> (trailing underscore) if the latter can be found.
-    But if you replace a whole class that exists in J2SE 1.4 you may encounter interoperability issues with other libraries.
-    So, for example, support for Java 5 fields, methods, and constructors of
-    <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/math/BigDecimal.html"><code>java.math.BigDecimal</code></a> is placed into
-
-    <a href="http://cvs.sourceforge.net/viewcvs.py/retrotranslator/Retrotranslator/src/net/sf/retrotranslator/runtime/java/math/_BigDecimal.java?view=markup">
-    <code>net.sf.retrotranslator.runtime.java.math.<b>_</b>BigDecimal</code></a> (leading underscore):
-</p>
-    <ul>
-        <li>For a static field there is a public static field with the same name and type.</li>
-        <li>For a static method there is a public static method with the same signature.</li>
-        <li>For an instance method there is a public static method with the same signature
-            but with an additional first parameter representing an instance.</li>
-        <li>For a constructor there is a public static <code>convertConstructorArguments</code> method that
-            accepts constructor's arguments an returns an argument for a Java 1.4 constuctor.</li>
-   </ul>
-<p>
-    However, if the backported methods require access
-    to non-public methods or fields of the instance, they cannot be fully handled by Retrotranslator.
-    While you can use reflection to access any data, translated code generally should not depend on security settings.
-    For example, it is impossible to write an implementation for methods <code>getSource()</code>
-    and <code>setSource()</code> of <code>java.beans.PropertyEditorSupport</code> that will work in any environment.
-    Also this approach cannot be used to replace instance field references.
-</p>
-<p>
-    If you have written an extension that does not contain copyrighted code, you may send
-    a <a href="http://sourceforge.net/tracker/?group_id=153566&atid=788281">patch</a>
-    under the <a href="#license">Retrotranslator license</a>.
-</p>
-
-<h4><a name="limitations">What are the limitations?</a></h4>
-
-<p>
-    Basically, only classes, methods, and fields listed <a href="#supported">above</a> should work, and other features,
-    like formatted input/output, are not supported. Known issues:
-</p>
-<ul>
-    <li>Reflection-based tools may be unable to discover additional classes and methods introduced in Java 5 when running on JRE 1.4.</li>
-    <li>Translated code running on JRE 5.0 may be incompatible with other Java 5 code when Java 5 API is used.</li>
-    <li>Reflection on generics and metadata may return incomplete information for dynamically generated classes.</li>
-    <li>Access modifiers and constants inlined by a compiler are ignored during the verification.</li>
-    <li>Upcasting may help to translate invocations of inherited methods introduced in Java 5: <br>
-        <code>&nbsp;((Writer) new FileWriter("file.tmp")).append("Hello").close();</code></li>
-    <li>Serialized objects produced by translated code may be incompatible with JRE 5.0.</li>
-</ul>
-
-<h4><a name="alternative">Alternative tools</a></h4>
-<ul>
-    <li><a href="http://retroweaver.sourceforge.net/">Retroweaver</a>
-        - a Java bytecode weaver that enables you to take advantage
-        of the new 1.5 language features in your source code,
-        while still retaining compatibility with 1.4 virtual machines.</li>
-    <li><a href="http://tinyurl.com/r8xba">Declawer</a>
-        - a customized Java compiler which reduces 1.5 Generics to equivalent 1.4 syntax.</li>
-</ul>
-
-<h4><a name="contact">Contact</a></h4>
-<ul>
-    <li><a href="http://retrotranslator.sourceforge.net/">Latest documentation</a></li>
-    <li><a href="http://sourceforge.net/forum/forum.php?forum_id=513539">Open discussion</a></li>
-    <li><a href="http://sourceforge.net/forum/forum.php?forum_id=513540">Help</a></li>
-    <li><a href="http://sourceforge.net/tracker/?group_id=153566&atid=788279">Bugs</a></li>
-    <li><a href="http://sourceforge.net/tracker/?group_id=153566&atid=788282">Feature requests</a></li>
-    <li><a href="http://sourceforge.net/users/tarasp/">Author</a></li>
-</ul>
-
-<h4><a name="license">License</a></h4>
-<pre>
-    Retrotranslator: a Java bytecode transformer that translates Java classes
-    compiled with JDK 5.0 into classes that can be run on JVM 1.4.
-
-    Copyright (c) 2005, 2006 Taras Puchko
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-    1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-    3. Neither the name of the copyright holders nor the names of its
-       contributors may be used to endorse or promote products derived from
-       this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-    THE POSSIBILITY OF SUCH DAMAGE.
-</pre>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+    <title>Retrotranslator</title>
+</head>
+
+<body>
+<table border="0" width="98%">
+    <tr>
+        <td><h2>Retrotranslator</h2></td>
+        <td width="125" align="left"><a href="http://sourceforge.net"><img
+                src="http://sflogo.sourceforge.net/sflogo.php?group_id=153566&amp;type=2"
+                width="125" height="37" border="0" alt="SourceForge.net Logo"/></a>
+        </td>
+    </tr>
+</table>
+
+<h4>Contents</h4>
+<ol>
+    <li><a href="#what">What is Retrotranslator?</a></li>
+    <li><a href="#features">What Java 5 features are supported?</a></li>
+    <li><a href="#commandline">How to use Retrotranslator from a command line?</a></li>
+    <li><a href="#ant">How to use Retrotranslator from Apache Ant or Maven?</a></li>
+    <li><a href="#idea">How to use Retrotranslator from IntelliJ IDEA?</a></li>
+    <li><a href="#jit">How to use Just-in-Time Retrotranslator?</a></li>
+    <li><a href="#supported">What Java 5 classes and methods are supported?</a></li>
+    <li><a href="#extension">How to write an extension for Retrotranslator?</a></li>
+    <li><a href="#limitations">What are the limitations?</a></li>
+    <li><a href="#alternative">Alternative tools</a></li>
+    <li><a href="#contact">Contact</a></li>
+    <li><a href="#license">License</a></li>
+</ol>
+
+<h4><a name="what">What is Retrotranslator?</a></h4>
+<a href="http://sourceforge.net/projects/retrotranslator">Retrotranslator</a> is a Java bytecode transformer
+that translates Java classes compiled with JDK 5.0 into classes that can be run on JVM 1.4.
+It is a free, open-source tool based on the <a href="http://asm.objectweb.org/">ASM bytecode manipulation framework</a>
+and concurrency utilities
+<a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php">backported to Java 1.4</a>.
+
+<h4><a name="features">What Java 5 features are supported?</a></h4>
+<ul>
+    <li>Generics (generic types)</li>
+    <li>Annotations (metadata)</li>
+    <li>Reflection on generics and annotations</li>
+    <li>Typesafe enums (enumerated types)</li>
+    <li>Autoboxing/unboxing</li>
+    <li>Enhanced for loop (for-each loop)</li>
+    <li>Varargs (variable arguments)</li>
+    <li>Covariant return types</li>
+    <li>Static import</li>
+    <li>Concurrency utilities</li>
+    <li>Collections framework enhancements</li>
+</ul>
+
+<h4><a name="commandline">How to use Retrotranslator from a command line?</a></h4>
+<ol>
+    <li><a href="http://sourceforge.net/project/showfiles.php?group_id=153566">Download</a>
+        and unzip the binary distribution file <code>Retrotranslator-<i>n.n.n</i>-bin.zip</code>,
+        where <i>n.n.n</i> is the latest Retrotranslator release number.
+    </li>
+    <li>
+        Compile your classes with JDK 5.0 and put them into some directory, e.g. <code>myclasses</code>.
+    </li>
+    <li>
+        Go to the unzipped directory <code>Retrotranslator-<i>n.n.n</i>-bin</code> and execute:<br>
+        <code>java -jar retrotranslator-transformer-<i>n.n.n</i>.jar -srcdir myclasses</code>
+    </li>
+    <li>
+        If you use Java 5 API put <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code> and
+        <code>backport-util-concurrent.jar</code> into the classpath of your application.
+    </li>
+    <li>
+        Run or debug the application as usual on any JVM 1.4, preferably JRE 1.4.2.
+    </li>
+</ol>
+
+<p>The full command line syntax:<br>
+    <code>java -jar retrotranslator-transformer-<i>n.n.n</i>.jar &lt;options&gt;</code>
+    <br>or<br>
+    <code>java -cp retrotranslator-transformer-<i>n.n.n</i>.jar net.sf.retrotranslator.transformer.Retrotranslator &lt;options&gt;</code></p>
+<table border="1" cellspacing="0" cellpadding="5">
+    <tr><th>Option</th><th>Description</th><th>Default</th></tr>
+    <tr>
+        <td nowrap><code>-srcdir</code></td>
+        <td>Directory with classes compiled using JDK 5.0 (may be specified several times).</td>
+        <td>-</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-srcjar</code></td>
+        <td>JAR file with classes compiled using JDK 5.0 (may be specified several times).</td>
+        <td>-</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-destdir</code></td>
+        <td>Directory to place classes compatible with J2SE 1.4.</td>
+        <td>Location of sources</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-destjar</code></td>
+        <td>JAR file to place classes compatible with J2SE 1.4.</td>
+        <td>Location of sources</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-stripsign</code></td>
+        <td>Asks the translator to strip signature (generics) information.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-verbose</code></td>
+        <td>Asks the translator for verbose output.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-lazy</code></td>
+        <td>Asks the translator to transform only Java 5 classes.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-advanced</code></td>
+        <td>Allows to override Java 1.4 methods for better Java 5 compatibility.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-verify</code></td>
+        <td>Asks the translator for warnings when references to unknown classes, methods, or fields are found.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-classpath</code></td>
+        <td>The classpath to use for verification including <code>rt.jar</code>, <code>jce.jar</code>,
+            <code>jsse.jar</code> (from JRE 1.4), <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code>,
+            and <code>backport-util-concurrent.jar</code>.</td>
+        <td>Current classpath</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-srcmask</code></td>
+        <td>Files to translate (either bytecode or UTF-8 text) , e.g. "<code>*.class;*.tld</code>".
+            Only three special characters are supported: "<code>*?;</code>".</td>
+        <td>*.class</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-embed</code></td>
+        <td>Package name for a private copy of <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code> and
+            <code>backport-util-concurrent.jar</code> to be put into <code>-destdir</code> or <code>-destjar</code>.
+            This makes your application independent of other versions of Retrotranslator present in the classpath.
+            </td>
+        <td>-</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-retainapi</code></td>
+        <td>Asks the translator to modify classes for JVM 1.4 compatibility but keep use of Java 5 API.
+            References introduced by a compiler will also remain unchanged,
+            like the use of <code>java.lang.StringBuilder</code> for string concatenation
+            or the implicit <code>valueOf</code> method call for autoboxing.</td>
+        <td>Off</td>
+    </tr>
+</table>
+<p>
+    For example, if you have a Java 5 application <code>myapplication5.jar</code> you can use the following command
+    to produce <code>myapplication4.jar</code> that will run on J2SE 1.4 and is independent of Retrotranslator,
+    since required classes are added to the translated application with a different package name:
+</p>
+<p>
+    <code>java -jar retrotranslator-transformer-<i>n.n.n</i>.jar
+    -srcjar myapplication5.jar -destjar myapplication4.jar -embed com.mycompany.internal</code><br>
+</p>
+
+<h4><a name="ant">How to use Retrotranslator from Apache Ant or Maven?</a></h4>
+
+<p>The distribution contains an integrated <a href="http://ant.apache.org/">Apache Ant</a> task
+    <code>net.sf.retrotranslator.transformer.RetrotranslatorTask</code>. It has the following syntax:</p>
+<table border="1" cellspacing="0" cellpadding="5">
+    <tr><th>Attribute</th><th>Description</th><th>Default</th></tr>
+    <tr>
+        <td><code>srcdir</code></td>
+        <td>Directory with classes compiled using JDK 5.0.</td>
+        <td>-</td>
+    </tr>
+    <tr>
+        <td><code>srcjar</code></td>
+        <td>JAR file with classes compiled using JDK 5.0.</td>
+        <td>-</td>
+    </tr>
+    <tr>
+        <td><code>destdir</code></td>
+        <td>Directory to place classes compatible with J2SE 1.4.</td>
+        <td>Location of sources</td>
+    </tr>
+    <tr>
+        <td><code>destjar</code></td>
+        <td>JAR file to place classes compatible with J2SE 1.4.</td>
+        <td>Location of sources</td>
+    </tr>
+    <tr>
+        <td><code>stripsign</code></td>
+        <td>Asks the translator to strip signature (generics) information.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td><code>verbose</code></td>
+        <td>Asks the translator for verbose output.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td><code>lazy</code></td>
+        <td>Asks the translator to transform only Java 5 classes.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td><code>advanced</code></td>
+        <td>Allows to override Java 1.4 methods for better Java 5 compatibility.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td><code>verify</code></td>
+        <td>Asks the translator for warnings when references to unknown classes, methods, or fields are found.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td><code>classpath</code></td>
+        <td>The classpath to use for verification including <code>rt.jar</code>, <code>jce.jar</code>,
+            <code>jsse.jar</code> (from JRE 1.4), <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code>,
+            and <code>backport-util-concurrent.jar</code>.
+        </td>
+        <td>Current classpath</td>
+    </tr>
+    <tr>
+        <td><code>srcmask</code></td>
+        <td>Files to translate (either bytecode or UTF-8 text) , e.g. "<code>*.class;*.tld</code>".
+            Only three special characters are supported: "<code>*?;</code>".</td>
+        <td>*.class</td>
+    </tr>
+    <tr>
+        <td><code>embed</code></td>
+        <td>Package name for a private copy of <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code> and
+            <code>backport-util-concurrent.jar</code> to be put into <code>-destdir</code> or <code>-destjar</code>.
+            This makes your application independent of other versions of Retrotranslator present in the classpath.
+            </td>
+        <td>-</td>
+    </tr>
+    <tr>
+        <td><code>retainapi</code></td>
+        <td>Asks the translator to modify classes for JVM 1.4 compatibility but keep use of Java 5 API.
+            References introduced by a compiler will also remain unchanged,
+            like the use of <code>java.lang.StringBuilder</code> for string concatenation
+            or the implicit <code>valueOf</code> method call for autoboxing.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td><code>failonwarning</code></td>
+        <td>Indicates whether the build will fail when there are verification warnings.</td>
+        <td>On</td>
+    </tr>
+</table>
+<p>
+    You may use nested <code>src</code> elements to specify source directories or JAR files, and nested
+    <code>classpath</code> elements to specify classpath for verification. For example:
+</p>
+<pre>
+    &lt;path id="classpath"&gt;
+        &lt;fileset dir="lib" includes="**/*.jar"/&gt;
+    &lt;/path&gt;
+    &lt;taskdef name="retrotranslator" classpathref="classpath"
+             classname="net.sf.retrotranslator.transformer.RetrotranslatorTask" /&gt;
+    &lt;retrotranslator destdir="build/classes14" verify="true"&gt;
+        &lt;src path="build/classes15"/&gt;
+        &lt;classpath location="${java14_home}/jre/lib/rt.jar"/&gt;
+        &lt;classpath refid="classpath"/&gt;
+    &lt;/retrotranslator&gt;
+</pre>
+<p>
+    For <a href="http://maven.apache.org/">Maven</a> there is a
+    <a href="http://mojo.codehaus.org/retrotranslator-maven-plugin/">Retrotranslator plugin</a>
+    from the <a href="http://mojo.codehaus.org/">Mojo Project</a>.
+</p>
+<h4><a name="idea">How to use Retrotranslator from IntelliJ IDEA?</a></h4>
+<p>
+    To automatically translate and verify classes compiled by <a href="http://www.jetbrains.com/idea/">IntelliJ IDEA</a>
+    you may <a href="http://plugins.intellij.net/plugin/?id=145">download a plugin</a>
+    that generates classes compatible with 1.4 virtual machines from your Java 5 source code.
+</p>
+
+<h4><a name="jit">How to use Just-in-Time Retrotranslator?</a></h4>
+
+<p>
+    JIT Retrotranslator is able to translate at runtime Java classes loaded with any classloader.
+    It works on J2SE 1.4 from Sun, IBM, BEA, and Apple, but does nothing on J2SE 5.0 and other platforms.
+    However translation at runtime consumes additional memory and processing resources and it will not
+	work if your classes make use of Java 5 API but were compiled with "<code>-target 1.4</code>".
+</p>
+<ul>
+    <li>
+        If you want to run a JAR file with the JIT, execute:<br>
+        <code>java -cp retrotranslator-transformer-<i>n.n.n</i>.jar
+            net.sf.retrotranslator.transformer.JITRetrotranslator -jar &lt;jarfile&gt; [&lt;args...&gt;]</code>
+    </li>
+    <li>
+        When the first option does not work or if you just want to run a class from your classpath, execute:<br>
+        <code>java -cp retrotranslator-transformer-<i>n.n.n</i>.jar:&lt;classpath&gt;
+            net.sf.retrotranslator.transformer.JITRetrotranslator &lt;class&gt; [&lt;args...&gt;]</code>
+    </li>
+    <li>
+        Alternatively you may simply call <code>JITRetrotranslator.install()</code> from some JVM 1.4 compatible class
+        before Java 5 classes are loaded.
+    </li>
+</ul>
+
+<h4><a name="supported">What Java 5 classes and methods are supported?</a></h4>
+<table border="1" cellspacing="0" cellpadding="5">
+    <tr><th>Package</th><th>Class</th><th>Methods and fields</th><th>Compatibility notes</th></tr>
+    <tr><td><code>java.lang.annotation</code></td><td>* (all classes)</td><td>* (all methods)</td><td>&nbsp;</td></tr>
+    <tr><td><code>java.util.concurrent,<br>java.util.concurrent.atomic,<br>java.util.concurrent.locks</code></td>
+        <td>almost all classes</td><td>almost all methods</td>
+        <td>
+            <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php"> Backport of JSR 166</a><br>
+            <code>Condition.awaitNanos(long)</code> method is supported but with
+        <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/doc/api/edu/emory/mathcs/backport/java/util/concurrent/helpers/Utils.html#awaitNanos(edu.emory.mathcs.backport.java.util.concurrent.locks.Condition, long)">
+        very little</a> accuracy guarantees.
+        </td></tr>
+    <tr><td rowspan="6"><code>java.io</code></td><td><code>Closeable</code></td><td><code>*</code></td><td>
+            <code>new Closeable[...]</code> is replaced with <code>new Object[...]</code>
+        </td></tr>
+    <tr><td><code>Flushable</code></td><td><code>*</code></td><td>
+            <code>new Flushable[...]</code> is replaced with <code>new Object[...]</code>
+        </td></tr>
+    <tr><td><code>PrintStream</code></td><td>
+        <code>append(CharSequence), append(CharSequence, int, int), append(char)</code>
+        </td><td>&nbsp;</td></tr>
+    <tr><td><code>PrintWriter</code></td><td>
+        <code>PrintWriter(File), PrintWriter(File, String), PrintWriter(String), PrintWriter(String, String)</code>
+        </td><td>&nbsp;</td></tr>
+    <tr><td><code>Reader</code></td><td><code>read(CharBuffer)</code></td><td>&nbsp;</td></tr>
+    <tr><td><code>Writer</code></td><td>
+        <code>append(CharSequence), append(CharSequence, int, int), append(char)</code>
+        </td><td>&nbsp;</td></tr>
+    <tr><td rowspan="24"><code>java.lang</code></td><td><code>Appendable</code></td><td>*
+    </td><td>
+        <code>new Appendable[...]</code> is replaced with <code>new Object[...]</code>
+    </td></tr>
+    <tr><td><code>Boolean</code></td><td><code>parseBoolean(String), compareTo(Boolean)</code></td><td>&nbsp;</td></tr>
+    <tr><td><code>Byte</code></td><td><code>valueOf(byte)</code></td><td>&nbsp;</td></tr>
+    <tr><td><code>Character</code></td><td><code>valueOf(char)</code></td><td>&nbsp;</td></tr>
+    <tr><td><code>Class</code></td><td>* (21 new methods)</td><td>
+        <code>Class.getMethod(String, Class...)</code> and <code>Class.getDeclaredMethod(String, Class...)</code> are
+        intercepted in advanced mode to better support generics and covariant return types on several JVM implementations.
+    </td></tr>
+    <tr><td><code>Deprecated</code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td><code>Double</code></td><td><code>valueOf(double)</code></td><td>&nbsp;</td></tr>
+    <tr><td><code>Enum</code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td><code>Float</code></td><td><code>valueOf(float)</code></td><td>&nbsp;</td></tr>
+    <tr><td><code>IllegalArgumentException</code></td><td><code>IllegalArgumentException(String, Throwable),<br>
+        IllegalArgumentException(Throwable)</code></td><td>&nbsp;</td></tr>
+    <tr><td><code>IllegalStateException</code></td><td><code>IllegalStateException(String, Throwable),<br>
+        IllegalStateException(Throwable)</code></td><td>&nbsp;</td></tr>
+    <tr><td><code>Integer</code></td><td><code>valueOf(int)</code></td><td>&nbsp;</td></tr>
+    <tr><td><code>Iterable</code></td><td>*</td><td>
+        <code>new Iterable[...]</code> is replaced with <code>new Object[...]</code>
+    </td></tr>
+    <tr><td><code>Long</code></td><td><code>valueOf(long)</code></td><td>&nbsp;</td></tr>
+    <tr><td><code>Package</code></td><td>* (4 new methods)</td><td>&nbsp;</td></tr>
+    <tr><td><code>Readable</code></td><td>*</td><td>
+        <code>new Readable[...]</code> is replaced with <code>new Object[...]</code>
+    </td></tr>
+    <tr><td><code>Short</code></td><td><code>valueOf(short)</code></td><td>&nbsp;</td></tr>
+    <tr><td><code>String</code></td><td><code>contains(CharSequence),<br> contentEquals(CharSequence),<br>
+        replace(CharSequence, CharSequence)</code></td><td>&nbsp;</td></tr>
+    <tr><td><code>StringBuffer</code></td><td><code>
+        StringBuffer(CharSequence), append(CharSequence), append(CharSequence, int, int),
+        insert(int, CharSequence), insert(int, CharSequence, int, int)
+    </code></td><td>&nbsp;</td></tr>
+    <tr><td><code>StringBuilder</code></td><td>
+        All methods supported in <code>StringBuffer</code>
+    </td><td><code>StringBuilder</code> is replaced with <code>StringBuffer</code></td></tr>
+    <tr><td><code>SuppressWarnings</code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td><code>System</code></td><td><code>nanoTime(), clearProperty(String)</code></td><td>
+        <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php"> Backport of JSR 166</a><br>
+        <code>System.nanoTime()</code> method precision
+        <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/doc/api/edu/emory/mathcs/backport/java/util/concurrent/helpers/Utils.html#nanoTime()">
+            may vary</a> on different platforms.
+    </td></tr>
+    <tr><td><code>Thread</code></td><td><code>getStackTrace(), getId()
+    </code></td><td><code>Thread.getStackTrace()</code> returns non-empty stack trace only for the current thread;<br>
+        <code>Thread.getId()</code> does not reflect the order in which threads are created.</td></tr>
+    <tr><td><code>TypeNotPresentException</code></td><td>*</td><td>&nbsp;</td></tr>
+
+    <tr><td rowspan="12"><code>java.lang.reflect</code></td><td><code>AnnotatedElement</code></td><td>*</td><td>
+        <code>new AnnotatedElement[...]</code> is replaced with <code>new Object[...]</code>
+    </td></tr>
+    <tr><td><code>Constructor</code></td><td>* (11 new methods)</td><td>&nbsp;</td></tr>
+    <tr><td><code>Field</code></td><td>* (8 new methods)</td><td>&nbsp;</td></tr>
+    <tr><td><code>GenericArrayType</code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td><code>GenericDeclaration</code></td><td>*</td><td>
+        <code>new GenericDeclaration[...]</code> is replaced with <code>new Object[...]</code>
+    </td></tr>
+    <tr><td><code>GenericSignatureFormatError</code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td><code>MalformedParameterizedTypeException</code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td><code>Method</code></td><td>* (14 new methods)</td><td>&nbsp;</td></tr>
+    <tr><td><code>ParameterizedType</code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td><code>Type</code></td><td>*</td><td>
+        <code>new Type[...]</code> is replaced with <code>new Object[...]</code>
+    </td></tr>
+    <tr><td><code>TypeVariable</code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td><code>WildcardType</code></td><td>*</td><td>&nbsp;</td></tr>
+
+    <tr><td ><code>java.math</code></td><td><code>BigDecimal</code></td><td>
+        <code>BigDecimal(int), BigDecimal(long), ZERO, ONE, TEN, divideAndRemainder(BigDecimal),
+            divideToIntegralValue(BigDecimal), pow(int), remainder(BigDecimal), toPlainString(), valueOf(double),
+            valueOf(long)</code></td><td><code>BigDecimal.setScale(int, int)</code> supports negative scales in advanced mode.</td></tr>
+
+    <tr><td ><code>java.rmi.server</code></td><td><code>RemoteObjectInvocationHandler</code></td>
+        <td>*</td><td>&nbsp;</td></tr>
+
+    <tr><td><code>java.util.nio</code></td><td><code>CharBuffer</code></td><td>
+        <code>append(CharSequence), append(CharSequence, int, int), append(char), read(CharBuffer)</code>
+        </td><td>&nbsp;</td></tr>
+
+    <tr><td rowspan="9"><code>java.util</code></td><td><code>AbstractQueue</code></td><td>*</td><td>
+        &nbsp;</td></tr>
+    <tr><td><code>Arrays</code></td><td>* (21 new methods)</td><td>&nbsp;</td></tr>
+    <tr><td><code>Collections</code></td><td>* (13 new methods)</td><td>
+        <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php"> Backport of JSR 166</a>
+    </td></tr>
+    <tr><td><code>EnumMap</code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td><code>EnumSet</code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td><code>LinkedList</code></td><td>* (5 new methods)</td><td>&nbsp;</td></tr>
+    <tr><td><code>PriorityQueue</code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td><code>Queue</code></td><td>*</td><td>
+        <code>new Queue[...]</code> is replaced with <code>new Object[...]</code>
+    </td></tr>
+    <tr><td><code>UUID</code></td><td>*</td><td>&nbsp;</td></tr>
+
+    <tr><td rowspan="3"><code>java.util.regex</code></td><td><code>Matcher</code></td><td>
+        <code>quoteReplacement(String), toMatchResult()</code></td><td>&nbsp;</td></tr>
+    <tr><td><code>MatchResult</code></td><td>*</td><td>
+        <code>new MatchResult[...]</code> is replaced with <code>new Object[...]</code>
+    </td></tr>
+    <tr><td><code>Pattern</code></td><td><code>quote(String)</code></td><td>&nbsp;</td></tr>
+</table>
+
+<h4><a name="extension">How to write an extension for Retrotranslator?</a></h4>
+
+<p>
+    Since most backported classes are discovered by Retrotranslator at translation time,
+    you may write an extension and simply put it into the Retrotranslator classpath to make it work.
+    For example, all references to
+    <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/EnumSet.html"><code>java.util.EnumSet</code></a>
+    are replaced with references to
+    <a href="http://cvs.sourceforge.net/viewcvs.py/retrotranslator/Retrotranslator/src/net/sf/retrotranslator/runtime/java/util/EnumSet_.java?view=markup">
+    <code>net.sf.retrotranslator.runtime.java.util.EnumSet<b>_</b></code></a> (trailing underscore) if the latter can be found.
+    But if you replace a whole class that exists in J2SE 1.4 you may encounter interoperability issues with other libraries.
+    So, for example, support for Java 5 fields, methods, and constructors of
+    <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/math/BigDecimal.html"><code>java.math.BigDecimal</code></a> is placed into
+
+    <a href="http://cvs.sourceforge.net/viewcvs.py/retrotranslator/Retrotranslator/src/net/sf/retrotranslator/runtime/java/math/_BigDecimal.java?view=markup">
+    <code>net.sf.retrotranslator.runtime.java.math.<b>_</b>BigDecimal</code></a> (leading underscore):
+</p>
+    <ul>
+        <li>For a static field there is a public static field with the same name and type.</li>
+        <li>For a static method there is a public static method with the same signature.</li>
+        <li>For an instance method there is a public static method with the same signature
+            but with an additional first parameter representing an instance.</li>
+        <li>For a constructor there is a public static <code>convertConstructorArguments</code> method that
+            accepts constructor's arguments an returns an argument for a Java 1.4 constuctor.</li>
+   </ul>
+<p>
+    However, if the backported methods require access
+    to non-public methods or fields of the instance, they cannot be fully handled by Retrotranslator.
+    While you can use reflection to access any data, translated code generally should not depend on security settings.
+    For example, it is impossible to write an implementation for methods <code>getSource()</code>
+    and <code>setSource()</code> of <code>java.beans.PropertyEditorSupport</code> that will work in any environment.
+    Also this approach cannot be used to replace instance field references.
+</p>
+<p>
+    If you have written an extension that does not contain copyrighted code, you may send
+    a <a href="http://sourceforge.net/tracker/?group_id=153566&atid=788281">patch</a>
+    under the <a href="#license">Retrotranslator license</a>.
+</p>
+
+<h4><a name="limitations">What are the limitations?</a></h4>
+
+<p>
+    Basically, only classes, methods, and fields listed <a href="#supported">above</a> should work, and other features,
+    like formatted input/output, are not supported. Known issues:
+</p>
+<ul>
+    <li>Reflection-based tools may be unable to discover additional classes and methods introduced in Java 5 when running on JRE 1.4.</li>
+    <li>Translated code running on JRE 5.0 may be incompatible with other Java 5 code when Java 5 API is used.</li>
+    <li>Reflection on generics and metadata may return incomplete information for dynamically generated classes.</li>
+    <li>Access modifiers and constants inlined by a compiler are ignored during the verification.</li>
+    <li>Upcasting may help to translate invocations of inherited methods introduced in Java 5: <br>
+        <code>&nbsp;((Writer) new FileWriter("file.tmp")).append("Hello").close();</code></li>
+    <li>Serialized objects produced by translated code may be incompatible with JRE 5.0.</li>
+</ul>
+
+<h4><a name="alternative">Alternative tools</a></h4>
+<ul>
+    <li><a href="http://retroweaver.sourceforge.net/">Retroweaver</a>
+        - a Java bytecode weaver that enables you to take advantage
+        of the new 1.5 language features in your source code,
+        while still retaining compatibility with 1.4 virtual machines.</li>
+    <li><a href="http://tinyurl.com/r8xba">Declawer</a>
+        - a customized Java compiler which reduces 1.5 Generics to equivalent 1.4 syntax.</li>
+</ul>
+
+<h4><a name="contact">Contact</a></h4>
+<ul>
+    <li><a href="http://retrotranslator.sourceforge.net/">Latest documentation</a></li>
+    <li><a href="http://sourceforge.net/forum/forum.php?forum_id=513539">Open discussion</a></li>
+    <li><a href="http://sourceforge.net/forum/forum.php?forum_id=513540">Help</a></li>
+    <li><a href="http://sourceforge.net/tracker/?group_id=153566&atid=788279">Bugs</a></li>
+    <li><a href="http://sourceforge.net/tracker/?group_id=153566&atid=788282">Feature requests</a></li>
+    <li><a href="http://sourceforge.net/users/tarasp/">Author</a></li>
+</ul>
+
+<h4><a name="license">License</a></h4>
+<pre>
+    Retrotranslator: a Java bytecode transformer that translates Java classes
+    compiled with JDK 5.0 into classes that can be run on JVM 1.4.
+
+    Copyright (c) 2005, 2006 Taras Puchko
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of the copyright holders nor the names of its
+       contributors may be used to endorse or promote products derived from
+       this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+    THE POSSIBILITY OF SUCH DAMAGE.
+</pre>
+</body>
+</html>
diff --git a/core/src/main/java/org/apache/struts2/annotations/taglib/StrutsTag.java b/core/src/main/java/org/apache/struts2/annotations/taglib/StrutsTag.java
index 228a5c77d..90f1b38be 100644
--- a/core/src/main/java/org/apache/struts2/annotations/taglib/StrutsTag.java
+++ b/core/src/main/java/org/apache/struts2/annotations/taglib/StrutsTag.java
@@ -1,33 +1,33 @@
-/*
- * $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.annotations.taglib;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-@Target(ElementType.TYPE)
-public @interface StrutsTag {
-  String name();
-  String tldBodyContent();
-  String tldTagClass();
-  String description();
-}
+/*
+ * $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.annotations.taglib;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+public @interface StrutsTag {
+  String name();
+  String tldBodyContent();
+  String tldTagClass();
+  String description();
+}
diff --git a/core/src/main/java/org/apache/struts2/annotations/taglib/StrutsTagAttribute.java b/core/src/main/java/org/apache/struts2/annotations/taglib/StrutsTagAttribute.java
index 9f7c2acd4..11e4e98fc 100644
--- a/core/src/main/java/org/apache/struts2/annotations/taglib/StrutsTagAttribute.java
+++ b/core/src/main/java/org/apache/struts2/annotations/taglib/StrutsTagAttribute.java
@@ -1,35 +1,35 @@
-/*
- * $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.annotations.taglib;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-public @interface StrutsTagAttribute {
-  String name() default "";
-  boolean required();
-  boolean rtexprvalue() default true;
-  String description();
-  String defaultValue() default "";
-  String type() default "String";
-}
+/*
+ * $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.annotations.taglib;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+public @interface StrutsTagAttribute {
+  String name() default "";
+  boolean required();
+  boolean rtexprvalue() default true;
+  String description();
+  String defaultValue() default "";
+  String type() default "String";
+}
diff --git a/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TLDAnnotationProcessorFactory.java b/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TLDAnnotationProcessorFactory.java
index de0b4f72b..fe418417f 100644
--- a/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TLDAnnotationProcessorFactory.java
+++ b/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TLDAnnotationProcessorFactory.java
@@ -1,76 +1,76 @@
-/*
- * $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.annotations.taglib.apt;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Set;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.AnnotationProcessorFactory;
-import com.sun.mirror.apt.AnnotationProcessors;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-
-public class TLDAnnotationProcessorFactory implements AnnotationProcessorFactory {
-
-  /**
-   * Returns a TLD annotation processor.
-   *
-   * @return An annotation processor for note annotations if requested, otherwise, returns the NO_OP
-   *         annotation processor.
-   */
-  public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> declarations,
-      AnnotationProcessorEnvironment env) {
-    AnnotationProcessor result;
-    if (declarations.isEmpty()) {
-      result = AnnotationProcessors.NO_OP;
-    } else {
-      result = new TagAnnotationProcessor(env);
-    }
-    return result;
-  }
-
-  /**
-   * This factory builds a processor for Tag and TagAttribute
-   *
-   * @return a collection containing StutsTag and StrutsTagAttribute
-   */
-  public Collection<String> supportedAnnotationTypes() {
-    return Arrays.asList(TagAnnotationProcessor.TAG, TagAnnotationProcessor.TAG_ATTRIBUTE);
-  }
-
-  /**
-   * Options used to generate the TLD
-   *
-   * @return an empty list.
-   */
-  public Collection<String> supportedOptions() {
-    return Arrays.asList("-AoutFile",
-        "-AtlibVersion",
-        "-AjspVersion",
-        "-AshortName",
-        "-Auri",
-        "-Adescription",
-        "-AdisplayName");
-  }
-}
+/*
+ * $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.annotations.taglib.apt;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Set;
+
+import com.sun.mirror.apt.AnnotationProcessor;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.apt.AnnotationProcessorFactory;
+import com.sun.mirror.apt.AnnotationProcessors;
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+
+public class TLDAnnotationProcessorFactory implements AnnotationProcessorFactory {
+
+  /**
+   * Returns a TLD annotation processor.
+   *
+   * @return An annotation processor for note annotations if requested, otherwise, returns the NO_OP
+   *         annotation processor.
+   */
+  public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> declarations,
+      AnnotationProcessorEnvironment env) {
+    AnnotationProcessor result;
+    if (declarations.isEmpty()) {
+      result = AnnotationProcessors.NO_OP;
+    } else {
+      result = new TagAnnotationProcessor(env);
+    }
+    return result;
+  }
+
+  /**
+   * This factory builds a processor for Tag and TagAttribute
+   *
+   * @return a collection containing StutsTag and StrutsTagAttribute
+   */
+  public Collection<String> supportedAnnotationTypes() {
+    return Arrays.asList(TagAnnotationProcessor.TAG, TagAnnotationProcessor.TAG_ATTRIBUTE);
+  }
+
+  /**
+   * Options used to generate the TLD
+   *
+   * @return an empty list.
+   */
+  public Collection<String> supportedOptions() {
+    return Arrays.asList("-AoutFile",
+        "-AtlibVersion",
+        "-AjspVersion",
+        "-AshortName",
+        "-Auri",
+        "-Adescription",
+        "-AdisplayName");
+  }
+}
diff --git a/core/src/main/java/org/apache/struts2/annotations/taglib/apt/Tag.java b/core/src/main/java/org/apache/struts2/annotations/taglib/apt/Tag.java
index 9d347450c..08db77dcb 100644
--- a/core/src/main/java/org/apache/struts2/annotations/taglib/apt/Tag.java
+++ b/core/src/main/java/org/apache/struts2/annotations/taglib/apt/Tag.java
@@ -1,92 +1,92 @@
-/*
- * $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.annotations.taglib.apt;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-public class Tag {
-  private String name;
-  private String tldBodyContent;
-  private String tldTagClass;
-  private String description;
-  private boolean include = true;
-  private String declaredType;
-
-  private Map<String, TagAttribute> attributes = new HashMap<String, TagAttribute>();
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public String getTldBodyContent() {
-    return tldBodyContent;
-  }
-
-  public void setTldBodyContent(String tldBodyContent) {
-    this.tldBodyContent = tldBodyContent;
-  }
-
-  public String getTldTagClass() {
-    return tldTagClass;
-  }
-
-  public void setTldTagClass(String tldTagClass) {
-    this.tldTagClass = tldTagClass;
-  }
-
-  public void addTagAttribute(TagAttribute attribute) {
-    attributes.put(attribute.getName(), attribute);
-  }
-
-  public Collection<TagAttribute> getAttributes() {
-    return attributes.values();
-  }
-
-  public boolean isInclude() {
-    return include;
-  }
-
-  public void setInclude(boolean include) {
-    this.include = include;
-  }
-
-  public String getDeclaredType() {
-    return declaredType;
-  }
-
-  public void setDeclaredType(String declaredType) {
-    this.declaredType = declaredType;
-  }
-}
+/*
+ * $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.annotations.taglib.apt;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Tag {
+  private String name;
+  private String tldBodyContent;
+  private String tldTagClass;
+  private String description;
+  private boolean include = true;
+  private String declaredType;
+
+  private Map<String, TagAttribute> attributes = new HashMap<String, TagAttribute>();
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getTldBodyContent() {
+    return tldBodyContent;
+  }
+
+  public void setTldBodyContent(String tldBodyContent) {
+    this.tldBodyContent = tldBodyContent;
+  }
+
+  public String getTldTagClass() {
+    return tldTagClass;
+  }
+
+  public void setTldTagClass(String tldTagClass) {
+    this.tldTagClass = tldTagClass;
+  }
+
+  public void addTagAttribute(TagAttribute attribute) {
+    attributes.put(attribute.getName(), attribute);
+  }
+
+  public Collection<TagAttribute> getAttributes() {
+    return attributes.values();
+  }
+
+  public boolean isInclude() {
+    return include;
+  }
+
+  public void setInclude(boolean include) {
+    this.include = include;
+  }
+
+  public String getDeclaredType() {
+    return declaredType;
+  }
+
+  public void setDeclaredType(String declaredType) {
+    this.declaredType = declaredType;
+  }
+}
diff --git a/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAnnotationProcessor.java b/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAnnotationProcessor.java
index a3d7bc19f..bac77f784 100644
--- a/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAnnotationProcessor.java
+++ b/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAnnotationProcessor.java
@@ -1,299 +1,299 @@
-/*
- * $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.annotations.taglib.apt;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-public class TagAnnotationProcessor implements AnnotationProcessor {
-  public static final String TAG = "org.apache.struts2.annotations.taglib.StrutsTag";
-  public static final String TAG_ATTRIBUTE = "org.apache.struts2.annotations.taglib.StrutsTagAttribute";
-
-  private AnnotationProcessorEnvironment environment;
-  private AnnotationTypeDeclaration tagDeclaration;
-  private AnnotationTypeDeclaration tagAttributeDeclaration;
-  private Map<String, Tag> tags = new HashMap<String, Tag>();
-
-  public TagAnnotationProcessor(AnnotationProcessorEnvironment env) {
-    environment = env;
-    tagDeclaration = (AnnotationTypeDeclaration) environment.getTypeDeclaration(TAG);
-    tagAttributeDeclaration = (AnnotationTypeDeclaration) environment
-        .getTypeDeclaration(TAG_ATTRIBUTE);
-  }
-
-  public void process() {
-    //make sure all paramters were set
-    checkOptions();
-
-    // tags
-    Collection<Declaration> tagDeclarations = environment
-        .getDeclarationsAnnotatedWith(tagDeclaration);
-    Collection<Declaration> attributesDeclarations = environment
-        .getDeclarationsAnnotatedWith(tagAttributeDeclaration);
-
-    // find Tags
-    for (Declaration declaration : tagDeclarations) {
-      // type
-      TypeDeclaration typeDeclaration = (TypeDeclaration) declaration;
-      String typeName = typeDeclaration.getQualifiedName();
-      HashMap<String, Object> values = getValues(typeDeclaration, tagDeclaration);
-      // create Tag and apply values found
-      Tag tag = new Tag();
-      tag.setDescription((String) values.get("description"));
-      tag.setName((String) values.get("name"));
-      tag.setTldBodyContent((String) values.get("tldBodyContent"));
-      tag.setTldTagClass((String) values.get("tldTagClass"));
-      tag.setDeclaredType(typeName);
-      // add to map
-      tags.put(typeName, tag);
-    }
-
-    // find Tags Attributes
-    for (Declaration declaration : attributesDeclarations) {
-      // type
-      MethodDeclaration methodDeclaration = (MethodDeclaration) declaration;
-      String typeName = methodDeclaration.getDeclaringType().getQualifiedName();
-      HashMap<String, Object> values = getValues(methodDeclaration, tagAttributeDeclaration);
-      // create Attribute and apply values found
-      TagAttribute attribute = new TagAttribute();
-      attribute.setDescription((String) values.get("description"));
-      String name = (String) values.get("name");
-      if(name == null || name.length() == 0) {
-        //get name from method
-        String methodName = methodDeclaration.getSimpleName();
-        name = String.valueOf(Character.toLowerCase(methodName.charAt(3))) + methodName.substring(4);
-      }
-      methodDeclaration.getSimpleName();
-      attribute.setName(name);
-      attribute.setRequired((Boolean) values.get("required"));
-      attribute.setRtexprvalue((Boolean) values.get("rtexprvalue"));
-      // add to map
-      Tag parentTag = tags.get(typeName);
-      if(parentTag != null)
-        tags.get(typeName).addTagAttribute(attribute);
-      else {
-        //an abstract or base class
-        parentTag = new Tag();
-        parentTag.setDeclaredType(typeName);
-        parentTag.setInclude(false);
-        parentTag.addTagAttribute(attribute);
-        tags.put(typeName, parentTag);
-      }
-    }
-
-    //we can't process the hierarchy on the first pass because
-    //apt does not garantees that the base classes will be processed
-    //before their subclasses
-    for(Map.Entry<String, Tag> entry : tags.entrySet()) {
-      processHierarchy(entry.getValue());
-    }
-    // save as xml
-    save();
-  }
-
-  private void processHierarchy(Tag tag) {
-    try {
-      Class clazz = Class.forName(tag.getDeclaredType());
-      while((clazz = clazz.getSuperclass()) != null) {
-        Tag parentTag = tags.get(clazz.getName());
-        //copy parent annotations to this tag
-        if(parentTag != null) {
-          for(TagAttribute attribute : parentTag.getAttributes()) {
-            tag.addTagAttribute(attribute);
-          }
-        }
-      }
-    } catch (ClassNotFoundException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private void checkOptions() {
-    if(getOption("tlibVersion") == null)
-      throw new IllegalArgumentException("'tlibVersion' is missing");
-    if(getOption("jspVersion") == null)
-      throw new IllegalArgumentException("'jspVersion' is missing");
-    if(getOption("shortName") == null)
-      throw new IllegalArgumentException("'shortName' is missing");
-    if(getOption("description") == null)
-      throw new IllegalArgumentException("'description' is missing");
-    if(getOption("displayName") == null)
-      throw new IllegalArgumentException("'displayName' is missing");
-    if(getOption("uri") == null)
-      throw new IllegalArgumentException("'uri' is missing");
-  }
-
-  private void save() {
-    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-    DocumentBuilder builder;
-
-    try {
-      // create xml document
-      builder = factory.newDocumentBuilder();
-      Document document = builder.newDocument();
-      document.setXmlVersion("1.0");
-
-      // taglib
-      Element tagLib = document.createElement("taglib");
-      document.appendChild(tagLib);
-      // tag lib attributes
-      appendTextNode(document, tagLib, "tlib-version", getOption("tlibVersion"), false);
-      appendTextNode(document, tagLib, "jsp-version", getOption("jspVersion"), false);
-      appendTextNode(document, tagLib, "short-name", getOption("shortName"), false);
-      appendTextNode(document, tagLib, "uri", getOption("uri"), false);
-      appendTextNode(document, tagLib, "display-name", getOption("displayName"), false);
-      appendTextNode(document, tagLib, "description", getOption("description"), true);
-
-      // create tags
-      for (Map.Entry<String, Tag> entry : tags.entrySet()) {
-        Tag tag = entry.getValue();
-        if(tag.isInclude())
-          createElement(document, tagLib, tag);
-      }
-
-      // save to file
-      TransformerFactory tf = TransformerFactory.newInstance();
-      tf.setAttribute("indent-number", new Integer(2));
-      Transformer transformer = tf.newTransformer();
-      //if tiger would just format it :(
-      //formatting bug in tiger (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6296446)
-
-      transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-      transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN");
-      transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd");
-      transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-
-      Source source = new DOMSource(document);
-      Result result = new StreamResult(new OutputStreamWriter(new FileOutputStream(getOption("out"))));
-      transformer.transform(source, result);
-    } catch (Exception e) {
-      // oops we cannot throw checked exceptions
-      throw new RuntimeException(e);
-    }
-  }
-
-  private String getOption(String name) {
-    // there is a bug in the 1.5 apt implementation:
-    // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6258929
-    // this is a hack-around
-    if (environment.getOptions().containsKey(name))
-      return environment.getOptions().get(name);
-
-    for (Map.Entry<String, String> entry : environment.getOptions().entrySet()) {
-      String key = entry.getKey();
-      if (key.startsWith("-A" + name))
-        return key.substring(key.indexOf("=") + 1);
-    }
-    return null;
-  }
-
-  private void createElement(Document doc, Element tagLibElement, Tag tag) {
-    Element tagElement = doc.createElement("tag");
-    tagLibElement.appendChild(tagElement);
-    appendTextNode(doc, tagElement, "name", tag.getName(), false);
-    appendTextNode(doc, tagElement, "tag-class", tag.getTldTagClass(), false);
-    appendTextNode(doc, tagElement, "body-content", tag.getTldBodyContent(), false);
-    appendTextNode(doc, tagElement, "description", tag.getDescription(), true);
-
-    // save attributes
-    for (TagAttribute attribute : tag.getAttributes()) {
-      createElement(doc, tagElement, attribute);
-    }
-
-  }
-
-  private void createElement(Document doc, Element tagElement, TagAttribute attribute) {
-    Element attributeElement = doc.createElement("attribute");
-    tagElement.appendChild(attributeElement);
-    appendTextNode(doc, attributeElement, "name", attribute.getName(), false);
-    appendTextNode(doc, attributeElement, "required", String.valueOf(attribute.isRequired()), false);
-    appendTextNode(doc,
-        attributeElement,
-        "rtexprvalue",
-        String.valueOf(attribute.isRtexprvalue()),
-        false);
-    appendTextNode(doc, attributeElement, "description", attribute.getDescription(), true);
-  }
-
-  private void appendTextNode(Document doc, Element element, String name, String text, boolean cdata) {
-    Text textNode = cdata ? doc.createCDATASection(text) : doc.createTextNode(text);
-    Element newElement = doc.createElement(name);
-    newElement.appendChild(textNode);
-    element.appendChild(newElement);
-  }
-
-  /**
-   * Get values of annotation
-   *
-   * @param declaration
-   * @param type
-   *          The type of the annotation
-   * @return name->value map of annotation values
-   */
-  private HashMap<String, Object> getValues(Declaration declaration, AnnotationTypeDeclaration type) {
-    HashMap<String, Object> values = new HashMap<String, Object>();
-    Collection<AnnotationMirror> annotations = declaration.getAnnotationMirrors();
-    // iterate over the mirrors.
-    for (AnnotationMirror mirror : annotations) {
-      // if the mirror in this iteration is for our note declaration...
-      if (mirror.getAnnotationType().getDeclaration().equals(type)) {
-
-        // print out the goodies.
-        Map<AnnotationTypeElementDeclaration, AnnotationValue> annotationValues = mirror
-            .getElementValues();
-
-        for (Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue> entry : annotationValues
-            .entrySet()) {
-          AnnotationTypeElementDeclaration key = entry.getKey();
-          AnnotationValue value = entry.getValue();
-          values.put(key.getSimpleName(), value.getValue());
-        }
-      }
-    }
-    return values;
-  }
-}
+/*
+ * $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.annotations.taglib.apt;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
+
+import com.sun.mirror.apt.AnnotationProcessor;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.declaration.AnnotationMirror;
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
+import com.sun.mirror.declaration.AnnotationValue;
+import com.sun.mirror.declaration.Declaration;
+import com.sun.mirror.declaration.MethodDeclaration;
+import com.sun.mirror.declaration.TypeDeclaration;
+
+public class TagAnnotationProcessor implements AnnotationProcessor {
+  public static final String TAG = "org.apache.struts2.annotations.taglib.StrutsTag";
+  public static final String TAG_ATTRIBUTE = "org.apache.struts2.annotations.taglib.StrutsTagAttribute";
+
+  private AnnotationProcessorEnvironment environment;
+  private AnnotationTypeDeclaration tagDeclaration;
+  private AnnotationTypeDeclaration tagAttributeDeclaration;
+  private Map<String, Tag> tags = new HashMap<String, Tag>();
+
+  public TagAnnotationProcessor(AnnotationProcessorEnvironment env) {
+    environment = env;
+    tagDeclaration = (AnnotationTypeDeclaration) environment.getTypeDeclaration(TAG);
+    tagAttributeDeclaration = (AnnotationTypeDeclaration) environment
+        .getTypeDeclaration(TAG_ATTRIBUTE);
+  }
+
+  public void process() {
+    //make sure all paramters were set
+    checkOptions();
+
+    // tags
+    Collection<Declaration> tagDeclarations = environment
+        .getDeclarationsAnnotatedWith(tagDeclaration);
+    Collection<Declaration> attributesDeclarations = environment
+        .getDeclarationsAnnotatedWith(tagAttributeDeclaration);
+
+    // find Tags
+    for (Declaration declaration : tagDeclarations) {
+      // type
+      TypeDeclaration typeDeclaration = (TypeDeclaration) declaration;
+      String typeName = typeDeclaration.getQualifiedName();
+      HashMap<String, Object> values = getValues(typeDeclaration, tagDeclaration);
+      // create Tag and apply values found
+      Tag tag = new Tag();
+      tag.setDescription((String) values.get("description"));
+      tag.setName((String) values.get("name"));
+      tag.setTldBodyContent((String) values.get("tldBodyContent"));
+      tag.setTldTagClass((String) values.get("tldTagClass"));
+      tag.setDeclaredType(typeName);
+      // add to map
+      tags.put(typeName, tag);
+    }
+
+    // find Tags Attributes
+    for (Declaration declaration : attributesDeclarations) {
+      // type
+      MethodDeclaration methodDeclaration = (MethodDeclaration) declaration;
+      String typeName = methodDeclaration.getDeclaringType().getQualifiedName();
+      HashMap<String, Object> values = getValues(methodDeclaration, tagAttributeDeclaration);
+      // create Attribute and apply values found
+      TagAttribute attribute = new TagAttribute();
+      attribute.setDescription((String) values.get("description"));
+      String name = (String) values.get("name");
+      if(name == null || name.length() == 0) {
+        //get name from method
+        String methodName = methodDeclaration.getSimpleName();
+        name = String.valueOf(Character.toLowerCase(methodName.charAt(3))) + methodName.substring(4);
+      }
+      methodDeclaration.getSimpleName();
+      attribute.setName(name);
+      attribute.setRequired((Boolean) values.get("required"));
+      attribute.setRtexprvalue((Boolean) values.get("rtexprvalue"));
+      // add to map
+      Tag parentTag = tags.get(typeName);
+      if(parentTag != null)
+        tags.get(typeName).addTagAttribute(attribute);
+      else {
+        //an abstract or base class
+        parentTag = new Tag();
+        parentTag.setDeclaredType(typeName);
+        parentTag.setInclude(false);
+        parentTag.addTagAttribute(attribute);
+        tags.put(typeName, parentTag);
+      }
+    }
+
+    //we can't process the hierarchy on the first pass because
+    //apt does not garantees that the base classes will be processed
+    //before their subclasses
+    for(Map.Entry<String, Tag> entry : tags.entrySet()) {
+      processHierarchy(entry.getValue());
+    }
+    // save as xml
+    save();
+  }
+
+  private void processHierarchy(Tag tag) {
+    try {
+      Class clazz = Class.forName(tag.getDeclaredType());
+      while((clazz = clazz.getSuperclass()) != null) {
+        Tag parentTag = tags.get(clazz.getName());
+        //copy parent annotations to this tag
+        if(parentTag != null) {
+          for(TagAttribute attribute : parentTag.getAttributes()) {
+            tag.addTagAttribute(attribute);
+          }
+        }
+      }
+    } catch (ClassNotFoundException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private void checkOptions() {
+    if(getOption("tlibVersion") == null)
+      throw new IllegalArgumentException("'tlibVersion' is missing");
+    if(getOption("jspVersion") == null)
+      throw new IllegalArgumentException("'jspVersion' is missing");
+    if(getOption("shortName") == null)
+      throw new IllegalArgumentException("'shortName' is missing");
+    if(getOption("description") == null)
+      throw new IllegalArgumentException("'description' is missing");
+    if(getOption("displayName") == null)
+      throw new IllegalArgumentException("'displayName' is missing");
+    if(getOption("uri") == null)
+      throw new IllegalArgumentException("'uri' is missing");
+  }
+
+  private void save() {
+    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+    DocumentBuilder builder;
+
+    try {
+      // create xml document
+      builder = factory.newDocumentBuilder();
+      Document document = builder.newDocument();
+      document.setXmlVersion("1.0");
+
+      // taglib
+      Element tagLib = document.createElement("taglib");
+      document.appendChild(tagLib);
+      // tag lib attributes
+      appendTextNode(document, tagLib, "tlib-version", getOption("tlibVersion"), false);
+      appendTextNode(document, tagLib, "jsp-version", getOption("jspVersion"), false);
+      appendTextNode(document, tagLib, "short-name", getOption("shortName"), false);
+      appendTextNode(document, tagLib, "uri", getOption("uri"), false);
+      appendTextNode(document, tagLib, "display-name", getOption("displayName"), false);
+      appendTextNode(document, tagLib, "description", getOption("description"), true);
+
+      // create tags
+      for (Map.Entry<String, Tag> entry : tags.entrySet()) {
+        Tag tag = entry.getValue();
+        if(tag.isInclude())
+          createElement(document, tagLib, tag);
+      }
+
+      // save to file
+      TransformerFactory tf = TransformerFactory.newInstance();
+      tf.setAttribute("indent-number", new Integer(2));
+      Transformer transformer = tf.newTransformer();
+      //if tiger would just format it :(
+      //formatting bug in tiger (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6296446)
+
+      transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+      transformer.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC, "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN");
+      transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd");
+      transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+
+      Source source = new DOMSource(document);
+      Result result = new StreamResult(new OutputStreamWriter(new FileOutputStream(getOption("out"))));
+      transformer.transform(source, result);
+    } catch (Exception e) {
+      // oops we cannot throw checked exceptions
+      throw new RuntimeException(e);
+    }
+  }
+
+  private String getOption(String name) {
+    // there is a bug in the 1.5 apt implementation:
+    // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6258929
+    // this is a hack-around
+    if (environment.getOptions().containsKey(name))
+      return environment.getOptions().get(name);
+
+    for (Map.Entry<String, String> entry : environment.getOptions().entrySet()) {
+      String key = entry.getKey();
+      if (key.startsWith("-A" + name))
+        return key.substring(key.indexOf("=") + 1);
+    }
+    return null;
+  }
+
+  private void createElement(Document doc, Element tagLibElement, Tag tag) {
+    Element tagElement = doc.createElement("tag");
+    tagLibElement.appendChild(tagElement);
+    appendTextNode(doc, tagElement, "name", tag.getName(), false);
+    appendTextNode(doc, tagElement, "tag-class", tag.getTldTagClass(), false);
+    appendTextNode(doc, tagElement, "body-content", tag.getTldBodyContent(), false);
+    appendTextNode(doc, tagElement, "description", tag.getDescription(), true);
+
+    // save attributes
+    for (TagAttribute attribute : tag.getAttributes()) {
+      createElement(doc, tagElement, attribute);
+    }
+
+  }
+
+  private void createElement(Document doc, Element tagElement, TagAttribute attribute) {
+    Element attributeElement = doc.createElement("attribute");
+    tagElement.appendChild(attributeElement);
+    appendTextNode(doc, attributeElement, "name", attribute.getName(), false);
+    appendTextNode(doc, attributeElement, "required", String.valueOf(attribute.isRequired()), false);
+    appendTextNode(doc,
+        attributeElement,
+        "rtexprvalue",
+        String.valueOf(attribute.isRtexprvalue()),
+        false);
+    appendTextNode(doc, attributeElement, "description", attribute.getDescription(), true);
+  }
+
+  private void appendTextNode(Document doc, Element element, String name, String text, boolean cdata) {
+    Text textNode = cdata ? doc.createCDATASection(text) : doc.createTextNode(text);
+    Element newElement = doc.createElement(name);
+    newElement.appendChild(textNode);
+    element.appendChild(newElement);
+  }
+
+  /**
+   * Get values of annotation
+   *
+   * @param declaration
+   * @param type
+   *          The type of the annotation
+   * @return name->value map of annotation values
+   */
+  private HashMap<String, Object> getValues(Declaration declaration, AnnotationTypeDeclaration type) {
+    HashMap<String, Object> values = new HashMap<String, Object>();
+    Collection<AnnotationMirror> annotations = declaration.getAnnotationMirrors();
+    // iterate over the mirrors.
+    for (AnnotationMirror mirror : annotations) {
+      // if the mirror in this iteration is for our note declaration...
+      if (mirror.getAnnotationType().getDeclaration().equals(type)) {
+
+        // print out the goodies.
+        Map<AnnotationTypeElementDeclaration, AnnotationValue> annotationValues = mirror
+            .getElementValues();
+
+        for (Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue> entry : annotationValues
+            .entrySet()) {
+          AnnotationTypeElementDeclaration key = entry.getKey();
+          AnnotationValue value = entry.getValue();
+          values.put(key.getSimpleName(), value.getValue());
+        }
+      }
+    }
+    return values;
+  }
+}
diff --git a/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAttribute.java b/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAttribute.java
index 84c2c35a5..45ff7f3af 100644
--- a/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAttribute.java
+++ b/core/src/main/java/org/apache/struts2/annotations/taglib/apt/TagAttribute.java
@@ -1,65 +1,65 @@
-/*
- * $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.annotations.taglib.apt;
-
-/**
- * Used to hold tag attribute information for TLD generation
- *
- */
-class TagAttribute {
-  private String name;
-  private boolean required;
-  private boolean rtexprvalue;
-  private String description;
-
-  public String getDescription() {
-    return description;
-  }
-
-  public void setDescription(String description) {
-    this.description = description;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public boolean isRequired() {
-    return required;
-  }
-
-  public void setRequired(boolean required) {
-    this.required = required;
-  }
-
-  public boolean isRtexprvalue() {
-    return rtexprvalue;
-  }
-
-  public void setRtexprvalue(boolean rtexprvalue) {
-    this.rtexprvalue = rtexprvalue;
-  }
-}
+/*
+ * $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.annotations.taglib.apt;
+
+/**
+ * Used to hold tag attribute information for TLD generation
+ *
+ */
+class TagAttribute {
+  private String name;
+  private boolean required;
+  private boolean rtexprvalue;
+  private String description;
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public boolean isRequired() {
+    return required;
+  }
+
+  public void setRequired(boolean required) {
+    this.required = required;
+  }
+
+  public boolean isRtexprvalue() {
+    return rtexprvalue;
+  }
+
+  public void setRtexprvalue(boolean rtexprvalue) {
+    this.rtexprvalue = rtexprvalue;
+  }
+}
diff --git a/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java b/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
index 1a0c1fab2..19b48fdff 100644
--- a/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
+++ b/core/src/main/java/org/apache/struts2/components/AbstractRemoteCallUIBean.java
@@ -1,5 +1,5 @@
 /*
- * $Id: RemoteCallUIBean.java 451544 2006-09-30 05:38:02Z mrdon $
+ * $Id$
  *
  * Copyright 2006 The Apache Software Foundation.
  *
diff --git a/core/src/main/java/org/apache/struts2/components/DropdownDateTimePicker.java b/core/src/main/java/org/apache/struts2/components/DropdownDateTimePicker.java
index 9843c60e9..c14287a12 100644
--- a/core/src/main/java/org/apache/struts2/components/DropdownDateTimePicker.java
+++ b/core/src/main/java/org/apache/struts2/components/DropdownDateTimePicker.java
@@ -1,5 +1,5 @@
 /*
- * $Id: DatePicker.java 451544 2006-09-30 05:38:02Z mrdon $
+ * $Id$
  *
  * Copyright 2006 The Apache Software Foundation.
  *
diff --git a/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java b/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
index 192409bc0..62ff6d1c0 100644
--- a/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
index 72f976eba..344cd662a 100644
--- a/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
index b036201e9..457046375 100644
--- a/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
+++ b/core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/main/java/org/apache/struts2/config/Namespace.java b/core/src/main/java/org/apache/struts2/config/Namespace.java
index 08b485dc7..3ee34161a 100644
--- a/core/src/main/java/org/apache/struts2/config/Namespace.java
+++ b/core/src/main/java/org/apache/struts2/config/Namespace.java
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/main/java/org/apache/struts2/config/NullResult.java b/core/src/main/java/org/apache/struts2/config/NullResult.java
index c5c80ae7d..2f695835e 100644
--- a/core/src/main/java/org/apache/struts2/config/NullResult.java
+++ b/core/src/main/java/org/apache/struts2/config/NullResult.java
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/main/java/org/apache/struts2/config/ParentPackage.java b/core/src/main/java/org/apache/struts2/config/ParentPackage.java
index 341fd3095..b74cee888 100644
--- a/core/src/main/java/org/apache/struts2/config/ParentPackage.java
+++ b/core/src/main/java/org/apache/struts2/config/ParentPackage.java
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/main/java/org/apache/struts2/config/Result.java b/core/src/main/java/org/apache/struts2/config/Result.java
index 9fd275c77..6e39c25e9 100644
--- a/core/src/main/java/org/apache/struts2/config/Result.java
+++ b/core/src/main/java/org/apache/struts2/config/Result.java
@@ -1,36 +1,36 @@
-/*
- * $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.config;
-
-import com.opensymphony.xwork2.Action;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Defines an XWork Result
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Result {
-    String name() default Action.SUCCESS;
-    Class type() default NullResult.class;
-    String value();
-}
+/*
+ * $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.config;
+
+import com.opensymphony.xwork2.Action;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Defines an XWork Result
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Result {
+    String name() default Action.SUCCESS;
+    Class type() default NullResult.class;
+    String value();
+}
diff --git a/core/src/main/java/org/apache/struts2/config/Results.java b/core/src/main/java/org/apache/struts2/config/Results.java
index 9cb8663f8..99b2db87b 100644
--- a/core/src/main/java/org/apache/struts2/config/Results.java
+++ b/core/src/main/java/org/apache/struts2/config/Results.java
@@ -1,32 +1,32 @@
-/*
- * $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.config;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Defines multiple XWork Results
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Results {
-    Result[] value();
-}
+/*
+ * $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.config;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Defines multiple XWork Results
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Results {
+    Result[] value();
+}
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
index a6de5c46d..9d8a9f95e 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapper.java
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
index 0b3b31b41..6d94a440d 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapper.java
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
index 982109219..276fec589 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java
index 1f5c3a10d..aa7b91f0b 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/ProfilingActivationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java
index 1ea85ee47..14b73a6cf 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/RolesInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DropdownDateTimePickerModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DropdownDateTimePickerModel.java
index e02d0e9ca..81b3ac756 100644
--- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/DropdownDateTimePickerModel.java
+++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/DropdownDateTimePickerModel.java
@@ -1,5 +1,5 @@
 /*
- * $Id: DatePickerModel.java 451544 2006-09-30 05:38:02Z mrdon $
+ * $Id$
  *
  * Copyright 2006 The Apache Software Foundation.
  *
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRemoteCallUITag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRemoteCallUITag.java
index 1ca6ce72e..9083db2e8 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRemoteCallUITag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AbstractRemoteCallUITag.java
@@ -1,5 +1,5 @@
 /*
- * $Id: DivTag.java 451544 2006-09-30 05:38:02Z mrdon $
+ * $Id$
  *
  * Copyright 2006 The Apache Software Foundation.
  *
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/DropdownDateTimePickerTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/DropdownDateTimePickerTag.java
index 6f69b2f9b..df2b724e2 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/DropdownDateTimePickerTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/DropdownDateTimePickerTag.java
@@ -1,5 +1,5 @@
 /*
- * $Id: DatePickerTag.java 451544 2006-09-30 05:38:02Z mrdon $
+ * $Id$
  *
  * Copyright 2006 The Apache Software Foundation.
  *
diff --git a/core/src/main/java/org/apache/struts2/views/velocity/components/DropdownDateTimePickerDirective.java b/core/src/main/java/org/apache/struts2/views/velocity/components/DropdownDateTimePickerDirective.java
index f25dbe956..76414aea5 100644
--- a/core/src/main/java/org/apache/struts2/views/velocity/components/DropdownDateTimePickerDirective.java
+++ b/core/src/main/java/org/apache/struts2/views/velocity/components/DropdownDateTimePickerDirective.java
@@ -1,5 +1,5 @@
 /*
- * $Id: DatePickerDirective.java 451544 2006-09-30 05:38:02Z mrdon $
+ * $Id$
  *
  * Copyright 2006 The Apache Software Foundation.
  *
diff --git a/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java b/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java
index cbe4c793c..76637a21f 100644
--- a/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java
+++ b/core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java b/core/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java
index 7bff1a5f8..e4460f685 100644
--- a/core/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java
+++ b/core/src/test/java/org/apache/struts2/config/CustomNamespaceAction.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java b/core/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java
index 0628322d1..f88f5e154 100644
--- a/core/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java
+++ b/core/src/test/java/org/apache/struts2/config/CustomParentPackageAction.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java b/core/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java
index 0edede85f..b6dc16374 100644
--- a/core/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java
+++ b/core/src/test/java/org/apache/struts2/config/cltest/ActionImpl.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java b/core/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java
index fdd06f4c3..1a0724c51 100644
--- a/core/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java
+++ b/core/src/test/java/org/apache/struts2/config/cltest/OneResultAction.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/test/java/org/apache/struts2/config/cltest/TwoResultAction.java b/core/src/test/java/org/apache/struts2/config/cltest/TwoResultAction.java
index 2a2138445..dab878808 100644
--- a/core/src/test/java/org/apache/struts2/config/cltest/TwoResultAction.java
+++ b/core/src/test/java/org/apache/struts2/config/cltest/TwoResultAction.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ActionContextCleanUpTest.java b/core/src/test/java/org/apache/struts2/dispatcher/ActionContextCleanUpTest.java
index 012015b53..321788b33 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/ActionContextCleanUpTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/ActionContextCleanUpTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java b/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
index f2a8b71a7..db5b44719 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/FilterTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java
index a684cd1da..27897ce46 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/mapper/CompositeActionMapperTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java
index 7b505ea6c..6245c6179 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/mapper/Restful2ActionMapperTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/test/java/org/apache/struts2/interceptor/RolesInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/RolesInterceptorTest.java
index 1db55fcf9..73cd4d4bc 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/RolesInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/RolesInterceptorTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/core/src/test/java/org/apache/struts2/util/ContainUtilTest.java b/core/src/test/java/org/apache/struts2/util/ContainUtilTest.java
index 112d730e3..909637d06 100644
--- a/core/src/test/java/org/apache/struts2/util/ContainUtilTest.java
+++ b/core/src/test/java/org/apache/struts2/util/ContainUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java b/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
index b69cccd11..2233a697a 100644
--- a/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
+++ b/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
@@ -1,5 +1,5 @@
 /*
- * $Id: DWRValidator.java 476642 2006-11-18 22:40:18Z mrdon $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java b/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
index 45149e045..0bf246b1a 100644
--- a/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
+++ b/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: DWRValidator.java 476642 2006-11-18 22:40:18Z mrdon $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java b/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java
index 45fab1e37..b6b016fda 100644
--- a/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java
+++ b/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormResetInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * $Id: Action.java 240373 2005-08-27 01:58:39Z jmitchell $
+ * $Id$
  *
  * Copyright 2000-2004 The Apache Software Foundation.
  *
diff --git a/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java b/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java
index bc92f1e5f..33795f8c3 100644
--- a/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java
+++ b/plugins/struts1/src/main/java/org/apache/struts2/s1/ActionFormValidationInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * $Id: Action.java 240373 2005-08-27 01:58:39Z jmitchell $
+ * $Id$
  *
  * Copyright 2000-2004 The Apache Software Foundation.
  *
diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
index ead169e2d..2973547ee 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesRequestContext.java
@@ -1,5 +1,5 @@
 /*
- * $Id: $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file