No functional changes

completes r1781219 by putting svn:eol-style=native to all file types declared 
in [auto-props] section of the svn config files.css

Actually this is only a 1st pass, it was too complicated to do it for  
all file types at once only concerned here
*.java;*.bsh;*.groovy;*.jsp;*.tld;*.ftl;*.js;*.sql;*.c;*.cpp;*.h;*.txt;*.sgml;
*.properties;*.xml;.classpath;.project;*.sld;*.gml;*.xsl;*.xsd
*.html;*.htm;*.css;*.md;README;NOTICE;LICENSE;rc.ofbiz.*;*.less;*.dsp;*.dsw

Most files should not be concerned by this change, but it's impossible to do
it one by one.

There are also changes in files with have mixed EOLs; because this has no sense
when using native which automatically resolves this issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1781731 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/applications/content/config/forum.properties b/applications/content/config/forum.properties
index 8b0903d..63011ae 100644
--- a/applications/content/config/forum.properties
+++ b/applications/content/config/forum.properties
@@ -1,19 +1,19 @@
-###############################################################################

-# 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.

-###############################################################################

-descriptLen=80

+###############################################################################
+# 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.
+###############################################################################
+descriptLen=80
diff --git a/applications/party/webapp/partymgr/static/partymgr.css b/applications/party/webapp/partymgr/static/partymgr.css
index f5b738d..dadd4ac 100644
--- a/applications/party/webapp/partymgr/static/partymgr.css
+++ b/applications/party/webapp/partymgr/static/partymgr.css
@@ -1,40 +1,40 @@
-/*

- * 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.

- */

-

-/* This CSS file is used for the Party Manager component. */

-

-#mech-purpose-types .basic-table {

-width: auto;

-margin-bottom: 1em;

-}

-

-.profile-left {

-float: left;

-width: 47%;

-}

-

-.profile-right {

-float: right;

-width: 47%;

-}

-

-.profile-bottom {

-float: left;

-width: 100%;

-}

+/*
+ * 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.
+ */
+
+/* This CSS file is used for the Party Manager component. */
+
+#mech-purpose-types .basic-table {
+width: auto;
+margin-bottom: 1em;
+}
+
+.profile-left {
+float: left;
+width: 47%;
+}
+
+.profile-right {
+float: right;
+width: 47%;
+}
+
+.profile-bottom {
+float: left;
+width: 100%;
+}
diff --git a/applications/product/template/imagemanagement/ShowPeopleApprove.ftl b/applications/product/template/imagemanagement/ShowPeopleApprove.ftl
index 5bda7f2..ec48a5c 100644
--- a/applications/product/template/imagemanagement/ShowPeopleApprove.ftl
+++ b/applications/product/template/imagemanagement/ShowPeopleApprove.ftl
@@ -1,91 +1,91 @@
-<#--

-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.

--->

-<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script>

-<script type="text/javascript">

-jQuery.noConflict();

-jQuery(document).ready(function(){

-    jQuery('input:radio').click(function(){

-        var elementVal = jQuery(this).val();

-        var elementList = elementVal.split('__');

-        var result = elementList[0] + "/" + elementList[1];

-        jQuery('input:radio[value=' + result + ']').attr('checked',true);

-    });

-    jQuery('input:radio[value^="IM_APPROVED"]').each( function() {

-        this.checked = true;

-    });

-});

-</script>

-        

-<table>

-    <#if partyRoles?has_content>

-        <#assign alt_row = false>

-        <#list partyRoles as partyRole>

-            <td>

-                <table>

-                    <#assign userLoginApprovers  = delegator.findByAnd("UserLogin",Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("partyId", partyRole.partyId), null, false)/>

-                    <#assign userLoginApprover = userLoginApprovers[0]>

-                    <#assign userLoginAndPartyDetails = delegator.findOne("UserLoginAndPartyDetails", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("partyId", userLoginApprover.partyId, "userLoginId", userLoginApprover.userLoginId), false)!>

-                    <#if userLoginAndPartyDetails?has_content>

-                        <#assign partyContentDetail  = delegator.findByAnd("ContentApproval",Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("roleTypeId", "IMAGEAPPROVER", "approvalStatusId", "IM_PENDING", "partyId", userLoginAndPartyDetails.partyId), null, false)/>

-                        <#assign imageApproveSize = partyContentDetail.size()>

-                        <#if userLoginAndPartyDetails.userLoginId == userLogin.userLoginId>

-                            <#if userMap.checkUser == userLoginAndPartyDetails.userLoginId>

-                                <td>

-                                    <div>

-                                        <b>${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</b>&nbsp;&nbsp;|&nbsp;&nbsp;

-                                    </div>

-                                </td>

-                            <#else>

-                                <td>

-                                    <div>

-                                        <b><a href="<@ofbizUrl>ImageApprove</@ofbizUrl>" class="text">${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</a></b>&nbsp;&nbsp;|&nbsp;&nbsp;

-                                    </div>

-                                </td>

-                            </#if>

-                        <#else>

-                            <#if userMap.checkUser == userLoginAndPartyDetails.userLoginId>

-                                <td>

-                                    <div>

-                                        <b>${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</b>&nbsp;&nbsp;|&nbsp;&nbsp;

-                                    </div>

-                                </td>

-                            <#else>

-                                <td>

-                                    <div>

-                                        <b><a href="<@ofbizUrl>ListPeopleApproved?createdByUserLogin=${userLoginAndPartyDetails.userLoginId}</@ofbizUrl>" class="text">${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</a></b>&nbsp;&nbsp;|&nbsp;&nbsp;

-                                    </div>

-                                </td>

-                            </#if>

-                        </#if>

-                    </#if>

-                </table>

-            </td>

-        </#list>

-        <#if userMap.checkUser == "REJECTED">

-            <td>

-                <div><b>Rejected</b></div>

-            </td>

-        <#else>

-            <td>

-                <div><b><a href="<@ofbizUrl>ListPeopleRejected</@ofbizUrl>" class="text">Rejected</a></b></div>

-            </td>

-        </#if>

-    </#if>

-</table>

-<br/>

+<#--
+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.
+-->
+<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/imagemanagement/sizzle.min.js</@ofbizContentUrl>"></script>
+<script type="text/javascript">
+jQuery.noConflict();
+jQuery(document).ready(function(){
+    jQuery('input:radio').click(function(){
+        var elementVal = jQuery(this).val();
+        var elementList = elementVal.split('__');
+        var result = elementList[0] + "/" + elementList[1];
+        jQuery('input:radio[value=' + result + ']').attr('checked',true);
+    });
+    jQuery('input:radio[value^="IM_APPROVED"]').each( function() {
+        this.checked = true;
+    });
+});
+</script>
+        
+<table>
+    <#if partyRoles?has_content>
+        <#assign alt_row = false>
+        <#list partyRoles as partyRole>
+            <td>
+                <table>
+                    <#assign userLoginApprovers  = delegator.findByAnd("UserLogin",Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("partyId", partyRole.partyId), null, false)/>
+                    <#assign userLoginApprover = userLoginApprovers[0]>
+                    <#assign userLoginAndPartyDetails = delegator.findOne("UserLoginAndPartyDetails", Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("partyId", userLoginApprover.partyId, "userLoginId", userLoginApprover.userLoginId), false)!>
+                    <#if userLoginAndPartyDetails?has_content>
+                        <#assign partyContentDetail  = delegator.findByAnd("ContentApproval",Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("roleTypeId", "IMAGEAPPROVER", "approvalStatusId", "IM_PENDING", "partyId", userLoginAndPartyDetails.partyId), null, false)/>
+                        <#assign imageApproveSize = partyContentDetail.size()>
+                        <#if userLoginAndPartyDetails.userLoginId == userLogin.userLoginId>
+                            <#if userMap.checkUser == userLoginAndPartyDetails.userLoginId>
+                                <td>
+                                    <div>
+                                        <b>${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</b>&nbsp;&nbsp;|&nbsp;&nbsp;
+                                    </div>
+                                </td>
+                            <#else>
+                                <td>
+                                    <div>
+                                        <b><a href="<@ofbizUrl>ImageApprove</@ofbizUrl>" class="text">${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</a></b>&nbsp;&nbsp;|&nbsp;&nbsp;
+                                    </div>
+                                </td>
+                            </#if>
+                        <#else>
+                            <#if userMap.checkUser == userLoginAndPartyDetails.userLoginId>
+                                <td>
+                                    <div>
+                                        <b>${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</b>&nbsp;&nbsp;|&nbsp;&nbsp;
+                                    </div>
+                                </td>
+                            <#else>
+                                <td>
+                                    <div>
+                                        <b><a href="<@ofbizUrl>ListPeopleApproved?createdByUserLogin=${userLoginAndPartyDetails.userLoginId}</@ofbizUrl>" class="text">${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</a></b>&nbsp;&nbsp;|&nbsp;&nbsp;
+                                    </div>
+                                </td>
+                            </#if>
+                        </#if>
+                    </#if>
+                </table>
+            </td>
+        </#list>
+        <#if userMap.checkUser == "REJECTED">
+            <td>
+                <div><b>Rejected</b></div>
+            </td>
+        <#else>
+            <td>
+                <div><b><a href="<@ofbizUrl>ListPeopleRejected</@ofbizUrl>" class="text">Rejected</a></b></div>
+            </td>
+        </#if>
+    </#if>
+</table>
+<br/>
diff --git a/framework/base/config/freemarkerImports.properties b/framework/base/config/freemarkerImports.properties
index ffb7912..f713dc8 100644
--- a/framework/base/config/freemarkerImports.properties
+++ b/framework/base/config/freemarkerImports.properties
@@ -1,20 +1,20 @@
-###############################################################################

-# 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.

-###############################################################################

-

-htmlTemplate=ofbizhome://framework/base/config/AutoImportTemplate.ftl

+###############################################################################
+# 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.
+###############################################################################
+
+htmlTemplate=ofbizhome://framework/base/config/AutoImportTemplate.ftl
diff --git a/framework/base/dtd/ofbiz-properties.xsd b/framework/base/dtd/ofbiz-properties.xsd
index 03363d2..8c3340b 100644
--- a/framework/base/dtd/ofbiz-properties.xsd
+++ b/framework/base/dtd/ofbiz-properties.xsd
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-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.

--->

-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">

-    <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd" />

-

-    <xs:complexType name="valueType">

-        <xs:simpleContent>

-            <xs:extension base="xs:string">

-                <xs:attribute ref="xml:lang" use="required" />

-                <xs:attribute ref="xml:space" />

-            </xs:extension>

-        </xs:simpleContent>

-    </xs:complexType>

-

-    <xs:element name="resource">

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="property" />

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-

-    <xs:element name="property">

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element minOccurs="1" maxOccurs="unbounded" name="value" type="valueType" />

-            </xs:sequence>

-            <xs:attribute type="xs:string" name="key" use="required" />

-        </xs:complexType>

-    </xs:element>

-</xs:schema>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd" />
+
+    <xs:complexType name="valueType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute ref="xml:lang" use="required" />
+                <xs:attribute ref="xml:space" />
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+
+    <xs:element name="resource">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="property" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="property">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="1" maxOccurs="unbounded" name="value" type="valueType" />
+            </xs:sequence>
+            <xs:attribute type="xs:string" name="key" use="required" />
+        </xs:complexType>
+    </xs:element>
+</xs:schema>
diff --git a/framework/common/template/JsLanguageFilesMapping.ftl b/framework/common/template/JsLanguageFilesMapping.ftl
index 707d805..a250144 100644
--- a/framework/common/template/JsLanguageFilesMapping.ftl
+++ b/framework/common/template/JsLanguageFilesMapping.ftl
@@ -1,112 +1,112 @@
-/*******************************************************************************

- * 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.

- *******************************************************************************/

-

-<#-- Use the createJsLanguageFileMapping service to create or update the JsLanguageFilesMapping.java. You will still need to compile thereafter -->

-

-package org.apache.ofbiz.common;

-

-import java.util.HashMap;

-import java.util.Map;

-

-    <#-- The comment in UPPERCASE below is dynamically put in the JsLanguageFilesMapping.java generated file, so please keep it... -->

-

-public final class JsLanguageFilesMapping {

-

-    // DO NOT EDIT THIS FILE!  THIS IS AUTO GENERATED AND WILL GET WRITTEN OVER PERIODICALLY WHEN THE DATA CHANGE

-    // Rather use the createJsLanguageFileMapping service to create or update it. You will still need to compile thereafter

-

-    public static class datejs {

-

-        private static Map<String, String> localeFiles = new HashMap<String, String>();

-        private static String defaultDateJs = "/images/jquery/plugins/datejs/date-en-US.js";

-

-        static {

-            <#list datejs.keySet() as dateJsFiles>

-            <#assign filePath = datejs.get(dateJsFiles) />

-            localeFiles.put("${dateJsFiles}", "${filePath}");

-            </#list>

-        }

-

-        public static String getFilePath(String locale) {

-            if (datejs.localeFiles.containsKey(locale)) {

-                return datejs.localeFiles.get(locale);

-            }

-            return datejs.defaultDateJs;

-        }

-

-    }

-

-    public static class jquery {

-        private static Map<String, String> localeFiles = new HashMap<String, String>();

-        private static String defaultDateJs = "/images/jquery/ui/i18n/jquery.ui.datepicker-en.js";

-

-        static {

-            <#list jquery.keySet() as jqueryFiles>

-            <#assign filePath = jquery.get(jqueryFiles) />

-            localeFiles.put("${jqueryFiles}", "${filePath}");

-            </#list>

-        }

-

-        public static String getFilePath(String locale) {

-            if (datejs.localeFiles.containsKey(locale)) {

-                return jquery.localeFiles.get(locale);

-            }

-            return jquery.defaultDateJs;

-        }

-

-    }

-

-    public static class validation {

-        private static Map<String, String> localeFiles = new HashMap<String, String>();

-        private static String defaultValidation = "/images/webapp/images/jquery/plugins/validate/localization/messages_en.js";

-

-        static {

-            <#list validation.keySet() as validationFiles>

-            <#assign filePath = validation.get(validationFiles) />

-            localeFiles.put("${validationFiles}", "${filePath}");

-            </#list>

-        }

-

-        public static String getFilePath(String locale) {

-            if (validation.localeFiles.containsKey(locale)) {

-                return validation.localeFiles.get(locale);

-            }

-            return validation.defaultValidation;

-        }

-    }

-

-    public static class dateTime {

-        private static Map<String, String> localeFiles = new HashMap<String, String>();

-        private static String defaultDateTime = "/images/webapp/images/jquery/ui/i18n/jquery.ui.datepicker-en.js";

-

-        static {

-            <#list dateTime.keySet() as dateTimeFiles>

-            <#assign filePath = dateTime.get(dateTimeFiles)! />

-            localeFiles.put("${dateTimeFiles}", "${filePath}");

-            </#list>

-        }

-

-        public static String getFilePath(String locale) {

-            if (dateTime.localeFiles.containsKey(locale)) {

-                return dateTime.localeFiles.get(locale);

-            }

-            return dateTime.defaultDateTime;

-        }

-    }

-}

+/*******************************************************************************
+ * 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.
+ *******************************************************************************/
+
+<#-- Use the createJsLanguageFileMapping service to create or update the JsLanguageFilesMapping.java. You will still need to compile thereafter -->
+
+package org.apache.ofbiz.common;
+
+import java.util.HashMap;
+import java.util.Map;
+
+    <#-- The comment in UPPERCASE below is dynamically put in the JsLanguageFilesMapping.java generated file, so please keep it... -->
+
+public final class JsLanguageFilesMapping {
+
+    // DO NOT EDIT THIS FILE!  THIS IS AUTO GENERATED AND WILL GET WRITTEN OVER PERIODICALLY WHEN THE DATA CHANGE
+    // Rather use the createJsLanguageFileMapping service to create or update it. You will still need to compile thereafter
+
+    public static class datejs {
+
+        private static Map<String, String> localeFiles = new HashMap<String, String>();
+        private static String defaultDateJs = "/images/jquery/plugins/datejs/date-en-US.js";
+
+        static {
+            <#list datejs.keySet() as dateJsFiles>
+            <#assign filePath = datejs.get(dateJsFiles) />
+            localeFiles.put("${dateJsFiles}", "${filePath}");
+            </#list>
+        }
+
+        public static String getFilePath(String locale) {
+            if (datejs.localeFiles.containsKey(locale)) {
+                return datejs.localeFiles.get(locale);
+            }
+            return datejs.defaultDateJs;
+        }
+
+    }
+
+    public static class jquery {
+        private static Map<String, String> localeFiles = new HashMap<String, String>();
+        private static String defaultDateJs = "/images/jquery/ui/i18n/jquery.ui.datepicker-en.js";
+
+        static {
+            <#list jquery.keySet() as jqueryFiles>
+            <#assign filePath = jquery.get(jqueryFiles) />
+            localeFiles.put("${jqueryFiles}", "${filePath}");
+            </#list>
+        }
+
+        public static String getFilePath(String locale) {
+            if (datejs.localeFiles.containsKey(locale)) {
+                return jquery.localeFiles.get(locale);
+            }
+            return jquery.defaultDateJs;
+        }
+
+    }
+
+    public static class validation {
+        private static Map<String, String> localeFiles = new HashMap<String, String>();
+        private static String defaultValidation = "/images/webapp/images/jquery/plugins/validate/localization/messages_en.js";
+
+        static {
+            <#list validation.keySet() as validationFiles>
+            <#assign filePath = validation.get(validationFiles) />
+            localeFiles.put("${validationFiles}", "${filePath}");
+            </#list>
+        }
+
+        public static String getFilePath(String locale) {
+            if (validation.localeFiles.containsKey(locale)) {
+                return validation.localeFiles.get(locale);
+            }
+            return validation.defaultValidation;
+        }
+    }
+
+    public static class dateTime {
+        private static Map<String, String> localeFiles = new HashMap<String, String>();
+        private static String defaultDateTime = "/images/webapp/images/jquery/ui/i18n/jquery.ui.datepicker-en.js";
+
+        static {
+            <#list dateTime.keySet() as dateTimeFiles>
+            <#assign filePath = dateTime.get(dateTimeFiles)! />
+            localeFiles.put("${dateTimeFiles}", "${filePath}");
+            </#list>
+        }
+
+        public static String getFilePath(String locale) {
+            if (dateTime.localeFiles.containsKey(locale)) {
+                return dateTime.localeFiles.get(locale);
+            }
+            return dateTime.defaultDateTime;
+        }
+    }
+}
diff --git a/framework/images/webapp/images/jquery/plugins/Readmore.js-master/README.md b/framework/images/webapp/images/jquery/plugins/Readmore.js-master/README.md
index 668310d..133c83d 100644
--- a/framework/images/webapp/images/jquery/plugins/Readmore.js-master/README.md
+++ b/framework/images/webapp/images/jquery/plugins/Readmore.js-master/README.md
@@ -1,100 +1,100 @@
-Readmore.js

-========

-

-A smooth, lightweight jQuery plugin for collapsing and expanding long blocks of text with "Read more" and "Close" links. 

-

-The required markup for Readmore.js is also extremely lightweight and very simple. No need for complicated sets of `div`s or hardcoded class names, just call ``.readmore()`` on the element containing your block of text and Readmore.js takes care of the rest.

-

-Readmore.js is compatible with all versions of jQuery greater than 1.7.0.

-

-## Example ##

-

-    $('article').readmore();

-  

-Yes, it's that simple. You can change the speed of the animation, the height of the collapsed block, and the open and close elements.

-

-    $('article').readmore({

-      speed: 75,

-      maxHeight: 500

-    });

-

-## The options: ##

-

-* `speed: 100` (in milliseconds)

-* `maxHeight: 200`  (in pixels)

-* `heightMargin: 16` (in pixels, avoids collapsing blocks that are only slightly larger than `maxHeight`)

-* `moreLink: '<a href="#">Read more</a>'`

-* `lessLink: '<a href="#">Close</a>'`

-* `embedCSS: true` (insert required CSS dynamically, set this to `false` if you include the necessary CSS in a stylesheet)

-* `sectionCSS: 'display: block; width: 100%;'` (sets the styling of the blocks, ignored if `embedCSS` is `false`)

-* `startOpen: false` (do not immediately truncate, start in the fully opened position)

-* `expandedClass: 'readmore-js-expanded'` (class added to expanded blocks)

-* `collapsedClass: 'readmore-js-collapsed'` (class added to collapsed blocks)

-* `beforeToggle: function() {}` (called after a more or less link is clicked, but *before* the block is collapsed or expanded)

-* `afterToggle: function() {}` (called *after* the block is collapsed or expanded)

-

-If the element has a `max-height` CSS property, Readmore.js will use that value rather than the value of the `maxHeight` option.

-

-### The callbacks:

-

-The callback functions, `beforeToggle()` and `afterToggle`, both receive the same arguments: `trigger`, `element`, and `expanded`.

-

-* `trigger`: the "Read more" or "Close" element that was clicked

-* `element`: the block that is being collapsed or expanded

-* `expanded`: Boolean; `true` means the block is expanded

-

-#### Callback example:

-

-Here's an example of how you could use the `afterToggle` callback to scroll back to the top of a block when the "Close" link is clicked.

-

-```javascript

-$('article').readmore({

-  afterToggle: function(trigger, element, expanded) {

-    if(! expanded) { // The "Close" link was clicked

-      $('html, body').animate( { scrollTop: element.offset().top }, {duration: 100 } );

-    }

-  }

-});

-```

-

-### Recommended CSS:

-

-The intention behind Readmore.js is to use CSS for as much functionality as possible. In particular, "collapsing" is achieved by setting `overflow: hidden` on the containing block and changing the `height` property.

-

-By default, Readmore.js inserts the following CSS:

-

-```css

-.readmore-js-toggle, .readmore-js-section {

-  display: block;

-  width: 100%;

-}

-.readmore-js-section {

-  overflow: hidden;

-}

-```

-

-You can override the the first set of rules when you set up Readmore.js like so:

-

-```javascript

-$('article').readmore({sectionCSS: 'display: inline-block; width: 50%;'});

-```

-

-If you want to include the necessary styling in your site's stylesheet, you can disable the dynamic embedding by passing `embedCSS: false` in the options hash.

-

-```javascript

-$('article').readmore({embedCSS: false});

-```

-

-## Removing Readmore

-

-You can remove the Readmore functionality like so:

-

-```javascript

-$('article').readmore('destroy');

-```

-

-Or, you can be more surgical by specifying a particular element:

-

-```javascript

-$('article:first').readmore('destroy');

-```

+Readmore.js
+========
+
+A smooth, lightweight jQuery plugin for collapsing and expanding long blocks of text with "Read more" and "Close" links. 
+
+The required markup for Readmore.js is also extremely lightweight and very simple. No need for complicated sets of `div`s or hardcoded class names, just call ``.readmore()`` on the element containing your block of text and Readmore.js takes care of the rest.
+
+Readmore.js is compatible with all versions of jQuery greater than 1.7.0.
+
+## Example ##
+
+    $('article').readmore();
+  
+Yes, it's that simple. You can change the speed of the animation, the height of the collapsed block, and the open and close elements.
+
+    $('article').readmore({
+      speed: 75,
+      maxHeight: 500
+    });
+
+## The options: ##
+
+* `speed: 100` (in milliseconds)
+* `maxHeight: 200`  (in pixels)
+* `heightMargin: 16` (in pixels, avoids collapsing blocks that are only slightly larger than `maxHeight`)
+* `moreLink: '<a href="#">Read more</a>'`
+* `lessLink: '<a href="#">Close</a>'`
+* `embedCSS: true` (insert required CSS dynamically, set this to `false` if you include the necessary CSS in a stylesheet)
+* `sectionCSS: 'display: block; width: 100%;'` (sets the styling of the blocks, ignored if `embedCSS` is `false`)
+* `startOpen: false` (do not immediately truncate, start in the fully opened position)
+* `expandedClass: 'readmore-js-expanded'` (class added to expanded blocks)
+* `collapsedClass: 'readmore-js-collapsed'` (class added to collapsed blocks)
+* `beforeToggle: function() {}` (called after a more or less link is clicked, but *before* the block is collapsed or expanded)
+* `afterToggle: function() {}` (called *after* the block is collapsed or expanded)
+
+If the element has a `max-height` CSS property, Readmore.js will use that value rather than the value of the `maxHeight` option.
+
+### The callbacks:
+
+The callback functions, `beforeToggle()` and `afterToggle`, both receive the same arguments: `trigger`, `element`, and `expanded`.
+
+* `trigger`: the "Read more" or "Close" element that was clicked
+* `element`: the block that is being collapsed or expanded
+* `expanded`: Boolean; `true` means the block is expanded
+
+#### Callback example:
+
+Here's an example of how you could use the `afterToggle` callback to scroll back to the top of a block when the "Close" link is clicked.
+
+```javascript
+$('article').readmore({
+  afterToggle: function(trigger, element, expanded) {
+    if(! expanded) { // The "Close" link was clicked
+      $('html, body').animate( { scrollTop: element.offset().top }, {duration: 100 } );
+    }
+  }
+});
+```
+
+### Recommended CSS:
+
+The intention behind Readmore.js is to use CSS for as much functionality as possible. In particular, "collapsing" is achieved by setting `overflow: hidden` on the containing block and changing the `height` property.
+
+By default, Readmore.js inserts the following CSS:
+
+```css
+.readmore-js-toggle, .readmore-js-section {
+  display: block;
+  width: 100%;
+}
+.readmore-js-section {
+  overflow: hidden;
+}
+```
+
+You can override the the first set of rules when you set up Readmore.js like so:
+
+```javascript
+$('article').readmore({sectionCSS: 'display: inline-block; width: 50%;'});
+```
+
+If you want to include the necessary styling in your site's stylesheet, you can disable the dynamic embedding by passing `embedCSS: false` in the options hash.
+
+```javascript
+$('article').readmore({embedCSS: false});
+```
+
+## Removing Readmore
+
+You can remove the Readmore functionality like so:
+
+```javascript
+$('article').readmore('destroy');
+```
+
+Or, you can be more surgical by specifying a particular element:
+
+```javascript
+$('article:first').readmore('destroy');
+```
diff --git a/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ca.js b/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ca.js
index 9c62412..90e5f75 100644
--- a/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ca.js
+++ b/framework/images/webapp/images/jquery/plugins/validate/localization/messages_ca.js
@@ -1,23 +1,23 @@
-/*

- * Translated default messages for the jQuery validation plugin.

- * Locale: CA (Catalan; català)

- */

-jQuery.extend(jQuery.validator.messages, {

-  required: "Aquest camp és obligatori.",

-  remote: "Si us plau, omple aquest camp.",

-  email: "Si us plau, escriu una adreça de correu-e vàlida",

-  url: "Si us plau, escriu una URL vàlida.",

-  date: "Si us plau, escriu una data vàlida.",

-  dateISO: "Si us plau, escriu una data (ISO) vàlida.",

-  number: "Si us plau, escriu un número enter vàlid.",

-  digits: "Si us plau, escriu només dígits.",

-  creditcard: "Si us plau, escriu un número de tarjeta vàlid.",

-  equalTo: "Si us plau, escriu el maateix valor de nou.",

-  accept: "Si us plau, escriu un valor amb una extensió acceptada.",

-  maxlength: jQuery.validator.format("Si us plau, no escriguis més de {0} caracters."),

-  minlength: jQuery.validator.format("Si us plau, no escriguis menys de {0} caracters."),

-  rangelength: jQuery.validator.format("Si us plau, escriu un valor entre {0} i {1} caracters."),

-  range: jQuery.validator.format("Si us plau, escriu un valor entre {0} i {1}."),

-  max: jQuery.validator.format("Si us plau, escriu un valor menor o igual a {0}."),

-  min: jQuery.validator.format("Si us plau, escriu un valor major o igual a {0}.")

+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: CA (Catalan; català)
+ */
+jQuery.extend(jQuery.validator.messages, {
+  required: "Aquest camp és obligatori.",
+  remote: "Si us plau, omple aquest camp.",
+  email: "Si us plau, escriu una adreça de correu-e vàlida",
+  url: "Si us plau, escriu una URL vàlida.",
+  date: "Si us plau, escriu una data vàlida.",
+  dateISO: "Si us plau, escriu una data (ISO) vàlida.",
+  number: "Si us plau, escriu un número enter vàlid.",
+  digits: "Si us plau, escriu només dígits.",
+  creditcard: "Si us plau, escriu un número de tarjeta vàlid.",
+  equalTo: "Si us plau, escriu el maateix valor de nou.",
+  accept: "Si us plau, escriu un valor amb una extensió acceptada.",
+  maxlength: jQuery.validator.format("Si us plau, no escriguis més de {0} caracters."),
+  minlength: jQuery.validator.format("Si us plau, no escriguis menys de {0} caracters."),
+  rangelength: jQuery.validator.format("Si us plau, escriu un valor entre {0} i {1} caracters."),
+  range: jQuery.validator.format("Si us plau, escriu un valor entre {0} i {1}."),
+  max: jQuery.validator.format("Si us plau, escriu un valor menor o igual a {0}."),
+  min: jQuery.validator.format("Si us plau, escriu un valor major o igual a {0}.")
 });
\ No newline at end of file
diff --git a/framework/images/webapp/images/jquery/plugins/validate/localization/messages_en.js b/framework/images/webapp/images/jquery/plugins/validate/localization/messages_en.js
index 205392a..d70d18b 100644
--- a/framework/images/webapp/images/jquery/plugins/validate/localization/messages_en.js
+++ b/framework/images/webapp/images/jquery/plugins/validate/localization/messages_en.js
@@ -1,24 +1,24 @@
-/*

- * Translated default messages for the jQuery validation plugin.

- * Locale: EN

- */

-jQuery.extend(jQuery.validator.messages, {

-    required: "This field is required.",

-    remote: "Please fix this field.",

-    email: "Please enter a valid email address.",

-    url: "Please enter a valid URL.",

-    date: "Please enter a valid date.",

-    dateISO: "Please enter a valid date (ISO).",

-    number: "Please enter a valid number.",

-    digits: "Please enter only digits.",

-    creditcard: "Please enter a valid credit card number.",

-    equalTo: "Please enter the same value again.",

-    accept: "Please enter a value with a valid extension.",

-    maxlength: $.validator.format("Please enter no more than {0} characters."),

-    minlength: $.validator.format("Please enter at least {0} characters."),

-    rangelength: $.validator.format("Please enter a value between {0} and {1} characters long."),

-    range: $.validator.format("Please enter a value between {0} and {1}."),

-    max: $.validator.format("Please enter a value less than or equal to {0}."),

-    min: $.validator.format("Please enter a value greater than or equal to {0}.")

-});

-

+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: EN
+ */
+jQuery.extend(jQuery.validator.messages, {
+    required: "This field is required.",
+    remote: "Please fix this field.",
+    email: "Please enter a valid email address.",
+    url: "Please enter a valid URL.",
+    date: "Please enter a valid date.",
+    dateISO: "Please enter a valid date (ISO).",
+    number: "Please enter a valid number.",
+    digits: "Please enter only digits.",
+    creditcard: "Please enter a valid credit card number.",
+    equalTo: "Please enter the same value again.",
+    accept: "Please enter a value with a valid extension.",
+    maxlength: $.validator.format("Please enter no more than {0} characters."),
+    minlength: $.validator.format("Please enter at least {0} characters."),
+    rangelength: $.validator.format("Please enter a value between {0} and {1} characters long."),
+    range: $.validator.format("Please enter a value between {0} and {1}."),
+    max: $.validator.format("Please enter a value less than or equal to {0}."),
+    min: $.validator.format("Please enter a value greater than or equal to {0}.")
+});
+
diff --git a/framework/images/webapp/images/jquery/plugins/validate/localization/messages_si.js b/framework/images/webapp/images/jquery/plugins/validate/localization/messages_si.js
index b8d8d7d..317022f 100644
--- a/framework/images/webapp/images/jquery/plugins/validate/localization/messages_si.js
+++ b/framework/images/webapp/images/jquery/plugins/validate/localization/messages_si.js
@@ -1,23 +1,23 @@
-/*

- * Translated default messages for the jQuery validation plugin.

- * Locale: SI (Slovenian)

- */

-jQuery.extend(jQuery.validator.messages, {

-	required: "To polje je obvezno.",

-	remote: "Vpis v tem polju ni v pravi obliki.",

-	email: "Prosimo, vnesite pravi email naslov.",

-	url: "Prosimo, vnesite pravi URL.",

-	date: "Prosimo, vnesite pravi datum.",

-	dateISO: "Prosimo, vnesite pravi datum (ISO).",

-	number: "Prosimo, vnesite pravo številko.",

-	digits: "Prosimo, vnesite samo številke.",

-	creditcard: "Prosimo, vnesite pravo številko kreditne kartice.",

-	equalTo: "Prosimo, ponovno vnesite enako vsebino.",

-	accept: "Prosimo, vnesite vsebino z pravo končnico.",

-	maxlength: $.validator.format("Prosimo, da ne vnašate več kot {0} znakov."),

-	minlength: $.validator.format("Prosimo, vnesite vsaj {0} znakov."),

-	rangelength: $.validator.format("Prosimo, vnesite od {0} do {1} znakov."),

-	range: $.validator.format("Prosimo, vnesite vrednost med {0} in {1}."),

-	max: $.validator.format("Prosimo, vnesite vrednost manjšo ali enako {0}."),

-	min: $.validator.format("Prosimo, vnesite vrednost večjo ali enako {0}.")

-});

+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: SI (Slovenian)
+ */
+jQuery.extend(jQuery.validator.messages, {
+	required: "To polje je obvezno.",
+	remote: "Vpis v tem polju ni v pravi obliki.",
+	email: "Prosimo, vnesite pravi email naslov.",
+	url: "Prosimo, vnesite pravi URL.",
+	date: "Prosimo, vnesite pravi datum.",
+	dateISO: "Prosimo, vnesite pravi datum (ISO).",
+	number: "Prosimo, vnesite pravo številko.",
+	digits: "Prosimo, vnesite samo številke.",
+	creditcard: "Prosimo, vnesite pravo številko kreditne kartice.",
+	equalTo: "Prosimo, ponovno vnesite enako vsebino.",
+	accept: "Prosimo, vnesite vsebino z pravo končnico.",
+	maxlength: $.validator.format("Prosimo, da ne vnašate več kot {0} znakov."),
+	minlength: $.validator.format("Prosimo, vnesite vsaj {0} znakov."),
+	rangelength: $.validator.format("Prosimo, vnesite od {0} do {1} znakov."),
+	range: $.validator.format("Prosimo, vnesite vrednost med {0} in {1}."),
+	max: $.validator.format("Prosimo, vnesite vrednost manjšo ali enako {0}."),
+	min: $.validator.format("Prosimo, vnesite vrednost večjo ali enako {0}.")
+});
diff --git a/framework/images/webapp/images/myportal.css b/framework/images/webapp/images/myportal.css
index ff51d04..bd2d986 100644
--- a/framework/images/webapp/images/myportal.css
+++ b/framework/images/webapp/images/myportal.css
@@ -1,40 +1,40 @@
-/*

- * 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.

- */

-

-html,body {

-height:100%;

-margin:0;

-}

-

-#loading {

-background-color: rgba(0, 0, 0, 0.496094);

-position: absolute;

-top: 0px;

-left: 0px;

-width: 100%;

-height: 100%;

-z-index: 9999;

-}

-

-#loaderImg {

-position: absolute;

-top: 250px;

-left: 50%;

-}

-

+/*
+ * 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.
+ */
+
+html,body {
+height:100%;
+margin:0;
+}
+
+#loading {
+background-color: rgba(0, 0, 0, 0.496094);
+position: absolute;
+top: 0px;
+left: 0px;
+width: 100%;
+height: 100%;
+z-index: 9999;
+}
+
+#loaderImg {
+position: absolute;
+top: 250px;
+left: 50%;
+}
+
diff --git a/framework/images/webapp/images/myportal.js b/framework/images/webapp/images/myportal.js
index 0112688..3d428d0 100644
--- a/framework/images/webapp/images/myportal.js
+++ b/framework/images/webapp/images/myportal.js
@@ -1,191 +1,191 @@
-/*

- * 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.

- */

-

-//Drag & Drop Functions for myPortal

-

-//global Var for controlling hover Boxes

-"use strict";

-var SORTABLE_COLUMN_LIST = null;

-var IS_UPDATED = false;

-var DESTINATION_COLUMN_ID = null;

-

-//init KeyListener

-jQuery(document).ready( function() {

-    // initializ the d_n_d jQuery functions

-    jQuery(SORTABLE_COLUMN_LIST).sortable({

-        connectWith: ".connectedSortable",

-        handle: ".portlet-config, .screenlet-title-bar",

-        tolerance: "pointer",

-        dropOnEmpty: true,

-        cursor: "move",

-        revert: true,

-        placeholder: "ui-state-highlight",

-        forcePlaceholderSize: true,

-        update: function(event, ui) {

-                    IS_UPDATED = true;

-                    DESTINATION_COLUMN_ID = jQuery(this).attr("id");

-                },

-        stop: function(event, ui) {

-                    preparePortletBackgroundOrderChange(jQuery(SORTABLE_COLUMN_LIST).sortable("toArray", {connected: true}), jQuery(ui.item).attr("id"), DESTINATION_COLUMN_ID);

-                    // reset the flags

-                    IS_UPDATED = false;

-                    DESTINATION_COLUMN_ID = null;

-                }

-    });

-});

-

-function preparePortletBackgroundOrderChange(serializedDate, dragedItemId, destinationColumnId) {

-    if (!IS_UPDATED) {

-        return;

-    } 

-    

-    // split the portal column id

-    destinationColumnId = destinationColumnId.split("_")[1];

-    

-    // make clean array and remove all fields with empty values

-    var dataArray = []

-    jQuery.each(serializedDate, function(index, value) {

-        if (value.length) {

-            dataArray.push(value);

-        }

-    });

-

-    // find the new position of the moved element in the array

-    var beforeItem = null;

-    var afterItem = null;

-    var currentItem = null;

-    

-    jQuery.each(dataArray, function(index, value) {

-        if (dragedItemId == value) {

-            // create object for the item before the current dropped object if not undefined

-            var dataArrayValue = dataArray[index-1];

-            if (dataArrayValue != undefined) {

-                beforeItem = jQuery("#" + dataArrayValue);

-            }

-            

-            // create object for the item after the current dropped object if not undefined                         

-            dataArrayValue = dataArray[index+1];

-            if (dataArrayValue != undefined) {                          

-                afterItem = jQuery("#" + dataArrayValue);

-            }

-            

-            // create object for the current dropped object

-            currentItem = jQuery("#" + value);

-            

-            // break the jQuery.each loop

-            return false;

-        } 

-    });

-    

-    // check if the before or after Item is still in the new column to get a reference Object in this column

-    var nextObjectToDroppedItem = null;

-    

-    // check if the item is moved to another column

-    if (destinationColumnId != null && destinationColumnId != currentItem.attr("columnseqid") ) {

-        //mode can be "BEFORE" (for adding the item before the nextObjectToDroppedItem), "AFTER" (for adding the item after the nextObjectToDroppedItem) or "NEW" (when the item is the first one in the list and should be added to the top)

-        var mode = null;

-        if ((beforeItem == null || destinationColumnId != beforeItem.attr("columnseqid")) && (afterItem == null || destinationColumnId != afterItem.attr("columnseqid"))) {

-            // the moved object entered an empty list

-            mode = "NEW";

-        } else if (beforeItem != null && destinationColumnId == beforeItem.attr("columnseqid")) {

-            // the moved object entered in a new list and should be moved after this beforeItem

-            nextObjectToDroppedItem = beforeItem;

-            mode = "AFTER";

-        } else if (afterItem != null && destinationColumnId == afterItem.attr("columnseqid")) {

-            // the moved object entered in a new list and should be moved before this beforeItem

-            nextObjectToDroppedItem = afterItem;

-            mode = "BEFORE";

-        }

-        

-    } else {

-        // if the item is moved in the same column get the before and/or after element

-        if (beforeItem.attr("id") != null) {

-            mode = "AFTER";

-            nextObjectToDroppedItem = beforeItem;

-        } else if (afterItem.attr("id") != null){

-            mode = "BEFORE";

-            nextObjectToDroppedItem = afterItem;

-        }

-    }

-    

-    // call the update service

-    updatePortletOrder(currentItem, nextObjectToDroppedItem, mode, destinationColumnId);

-    

-    // change the html attributes after the move

-    currentItem.attr({"columnseqid": destinationColumnId});

-    

-

-}

-

-function updatePortletOrder(currentItem, nextObjectToDroppedItem, mode, destinationColumn) {

-    onStartRequest();

-    // create a JSON request object with the needed information

-    var requestData = {

-            mode: mode,

-            destinationColumn: destinationColumn,

-            o_portalPageId: currentItem.attr("portalpageid"),

-            o_portalPortletId: currentItem.attr("portalportletid"),

-            o_portletSeqId: currentItem.attr("portletseqid"),

-            d_portalPageId: (nextObjectToDroppedItem != null) ? nextObjectToDroppedItem.attr("portalpageid") : null,

-            d_portalPortletId: (nextObjectToDroppedItem != null) ? nextObjectToDroppedItem.attr("portalportletid") : null,

-            d_portletSeqId: (nextObjectToDroppedItem != null) ? nextObjectToDroppedItem.attr("portletseqid") : null

-    };

-    

-    jQuery.ajax({

-        url: "/myportal/control/updatePortalPagePortletSeqAjax",

-        data: requestData,

-        type: "POST",

-    }).success( function(data){ onCompleteRequest(); });

-

-}

-

-//removes the loading image

-function onCompleteRequest() {

-    var loading = document.getElementById("loading");

-    if(loading != null){

-        //IE Fix (IE treats DOM objects and Javascript objects separately, and you can't extend the DOM objects using Object.prototype)

-        loading.parentNode.removeChild(loading);

-    }

-}

-

-//safely get height of whole document

-function getDocHeight() {

-    var D = document;

-    return Math.max(

-        Math.max(D.body.scrollHeight, D.documentElement.scrollHeight),

-        Math.max(D.body.offsetHeight, D.documentElement.offsetHeight),

-        Math.max(D.body.clientHeight, D.documentElement.clientHeight)

-    );

-}

-

-//displays the loading image

-function onStartRequest() {    

-    var p = document.createElement("div");

-    p.setAttribute("id", "loading");    

-    p.setAttribute("style", "height: " + getDocHeight() + "px;" )

-    

-    var img = document.createElement("img");

-    img.setAttribute("src", "/images/loader.gif");

-    img.setAttribute("id", "loaderImg");

-

-    p.appendChild(img);

-    

-    var container = document.getElementById("content-main-section");

-    container.appendChild(p);

-}

+/*
+ * 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.
+ */
+
+//Drag & Drop Functions for myPortal
+
+//global Var for controlling hover Boxes
+"use strict";
+var SORTABLE_COLUMN_LIST = null;
+var IS_UPDATED = false;
+var DESTINATION_COLUMN_ID = null;
+
+//init KeyListener
+jQuery(document).ready( function() {
+    // initializ the d_n_d jQuery functions
+    jQuery(SORTABLE_COLUMN_LIST).sortable({
+        connectWith: ".connectedSortable",
+        handle: ".portlet-config, .screenlet-title-bar",
+        tolerance: "pointer",
+        dropOnEmpty: true,
+        cursor: "move",
+        revert: true,
+        placeholder: "ui-state-highlight",
+        forcePlaceholderSize: true,
+        update: function(event, ui) {
+                    IS_UPDATED = true;
+                    DESTINATION_COLUMN_ID = jQuery(this).attr("id");
+                },
+        stop: function(event, ui) {
+                    preparePortletBackgroundOrderChange(jQuery(SORTABLE_COLUMN_LIST).sortable("toArray", {connected: true}), jQuery(ui.item).attr("id"), DESTINATION_COLUMN_ID);
+                    // reset the flags
+                    IS_UPDATED = false;
+                    DESTINATION_COLUMN_ID = null;
+                }
+    });
+});
+
+function preparePortletBackgroundOrderChange(serializedDate, dragedItemId, destinationColumnId) {
+    if (!IS_UPDATED) {
+        return;
+    } 
+    
+    // split the portal column id
+    destinationColumnId = destinationColumnId.split("_")[1];
+    
+    // make clean array and remove all fields with empty values
+    var dataArray = []
+    jQuery.each(serializedDate, function(index, value) {
+        if (value.length) {
+            dataArray.push(value);
+        }
+    });
+
+    // find the new position of the moved element in the array
+    var beforeItem = null;
+    var afterItem = null;
+    var currentItem = null;
+    
+    jQuery.each(dataArray, function(index, value) {
+        if (dragedItemId == value) {
+            // create object for the item before the current dropped object if not undefined
+            var dataArrayValue = dataArray[index-1];
+            if (dataArrayValue != undefined) {
+                beforeItem = jQuery("#" + dataArrayValue);
+            }
+            
+            // create object for the item after the current dropped object if not undefined                         
+            dataArrayValue = dataArray[index+1];
+            if (dataArrayValue != undefined) {                          
+                afterItem = jQuery("#" + dataArrayValue);
+            }
+            
+            // create object for the current dropped object
+            currentItem = jQuery("#" + value);
+            
+            // break the jQuery.each loop
+            return false;
+        } 
+    });
+    
+    // check if the before or after Item is still in the new column to get a reference Object in this column
+    var nextObjectToDroppedItem = null;
+    
+    // check if the item is moved to another column
+    if (destinationColumnId != null && destinationColumnId != currentItem.attr("columnseqid") ) {
+        //mode can be "BEFORE" (for adding the item before the nextObjectToDroppedItem), "AFTER" (for adding the item after the nextObjectToDroppedItem) or "NEW" (when the item is the first one in the list and should be added to the top)
+        var mode = null;
+        if ((beforeItem == null || destinationColumnId != beforeItem.attr("columnseqid")) && (afterItem == null || destinationColumnId != afterItem.attr("columnseqid"))) {
+            // the moved object entered an empty list
+            mode = "NEW";
+        } else if (beforeItem != null && destinationColumnId == beforeItem.attr("columnseqid")) {
+            // the moved object entered in a new list and should be moved after this beforeItem
+            nextObjectToDroppedItem = beforeItem;
+            mode = "AFTER";
+        } else if (afterItem != null && destinationColumnId == afterItem.attr("columnseqid")) {
+            // the moved object entered in a new list and should be moved before this beforeItem
+            nextObjectToDroppedItem = afterItem;
+            mode = "BEFORE";
+        }
+        
+    } else {
+        // if the item is moved in the same column get the before and/or after element
+        if (beforeItem.attr("id") != null) {
+            mode = "AFTER";
+            nextObjectToDroppedItem = beforeItem;
+        } else if (afterItem.attr("id") != null){
+            mode = "BEFORE";
+            nextObjectToDroppedItem = afterItem;
+        }
+    }
+    
+    // call the update service
+    updatePortletOrder(currentItem, nextObjectToDroppedItem, mode, destinationColumnId);
+    
+    // change the html attributes after the move
+    currentItem.attr({"columnseqid": destinationColumnId});
+    
+
+}
+
+function updatePortletOrder(currentItem, nextObjectToDroppedItem, mode, destinationColumn) {
+    onStartRequest();
+    // create a JSON request object with the needed information
+    var requestData = {
+            mode: mode,
+            destinationColumn: destinationColumn,
+            o_portalPageId: currentItem.attr("portalpageid"),
+            o_portalPortletId: currentItem.attr("portalportletid"),
+            o_portletSeqId: currentItem.attr("portletseqid"),
+            d_portalPageId: (nextObjectToDroppedItem != null) ? nextObjectToDroppedItem.attr("portalpageid") : null,
+            d_portalPortletId: (nextObjectToDroppedItem != null) ? nextObjectToDroppedItem.attr("portalportletid") : null,
+            d_portletSeqId: (nextObjectToDroppedItem != null) ? nextObjectToDroppedItem.attr("portletseqid") : null
+    };
+    
+    jQuery.ajax({
+        url: "/myportal/control/updatePortalPagePortletSeqAjax",
+        data: requestData,
+        type: "POST",
+    }).success( function(data){ onCompleteRequest(); });
+
+}
+
+//removes the loading image
+function onCompleteRequest() {
+    var loading = document.getElementById("loading");
+    if(loading != null){
+        //IE Fix (IE treats DOM objects and Javascript objects separately, and you can't extend the DOM objects using Object.prototype)
+        loading.parentNode.removeChild(loading);
+    }
+}
+
+//safely get height of whole document
+function getDocHeight() {
+    var D = document;
+    return Math.max(
+        Math.max(D.body.scrollHeight, D.documentElement.scrollHeight),
+        Math.max(D.body.offsetHeight, D.documentElement.offsetHeight),
+        Math.max(D.body.clientHeight, D.documentElement.clientHeight)
+    );
+}
+
+//displays the loading image
+function onStartRequest() {    
+    var p = document.createElement("div");
+    p.setAttribute("id", "loading");    
+    p.setAttribute("style", "height: " + getDocHeight() + "px;" )
+    
+    var img = document.createElement("img");
+    img.setAttribute("src", "/images/loader.gif");
+    img.setAttribute("id", "loaderImg");
+
+    p.appendChild(img);
+    
+    var container = document.getElementById("content-main-section");
+    container.appendChild(p);
+}
diff --git a/framework/widget/dtd/widget-common.xsd b/framework/widget/dtd/widget-common.xsd
index 81af510..f202463 100644
--- a/framework/widget/dtd/widget-common.xsd
+++ b/framework/widget/dtd/widget-common.xsd
@@ -1,692 +1,692 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-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.

--->

-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">

-

-    <xs:complexType name="ConditionRootType">

-        <xs:choice>

-            <xs:element ref="and" />

-            <xs:element ref="or" />

-            <xs:element ref="xor" />

-            <xs:element ref="not" />

-            <xs:element ref="if-service-permission" />

-            <xs:element ref="if-has-permission" />

-            <xs:element ref="if-entity-permission" />

-            <xs:element ref="if-validate-method" />

-            <xs:element ref="if-compare" />

-            <xs:element ref="if-compare-field" />

-            <xs:element ref="if-regexp" />

-            <xs:element ref="if-empty" />

-        </xs:choice>

-    </xs:complexType>

-    <xs:element name="AllConditionals" abstract="true" />

-    <xs:element name="and" substitutionGroup="AllConditionals">

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element maxOccurs="unbounded" ref="AllConditionals" />

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="xor" substitutionGroup="AllConditionals">

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element maxOccurs="unbounded" ref="AllConditionals" />

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="or" substitutionGroup="AllConditionals">

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element maxOccurs="unbounded" ref="AllConditionals" />

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="not" substitutionGroup="AllConditionals">

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element ref="AllConditionals" />

-            </xs:sequence>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="if-service-permission" substitutionGroup="AllConditionals">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="service-name" use="required" />

-            <xs:attribute type="xs:string" name="resource-description" use="optional" />

-            <xs:attribute type="xs:string" name="context-map" use="optional" />

-            <xs:attribute name="main-action" use="optional">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="CREATE" />

-                        <xs:enumeration value="UPDATE" />

-                        <xs:enumeration value="DELETE" />

-                        <xs:enumeration value="VIEW" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="if-has-permission" substitutionGroup="AllConditionals">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="permission" use="required" />

-            <xs:attribute type="xs:string" name="action" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="if-entity-permission" substitutionGroup="AllConditionals">

-        <xs:complexType>

-            <xs:choice minOccurs="0">

-                <xs:element minOccurs="0" maxOccurs="1" ref="permission-condition-getter" />

-                <xs:element minOccurs="0" maxOccurs="1" ref="related-role-getter" />

-                <xs:element minOccurs="0" maxOccurs="1" ref="auxiliary-value-getter" />

-            </xs:choice>

-            <xs:attribute type="xs:string" name="entity-name" use="required" />

-            <xs:attribute type="xs:string" name="entity-id" use="required">

-                <xs:annotation>

-                    <xs:documentation>Can have multiple pipe separated values, but don't use spaces.</xs:documentation>

-                </xs:annotation>

-            </xs:attribute>

-            <xs:attribute type="xs:string" name="target-operation" use="required">

-                <xs:annotation>

-                    <xs:documentation>Can have multiple pipe separated values, but don't use spaces.</xs:documentation>

-                </xs:annotation>

-            </xs:attribute>

-            <xs:attribute name="display-fail-cond" default="false">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="true" />

-                        <xs:enumeration value="false" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="permission-condition-getter">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="entity-name" />

-            <xs:attribute type="xs:string" name="operation-field-name" />

-            <xs:attribute type="xs:string" name="role-field-name" />

-            <xs:attribute type="xs:string" name="auxiliary-field-name" />

-            <xs:attribute type="xs:string" name="status-field-name" />

-            <xs:attribute type="xs:string" name="privilege-field-name" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="related-role-getter">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="entity-name" />

-            <xs:attribute type="xs:string" name="role-entity-name" />

-            <xs:attribute type="xs:string" name="role-type-field-name" />

-            <xs:attribute type="xs:string" name="party-field-name" />

-            <xs:attribute type="xs:string" name="owner-entity-field-name" />

-            <xs:attribute type="xs:string" name="entity-id-name" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="auxiliary-value-getter">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="entity-name" />

-            <xs:attribute type="xs:string" name="auxiliary-field-name" />

-            <xs:attribute type="xs:string" name="entity-id-name" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="if-validate-method" substitutionGroup="AllConditionals">

-        <xs:annotation>

-            <xs:documentation>Calls a static Java method that takes a String and returns a boolean.</xs:documentation>

-        </xs:annotation>

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="field" use="required" />

-            <xs:attribute type="xs:string" name="method" use="required" />

-            <xs:attribute type="xs:string" name="class" default="org.apache.ofbiz.base.util.UtilValidate" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="if-compare" substitutionGroup="AllConditionals">

-        <xs:complexType>

-            <xs:attribute name="field" type="xs:string" use="required" />

-            <xs:attribute name="operator" use="required">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="less" />

-                        <xs:enumeration value="greater" />

-                        <xs:enumeration value="less-equals" />

-                        <xs:enumeration value="greater-equals" />

-                        <xs:enumeration value="equals" />

-                        <xs:enumeration value="not-equals" />

-                        <xs:enumeration value="contains" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-            <xs:attribute name="value" type="xs:string" use="required" />

-            <xs:attribute name="type" default="String">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="PlainString" />

-                        <xs:enumeration value="String" />

-                        <xs:enumeration value="BigDecimal" />

-                        <xs:enumeration value="Double" />

-                        <xs:enumeration value="Float" />

-                        <xs:enumeration value="Long" />

-                        <xs:enumeration value="Integer" />

-                        <xs:enumeration value="Date" />

-                        <xs:enumeration value="Time" />

-                        <xs:enumeration value="Timestamp" />

-                        <xs:enumeration value="Boolean" />

-                        <xs:enumeration value="Object" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-            <xs:attribute type="xs:string" name="format" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="if-compare-field" substitutionGroup="AllConditionals">

-        <xs:complexType>

-            <xs:attribute name="field" type="xs:string" use="required" />

-            <xs:attribute name="operator" use="required">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="less" />

-                        <xs:enumeration value="greater" />

-                        <xs:enumeration value="less-equals" />

-                        <xs:enumeration value="greater-equals" />

-                        <xs:enumeration value="equals" />

-                        <xs:enumeration value="not-equals" />

-                        <xs:enumeration value="contains" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-            <xs:attribute name="to-field" type="xs:string" />

-            <xs:attribute name="type" default="String">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="PlainString" />

-                        <xs:enumeration value="String" />

-                        <xs:enumeration value="BigDecimal" />

-                        <xs:enumeration value="Double" />

-                        <xs:enumeration value="Float" />

-                        <xs:enumeration value="Long" />

-                        <xs:enumeration value="Integer" />

-                        <xs:enumeration value="Date" />

-                        <xs:enumeration value="Time" />

-                        <xs:enumeration value="Timestamp" />

-                        <xs:enumeration value="Boolean" />

-                        <xs:enumeration value="Object" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-            <xs:attribute type="xs:string" name="format" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="if-regexp" substitutionGroup="AllConditionals">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="field" use="required" />

-            <xs:attribute type="xs:string" name="expr" use="required" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="if-empty" substitutionGroup="AllConditionals">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="field" use="required" />

-        </xs:complexType>

-    </xs:element>

-

-    <xs:element name="AllActions" abstract="true" />

-    <xs:element name="set" substitutionGroup="AllActions">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="field" use="required" />

-            <xs:attribute type="xs:string" name="from-field" />

-            <xs:attribute type="xs:string" name="value" />

-            <xs:attribute type="xs:string" name="default-value" />

-            <xs:attribute name="global" default="false">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="true" />

-                        <xs:enumeration value="false" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-            <xs:attribute name="type">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="PlainString" />

-                        <xs:enumeration value="String" />

-                        <xs:enumeration value="BigDecimal" />

-                        <xs:enumeration value="Double" />

-                        <xs:enumeration value="Float" />

-                        <xs:enumeration value="List" />

-                        <xs:enumeration value="Long" />

-                        <xs:enumeration value="Integer" />

-                        <xs:enumeration value="Date" />

-                        <xs:enumeration value="Time" />

-                        <xs:enumeration value="Timestamp" />

-                        <xs:enumeration value="Boolean" />

-                        <xs:enumeration value="Object" />

-                        <xs:enumeration value="NewList" />

-                        <xs:enumeration value="NewMap" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-            <xs:attribute name="to-scope" default="screen">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="screen" />

-                        <xs:enumeration value="user" />

-                        <xs:enumeration value="application" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-            <xs:attribute name="from-scope" default="screen">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="screen" />

-                        <xs:enumeration value="user" />

-                        <xs:enumeration value="application" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="property-map" substitutionGroup="AllActions">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="resource" use="required" />

-            <xs:attribute type="xs:string" name="map-name" use="required" />

-            <xs:attribute name="global" default="false">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="true" />

-                        <xs:enumeration value="false" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="property-to-field" substitutionGroup="AllActions">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="resource" use="required" />

-            <xs:attribute type="xs:string" name="property" use="required" />

-            <xs:attribute type="xs:string" name="field" use="required" />

-            <xs:attribute type="xs:string" name="default" />

-            <xs:attribute name="no-locale" default="false">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="true" />

-                        <xs:enumeration value="false" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-            <xs:attribute type="xs:string" name="arg-list-name" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="script" substitutionGroup="AllActions">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="location" use="required" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="entity-one" substitutionGroup="AllActions">

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="field-map" />

-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" />

-            </xs:sequence>

-            <xs:attribute name="entity-name" type="xs:string" use="required" />

-            <xs:attribute name="value-field" type="xs:string" use="required" />

-            <xs:attribute name="use-cache" default="false">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="true" />

-                        <xs:enumeration value="false" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-            <xs:attribute name="auto-field-map" default="true">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="true" />

-                        <xs:enumeration value="false" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="get-related-one" substitutionGroup="AllActions">

-        <xs:complexType>

-            <xs:attribute name="value-field" type="xs:string" use="required" />

-            <xs:attribute name="relation-name" type="xs:string" use="required" />

-            <xs:attribute name="use-cache" type="xs:string" default="false" />

-            <xs:attribute name="to-value-field" type="xs:string" use="required" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="get-related" substitutionGroup="AllActions">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="value-field" use="required" />

-            <xs:attribute type="xs:string" name="relation-name" use="required" />

-            <xs:attribute type="xs:string" name="map" />

-            <xs:attribute type="xs:string" name="order-by-list" />

-            <xs:attribute type="xs:string" name="use-cache" default="false" />

-            <xs:attribute type="xs:string" name="list" use="required" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="condition-list">

-        <xs:complexType>

-            <xs:choice maxOccurs="unbounded">

-                <xs:element ref="condition-expr" />

-                <xs:element ref="condition-list" />

-                <xs:element ref="condition-object" />

-            </xs:choice>

-            <xs:attribute name="combine" default="and">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="and" />

-                        <xs:enumeration value="or" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="having-condition-list">

-        <xs:complexType>

-            <xs:choice maxOccurs="unbounded">

-                <xs:element ref="condition-expr" />

-                <xs:element ref="condition-list" />

-                <xs:element ref="condition-object" />

-            </xs:choice>

-            <xs:attribute name="combine" default="and">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="and" />

-                        <xs:enumeration value="or" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="condition-expr">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="field-name" use="required" />

-            <xs:attribute name="operator" default="equals">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="less" />

-                        <xs:enumeration value="greater" />

-                        <xs:enumeration value="less-equals" />

-                        <xs:enumeration value="greater-equals" />

-                        <xs:enumeration value="equals" />

-                        <xs:enumeration value="not-equals" />

-                        <xs:enumeration value="in" />

-                        <xs:enumeration value="not-in" />

-                        <xs:enumeration value="between" />

-                        <xs:enumeration value="like" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-            <xs:attribute type="xs:string" name="from-field" />

-            <xs:attribute type="xs:string" name="value" />

-            <xs:attribute name="ignore-if-null" default="false">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="true" />

-                        <xs:enumeration value="false" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-            <xs:attribute name="ignore-if-empty" default="false">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="true" />

-                        <xs:enumeration value="false" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-            <xs:attribute name="ignore-case" default="false">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="true" />

-                        <xs:enumeration value="false" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-            <xs:attribute name="ignore" default="false">

-                <xs:annotation>

-                    <xs:documentation>

-                        Ignore the condition if flag is true.

-                        Defaults to false.

-                    </xs:documentation>

-                </xs:annotation>

-            </xs:attribute>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="condition-object">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="field" use="required" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="select-field">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="field-name" use="required" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="order-by">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="field-name" use="required" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="limit-range">

-        <xs:complexType>

-            <xs:attribute name="start" type="xs:string" use="required">

-                <xs:annotation>

-                    <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>

-                </xs:annotation>

-            </xs:attribute>

-            <xs:attribute name="size" type="xs:string" use="required">

-                <xs:annotation>

-                    <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>

-                </xs:annotation>

-            </xs:attribute>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="limit-view">

-        <xs:complexType>

-            <xs:attribute name="view-index" type="xs:string" use="required">

-                <xs:annotation>

-                    <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>

-                </xs:annotation>

-            </xs:attribute>

-            <xs:attribute name="view-size" type="xs:string" use="required">

-                <xs:annotation>

-                    <xs:documentation>Should resolve into a positive integer.</xs:documentation>

-                </xs:annotation>

-            </xs:attribute>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="use-iterator" />

-    <xs:element name="field-map">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="field-name" use="required" />

-            <xs:attribute type="xs:string" name="from-field" />

-            <xs:attribute type="xs:string" name="value" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="parameter">

-        <xs:complexType>

-            <xs:attribute type="xs:string" name="param-name" use="required" />

-            <xs:attribute type="xs:string" name="from-field" />

-            <xs:attribute type="xs:string" name="value" />

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="auto-parameters-service">

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="exclude" />

-            </xs:sequence>

-            <xs:attribute name="service-name" type="xs:string">

-                <xs:annotation>

-                    <xs:documentation>The service name used to resolve parameters. If empty, use form defaultServiceName. Flexible string allowed.</xs:documentation>

-                </xs:annotation>

-            </xs:attribute>

-            <xs:attribute name="send-if-empty" default="true">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="true" />

-                        <xs:enumeration value="false" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="auto-parameters-entity">

-        <xs:complexType>

-            <xs:sequence>

-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="exclude" />

-            </xs:sequence>

-            <xs:attribute name="entity-name" type="xs:string">

-                <xs:annotation>

-                    <xs:documentation>The entity name used to resolve parameters. If empty use form defaultEntityName attribute. Flexible string allowed.</xs:documentation>

-                </xs:annotation>

-            </xs:attribute>

-            <xs:attribute name="include" default="pk">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="pk" />

-                        <xs:enumeration value="nonpk" />

-                        <xs:enumeration value="all" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-            <xs:attribute name="send-if-empty" default="true">

-                <xs:simpleType>

-                    <xs:restriction base="xs:token">

-                        <xs:enumeration value="true" />

-                        <xs:enumeration value="false" />

-                    </xs:restriction>

-                </xs:simpleType>

-            </xs:attribute>

-        </xs:complexType>

-    </xs:element>

-    <xs:element name="exclude">

-        <xs:complexType>

-            <xs:attribute name="field-name" type="xs:string" use="required" />

-        </xs:complexType>

-    </xs:element>

-    <xs:complexType name="link">

-        <xs:sequence>

-            <xs:element minOccurs="0" ref="auto-parameters-service"/>

-            <xs:element minOccurs="0" ref="auto-parameters-entity"/>

-            <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter" />

-            <xs:element minOccurs="0" name="image" type="image" />

-        </xs:sequence>

-        <xs:attribute type="xs:string" name="text" />

-        <xs:attribute type="xs:string" name="id">

-            <xs:annotation>

-                <xs:documentation>

-                    If you use id for link present in list form or multi form, you can use ${itemIndex} to generate an unique id by line.

-                </xs:documentation>

-            </xs:annotation>

-        </xs:attribute>

-        <xs:attribute type="xs:string" name="style" />

-        <xs:attribute type="xs:string" name="name" />

-        <xs:attribute type="xs:string" name="title" />

-        <xs:attribute type="xs:nonNegativeInteger" name="size" /><!-- Text size limit -->

-        <xs:attribute type="xs:string" name="target" />

-        <xs:attribute type="xs:string" name="target-window" />

-        <xs:attribute type="xs:string" name="prefix" />

-        <xs:attribute type="xs:string" name="width" />

-        <xs:attribute type="xs:string" name="height" />

-        <xs:attribute name="link-type" default="auto">

-            <xs:simpleType>

-                <xs:restriction base="xs:token">

-                    <xs:enumeration value="auto">

-                        <xs:annotation>

-                            <xs:documentation>

-                                If selected the hidden-form type will be used if the url-mode is intra-app

-                                and the request specified has an event, otherwise the anchor type will be used,

-                                except if the layered-modal mode is specified.

-                            </xs:documentation>

-                        </xs:annotation>

-                    </xs:enumeration>

-                    <xs:enumeration value="anchor" />

-                    <xs:enumeration value="hidden-form" />

-                    <xs:enumeration value="layered-modal" />

-                </xs:restriction>

-            </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="url-mode" default="intra-app">

-            <xs:simpleType>

-                <xs:restriction base="xs:token">

-                    <xs:enumeration value="intra-app" />

-                    <xs:enumeration value="inter-app" />

-                    <xs:enumeration value="content" />

-                    <xs:enumeration value="plain" />

-                </xs:restriction>

-            </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="full-path" default="false">

-            <xs:simpleType>

-                <xs:restriction base="xs:token">

-                    <xs:enumeration value="true" />

-                    <xs:enumeration value="false" />

-                </xs:restriction>

-            </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="secure" default="false">

-            <xs:simpleType>

-                <xs:restriction base="xs:token">

-                    <xs:enumeration value="true" />

-                    <xs:enumeration value="false" />

-                </xs:restriction>

-            </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="encode" default="false">

-            <xs:simpleType>

-                <xs:restriction base="xs:token">

-                    <xs:enumeration value="true" />

-                    <xs:enumeration value="false" />

-                </xs:restriction>

-            </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="request-confirmation" default="false">

-            <xs:annotation>

-                <xs:documentation>If true then the user is presented with a dialog box, if confirmation-message is empty, use default</xs:documentation>

-            </xs:annotation>

-            <xs:simpleType>

-                <xs:restriction base="xs:token">

-                    <xs:enumeration value="true" />

-                    <xs:enumeration value="false" />

-                </xs:restriction>

-            </xs:simpleType>

-        </xs:attribute>

-        <xs:attribute name="confirmation-message" type="xs:string">

-            <xs:annotation>

-                <xs:documentation>The message displayed in confirmation box</xs:documentation>

-            </xs:annotation>

-        </xs:attribute>

-    </xs:complexType>

-    <xs:complexType name="image" mixed="true">

-        <xs:attribute type="xs:string" name="src" />

-        <xs:attribute type="xs:string" name="id" />

-        <xs:attribute type="xs:string" name="style" />

-        <xs:attribute type="xs:string" name="width" />

-        <xs:attribute type="xs:string" name="height" />

-        <xs:attribute type="xs:string" name="border" />

-        <xs:attribute type="xs:string" name="alt" />

-        <xs:attribute type="xs:string" name="title" />

-        <xs:attribute name="url-mode" default="content">

-            <xs:simpleType>

-                <xs:restriction base="xs:token">

-                    <xs:enumeration value="ofbiz" />

-                    <xs:enumeration value="content" />

-                    <xs:enumeration value="raw" />

-                </xs:restriction>

-            </xs:simpleType>

-        </xs:attribute>

-    </xs:complexType>

-</xs:schema>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+
+    <xs:complexType name="ConditionRootType">
+        <xs:choice>
+            <xs:element ref="and" />
+            <xs:element ref="or" />
+            <xs:element ref="xor" />
+            <xs:element ref="not" />
+            <xs:element ref="if-service-permission" />
+            <xs:element ref="if-has-permission" />
+            <xs:element ref="if-entity-permission" />
+            <xs:element ref="if-validate-method" />
+            <xs:element ref="if-compare" />
+            <xs:element ref="if-compare-field" />
+            <xs:element ref="if-regexp" />
+            <xs:element ref="if-empty" />
+        </xs:choice>
+    </xs:complexType>
+    <xs:element name="AllConditionals" abstract="true" />
+    <xs:element name="and" substitutionGroup="AllConditionals">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="AllConditionals" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="xor" substitutionGroup="AllConditionals">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="AllConditionals" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="or" substitutionGroup="AllConditionals">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="AllConditionals" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="not" substitutionGroup="AllConditionals">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="AllConditionals" />
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="if-service-permission" substitutionGroup="AllConditionals">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="service-name" use="required" />
+            <xs:attribute type="xs:string" name="resource-description" use="optional" />
+            <xs:attribute type="xs:string" name="context-map" use="optional" />
+            <xs:attribute name="main-action" use="optional">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="CREATE" />
+                        <xs:enumeration value="UPDATE" />
+                        <xs:enumeration value="DELETE" />
+                        <xs:enumeration value="VIEW" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="if-has-permission" substitutionGroup="AllConditionals">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="permission" use="required" />
+            <xs:attribute type="xs:string" name="action" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="if-entity-permission" substitutionGroup="AllConditionals">
+        <xs:complexType>
+            <xs:choice minOccurs="0">
+                <xs:element minOccurs="0" maxOccurs="1" ref="permission-condition-getter" />
+                <xs:element minOccurs="0" maxOccurs="1" ref="related-role-getter" />
+                <xs:element minOccurs="0" maxOccurs="1" ref="auxiliary-value-getter" />
+            </xs:choice>
+            <xs:attribute type="xs:string" name="entity-name" use="required" />
+            <xs:attribute type="xs:string" name="entity-id" use="required">
+                <xs:annotation>
+                    <xs:documentation>Can have multiple pipe separated values, but don't use spaces.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="target-operation" use="required">
+                <xs:annotation>
+                    <xs:documentation>Can have multiple pipe separated values, but don't use spaces.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="display-fail-cond" default="false">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="permission-condition-getter">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="entity-name" />
+            <xs:attribute type="xs:string" name="operation-field-name" />
+            <xs:attribute type="xs:string" name="role-field-name" />
+            <xs:attribute type="xs:string" name="auxiliary-field-name" />
+            <xs:attribute type="xs:string" name="status-field-name" />
+            <xs:attribute type="xs:string" name="privilege-field-name" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="related-role-getter">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="entity-name" />
+            <xs:attribute type="xs:string" name="role-entity-name" />
+            <xs:attribute type="xs:string" name="role-type-field-name" />
+            <xs:attribute type="xs:string" name="party-field-name" />
+            <xs:attribute type="xs:string" name="owner-entity-field-name" />
+            <xs:attribute type="xs:string" name="entity-id-name" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="auxiliary-value-getter">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="entity-name" />
+            <xs:attribute type="xs:string" name="auxiliary-field-name" />
+            <xs:attribute type="xs:string" name="entity-id-name" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="if-validate-method" substitutionGroup="AllConditionals">
+        <xs:annotation>
+            <xs:documentation>Calls a static Java method that takes a String and returns a boolean.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="field" use="required" />
+            <xs:attribute type="xs:string" name="method" use="required" />
+            <xs:attribute type="xs:string" name="class" default="org.apache.ofbiz.base.util.UtilValidate" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="if-compare" substitutionGroup="AllConditionals">
+        <xs:complexType>
+            <xs:attribute name="field" type="xs:string" use="required" />
+            <xs:attribute name="operator" use="required">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="less" />
+                        <xs:enumeration value="greater" />
+                        <xs:enumeration value="less-equals" />
+                        <xs:enumeration value="greater-equals" />
+                        <xs:enumeration value="equals" />
+                        <xs:enumeration value="not-equals" />
+                        <xs:enumeration value="contains" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="value" type="xs:string" use="required" />
+            <xs:attribute name="type" default="String">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="PlainString" />
+                        <xs:enumeration value="String" />
+                        <xs:enumeration value="BigDecimal" />
+                        <xs:enumeration value="Double" />
+                        <xs:enumeration value="Float" />
+                        <xs:enumeration value="Long" />
+                        <xs:enumeration value="Integer" />
+                        <xs:enumeration value="Date" />
+                        <xs:enumeration value="Time" />
+                        <xs:enumeration value="Timestamp" />
+                        <xs:enumeration value="Boolean" />
+                        <xs:enumeration value="Object" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="format" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="if-compare-field" substitutionGroup="AllConditionals">
+        <xs:complexType>
+            <xs:attribute name="field" type="xs:string" use="required" />
+            <xs:attribute name="operator" use="required">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="less" />
+                        <xs:enumeration value="greater" />
+                        <xs:enumeration value="less-equals" />
+                        <xs:enumeration value="greater-equals" />
+                        <xs:enumeration value="equals" />
+                        <xs:enumeration value="not-equals" />
+                        <xs:enumeration value="contains" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="to-field" type="xs:string" />
+            <xs:attribute name="type" default="String">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="PlainString" />
+                        <xs:enumeration value="String" />
+                        <xs:enumeration value="BigDecimal" />
+                        <xs:enumeration value="Double" />
+                        <xs:enumeration value="Float" />
+                        <xs:enumeration value="Long" />
+                        <xs:enumeration value="Integer" />
+                        <xs:enumeration value="Date" />
+                        <xs:enumeration value="Time" />
+                        <xs:enumeration value="Timestamp" />
+                        <xs:enumeration value="Boolean" />
+                        <xs:enumeration value="Object" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="format" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="if-regexp" substitutionGroup="AllConditionals">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="field" use="required" />
+            <xs:attribute type="xs:string" name="expr" use="required" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="if-empty" substitutionGroup="AllConditionals">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="field" use="required" />
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="AllActions" abstract="true" />
+    <xs:element name="set" substitutionGroup="AllActions">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="field" use="required" />
+            <xs:attribute type="xs:string" name="from-field" />
+            <xs:attribute type="xs:string" name="value" />
+            <xs:attribute type="xs:string" name="default-value" />
+            <xs:attribute name="global" default="false">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="type">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="PlainString" />
+                        <xs:enumeration value="String" />
+                        <xs:enumeration value="BigDecimal" />
+                        <xs:enumeration value="Double" />
+                        <xs:enumeration value="Float" />
+                        <xs:enumeration value="List" />
+                        <xs:enumeration value="Long" />
+                        <xs:enumeration value="Integer" />
+                        <xs:enumeration value="Date" />
+                        <xs:enumeration value="Time" />
+                        <xs:enumeration value="Timestamp" />
+                        <xs:enumeration value="Boolean" />
+                        <xs:enumeration value="Object" />
+                        <xs:enumeration value="NewList" />
+                        <xs:enumeration value="NewMap" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="to-scope" default="screen">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="screen" />
+                        <xs:enumeration value="user" />
+                        <xs:enumeration value="application" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="from-scope" default="screen">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="screen" />
+                        <xs:enumeration value="user" />
+                        <xs:enumeration value="application" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="property-map" substitutionGroup="AllActions">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="resource" use="required" />
+            <xs:attribute type="xs:string" name="map-name" use="required" />
+            <xs:attribute name="global" default="false">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="property-to-field" substitutionGroup="AllActions">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="resource" use="required" />
+            <xs:attribute type="xs:string" name="property" use="required" />
+            <xs:attribute type="xs:string" name="field" use="required" />
+            <xs:attribute type="xs:string" name="default" />
+            <xs:attribute name="no-locale" default="false">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="arg-list-name" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="script" substitutionGroup="AllActions">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="location" use="required" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="entity-one" substitutionGroup="AllActions">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="field-map" />
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" />
+            </xs:sequence>
+            <xs:attribute name="entity-name" type="xs:string" use="required" />
+            <xs:attribute name="value-field" type="xs:string" use="required" />
+            <xs:attribute name="use-cache" default="false">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="auto-field-map" default="true">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="get-related-one" substitutionGroup="AllActions">
+        <xs:complexType>
+            <xs:attribute name="value-field" type="xs:string" use="required" />
+            <xs:attribute name="relation-name" type="xs:string" use="required" />
+            <xs:attribute name="use-cache" type="xs:string" default="false" />
+            <xs:attribute name="to-value-field" type="xs:string" use="required" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="get-related" substitutionGroup="AllActions">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="value-field" use="required" />
+            <xs:attribute type="xs:string" name="relation-name" use="required" />
+            <xs:attribute type="xs:string" name="map" />
+            <xs:attribute type="xs:string" name="order-by-list" />
+            <xs:attribute type="xs:string" name="use-cache" default="false" />
+            <xs:attribute type="xs:string" name="list" use="required" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="condition-list">
+        <xs:complexType>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element ref="condition-expr" />
+                <xs:element ref="condition-list" />
+                <xs:element ref="condition-object" />
+            </xs:choice>
+            <xs:attribute name="combine" default="and">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="and" />
+                        <xs:enumeration value="or" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="having-condition-list">
+        <xs:complexType>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element ref="condition-expr" />
+                <xs:element ref="condition-list" />
+                <xs:element ref="condition-object" />
+            </xs:choice>
+            <xs:attribute name="combine" default="and">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="and" />
+                        <xs:enumeration value="or" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="condition-expr">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="field-name" use="required" />
+            <xs:attribute name="operator" default="equals">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="less" />
+                        <xs:enumeration value="greater" />
+                        <xs:enumeration value="less-equals" />
+                        <xs:enumeration value="greater-equals" />
+                        <xs:enumeration value="equals" />
+                        <xs:enumeration value="not-equals" />
+                        <xs:enumeration value="in" />
+                        <xs:enumeration value="not-in" />
+                        <xs:enumeration value="between" />
+                        <xs:enumeration value="like" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute type="xs:string" name="from-field" />
+            <xs:attribute type="xs:string" name="value" />
+            <xs:attribute name="ignore-if-null" default="false">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="ignore-if-empty" default="false">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="ignore-case" default="false">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="ignore" default="false">
+                <xs:annotation>
+                    <xs:documentation>
+                        Ignore the condition if flag is true.
+                        Defaults to false.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="condition-object">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="field" use="required" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="select-field">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="field-name" use="required" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="order-by">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="field-name" use="required" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="limit-range">
+        <xs:complexType>
+            <xs:attribute name="start" type="xs:string" use="required">
+                <xs:annotation>
+                    <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="size" type="xs:string" use="required">
+                <xs:annotation>
+                    <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="limit-view">
+        <xs:complexType>
+            <xs:attribute name="view-index" type="xs:string" use="required">
+                <xs:annotation>
+                    <xs:documentation>Should resolve into a non-negative integer.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="view-size" type="xs:string" use="required">
+                <xs:annotation>
+                    <xs:documentation>Should resolve into a positive integer.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="use-iterator" />
+    <xs:element name="field-map">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="field-name" use="required" />
+            <xs:attribute type="xs:string" name="from-field" />
+            <xs:attribute type="xs:string" name="value" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="parameter">
+        <xs:complexType>
+            <xs:attribute type="xs:string" name="param-name" use="required" />
+            <xs:attribute type="xs:string" name="from-field" />
+            <xs:attribute type="xs:string" name="value" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="auto-parameters-service">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="exclude" />
+            </xs:sequence>
+            <xs:attribute name="service-name" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>The service name used to resolve parameters. If empty, use form defaultServiceName. Flexible string allowed.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="send-if-empty" default="true">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="auto-parameters-entity">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="exclude" />
+            </xs:sequence>
+            <xs:attribute name="entity-name" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>The entity name used to resolve parameters. If empty use form defaultEntityName attribute. Flexible string allowed.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="include" default="pk">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="pk" />
+                        <xs:enumeration value="nonpk" />
+                        <xs:enumeration value="all" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+            <xs:attribute name="send-if-empty" default="true">
+                <xs:simpleType>
+                    <xs:restriction base="xs:token">
+                        <xs:enumeration value="true" />
+                        <xs:enumeration value="false" />
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="exclude">
+        <xs:complexType>
+            <xs:attribute name="field-name" type="xs:string" use="required" />
+        </xs:complexType>
+    </xs:element>
+    <xs:complexType name="link">
+        <xs:sequence>
+            <xs:element minOccurs="0" ref="auto-parameters-service"/>
+            <xs:element minOccurs="0" ref="auto-parameters-entity"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter" />
+            <xs:element minOccurs="0" name="image" type="image" />
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="text" />
+        <xs:attribute type="xs:string" name="id">
+            <xs:annotation>
+                <xs:documentation>
+                    If you use id for link present in list form or multi form, you can use ${itemIndex} to generate an unique id by line.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute type="xs:string" name="style" />
+        <xs:attribute type="xs:string" name="name" />
+        <xs:attribute type="xs:string" name="title" />
+        <xs:attribute type="xs:nonNegativeInteger" name="size" /><!-- Text size limit -->
+        <xs:attribute type="xs:string" name="target" />
+        <xs:attribute type="xs:string" name="target-window" />
+        <xs:attribute type="xs:string" name="prefix" />
+        <xs:attribute type="xs:string" name="width" />
+        <xs:attribute type="xs:string" name="height" />
+        <xs:attribute name="link-type" default="auto">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="auto">
+                        <xs:annotation>
+                            <xs:documentation>
+                                If selected the hidden-form type will be used if the url-mode is intra-app
+                                and the request specified has an event, otherwise the anchor type will be used,
+                                except if the layered-modal mode is specified.
+                            </xs:documentation>
+                        </xs:annotation>
+                    </xs:enumeration>
+                    <xs:enumeration value="anchor" />
+                    <xs:enumeration value="hidden-form" />
+                    <xs:enumeration value="layered-modal" />
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="url-mode" default="intra-app">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="intra-app" />
+                    <xs:enumeration value="inter-app" />
+                    <xs:enumeration value="content" />
+                    <xs:enumeration value="plain" />
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="full-path" default="false">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true" />
+                    <xs:enumeration value="false" />
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="secure" default="false">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true" />
+                    <xs:enumeration value="false" />
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="encode" default="false">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true" />
+                    <xs:enumeration value="false" />
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="request-confirmation" default="false">
+            <xs:annotation>
+                <xs:documentation>If true then the user is presented with a dialog box, if confirmation-message is empty, use default</xs:documentation>
+            </xs:annotation>
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="true" />
+                    <xs:enumeration value="false" />
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+        <xs:attribute name="confirmation-message" type="xs:string">
+            <xs:annotation>
+                <xs:documentation>The message displayed in confirmation box</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="image" mixed="true">
+        <xs:attribute type="xs:string" name="src" />
+        <xs:attribute type="xs:string" name="id" />
+        <xs:attribute type="xs:string" name="style" />
+        <xs:attribute type="xs:string" name="width" />
+        <xs:attribute type="xs:string" name="height" />
+        <xs:attribute type="xs:string" name="border" />
+        <xs:attribute type="xs:string" name="alt" />
+        <xs:attribute type="xs:string" name="title" />
+        <xs:attribute name="url-mode" default="content">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="ofbiz" />
+                    <xs:enumeration value="content" />
+                    <xs:enumeration value="raw" />
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:complexType>
+</xs:schema>
diff --git a/framework/widget/templates/HtmlMenuMacroLibrary.ftl b/framework/widget/templates/HtmlMenuMacroLibrary.ftl
index 03b9a56..66962ac 100644
--- a/framework/widget/templates/HtmlMenuMacroLibrary.ftl
+++ b/framework/widget/templates/HtmlMenuMacroLibrary.ftl
@@ -1,107 +1,107 @@
-<#--

-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.

--->

-

-<#macro renderMenuBegin boundaryComment="" id="" style="" title="">

-  <#if boundaryComment?has_content>

-<!-- ${boundaryComment} -->

-  </#if>

-  <#-- FIXME: A menu could have an ID and a style, but some visual themes break if both are used. -->

-  <div<#if id?has_content> id="${id}"<#elseif style?has_content> class="${style}"</#if>>

-  <#if title?has_content>

-  <h2>${title}</h2>

-  </#if>

-  <ul>

-    <li>

-      <ul>

-</#macro>

-

-<#macro renderMenuEnd boundaryComment="">

-      </ul>

-    </li>

-  </ul>

-  <br class="clear"/>

-  </div>

-<#if boundaryComment?has_content>

-<!-- ${boundaryComment} -->

-</#if>

-</#macro>

-

-<#macro renderImage src id style width height border>

-<img src="${src}"<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if width?has_content> width="${width}"</#if><#if height?has_content> height="${height}"</#if><#if border?has_content> border="${border}"</#if> />

-</#macro>

-

-<#macro renderLink linkUrl parameterList targetWindow uniqueItemName actionUrl linkType="" id="" style="" name="" height="" width="" text="" imgStr="">

-  <#if linkType?has_content && "hidden-form" == linkType>

-<form method="post" action="${actionUrl}"<#if targetWindow?has_content> target="${targetWindow}"</#if> onsubmit="javascript:submitFormDisableSubmits(this)" name="${uniqueItemName}"><#rt/>

-    <#list parameterList as parameter>

-<input name="${parameter.name}" value="${parameter.value}" type="hidden"/><#rt/>

-    </#list>

-</form><#rt/>

-  </#if>

-  <#if uniqueItemName?has_content && "layered-modal" == linkType>

-<div id="${uniqueItemName}"></div>

-<a href="javascript:void(0);" id="${uniqueItemName}_link" 

-    <#if style?has_content>class="${style}"</#if>>

-    <#if text?has_content>${text}</#if></a>

-<script type="text/javascript">

-    function ${uniqueItemName}_data() {

-        var data =  {

-                   <#list parameterList as parameter>

-                    "${parameter.name}": "${parameter.value}",

-                    </#list>

-                    "presentation": "layer"

-                };

-                return data;

-            }

-            jQuery("#${uniqueItemName}_link").click(function () {

-                jQuery("#${uniqueItemName}").dialog("open");

-            });

-            jQuery("#${uniqueItemName}").dialog({

-                 autoOpen: false,

-                 <#if text?has_content>title: "${text}",</#if>

-                 height: <#if height == "">600<#else>${height}</#if>,

-                 width: <#if width == "">800<#else>${width}</#if>,

-                 modal: true,

-                 closeOnEscape: true,

-                 open: function() {

-                         jQuery.ajax({

-                             url: "${linkUrl}",

-                             type: "POST",

-                             data: ${uniqueItemName}_data(),

-                             success: function(data) {jQuery("#${uniqueItemName}").html(data);}

-                         });

-                 }

-            });

-      </script>

-  <#else>

-<#if (linkType?has_content && "hidden-form" == linkType) || linkUrl?has_content>

-<a<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if name?has_content> name="${name}"</#if><#if targetWindow?has_content> target="${targetWindow}"</#if> href="<#if "hidden-form"==linkType>javascript:document.${uniqueItemName}.submit()<#else>${linkUrl}</#if>"><#rt/>

-</#if>

-<#if imgStr?has_content>${imgStr}</#if> <#if text?has_content>${text}</#if><#rt/>

-<#if (linkType?has_content && "hidden-form" == linkType) || linkUrl?has_content></a><#rt/></#if>

-  </#if>

-</#macro>

-

-<#macro renderMenuItemBegin style toolTip linkStr containsNestedMenus>

-        <li<#if style?has_content> class="${style}"</#if><#if toolTip?has_content> title="${toolTip}"</#if>><#if linkStr?has_content>${linkStr}</#if><#if containsNestedMenus><ul></#if><#rt/>

-</#macro>

-

-<#macro renderMenuItemEnd containsNestedMenus>

-<#if containsNestedMenus></ul></#if></li>

-</#macro>

+<#--
+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.
+-->
+
+<#macro renderMenuBegin boundaryComment="" id="" style="" title="">
+  <#if boundaryComment?has_content>
+<!-- ${boundaryComment} -->
+  </#if>
+  <#-- FIXME: A menu could have an ID and a style, but some visual themes break if both are used. -->
+  <div<#if id?has_content> id="${id}"<#elseif style?has_content> class="${style}"</#if>>
+  <#if title?has_content>
+  <h2>${title}</h2>
+  </#if>
+  <ul>
+    <li>
+      <ul>
+</#macro>
+
+<#macro renderMenuEnd boundaryComment="">
+      </ul>
+    </li>
+  </ul>
+  <br class="clear"/>
+  </div>
+<#if boundaryComment?has_content>
+<!-- ${boundaryComment} -->
+</#if>
+</#macro>
+
+<#macro renderImage src id style width height border>
+<img src="${src}"<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if width?has_content> width="${width}"</#if><#if height?has_content> height="${height}"</#if><#if border?has_content> border="${border}"</#if> />
+</#macro>
+
+<#macro renderLink linkUrl parameterList targetWindow uniqueItemName actionUrl linkType="" id="" style="" name="" height="" width="" text="" imgStr="">
+  <#if linkType?has_content && "hidden-form" == linkType>
+<form method="post" action="${actionUrl}"<#if targetWindow?has_content> target="${targetWindow}"</#if> onsubmit="javascript:submitFormDisableSubmits(this)" name="${uniqueItemName}"><#rt/>
+    <#list parameterList as parameter>
+<input name="${parameter.name}" value="${parameter.value}" type="hidden"/><#rt/>
+    </#list>
+</form><#rt/>
+  </#if>
+  <#if uniqueItemName?has_content && "layered-modal" == linkType>
+<div id="${uniqueItemName}"></div>
+<a href="javascript:void(0);" id="${uniqueItemName}_link" 
+    <#if style?has_content>class="${style}"</#if>>
+    <#if text?has_content>${text}</#if></a>
+<script type="text/javascript">
+    function ${uniqueItemName}_data() {
+        var data =  {
+                   <#list parameterList as parameter>
+                    "${parameter.name}": "${parameter.value}",
+                    </#list>
+                    "presentation": "layer"
+                };
+                return data;
+            }
+            jQuery("#${uniqueItemName}_link").click(function () {
+                jQuery("#${uniqueItemName}").dialog("open");
+            });
+            jQuery("#${uniqueItemName}").dialog({
+                 autoOpen: false,
+                 <#if text?has_content>title: "${text}",</#if>
+                 height: <#if height == "">600<#else>${height}</#if>,
+                 width: <#if width == "">800<#else>${width}</#if>,
+                 modal: true,
+                 closeOnEscape: true,
+                 open: function() {
+                         jQuery.ajax({
+                             url: "${linkUrl}",
+                             type: "POST",
+                             data: ${uniqueItemName}_data(),
+                             success: function(data) {jQuery("#${uniqueItemName}").html(data);}
+                         });
+                 }
+            });
+      </script>
+  <#else>
+<#if (linkType?has_content && "hidden-form" == linkType) || linkUrl?has_content>
+<a<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if name?has_content> name="${name}"</#if><#if targetWindow?has_content> target="${targetWindow}"</#if> href="<#if "hidden-form"==linkType>javascript:document.${uniqueItemName}.submit()<#else>${linkUrl}</#if>"><#rt/>
+</#if>
+<#if imgStr?has_content>${imgStr}</#if> <#if text?has_content>${text}</#if><#rt/>
+<#if (linkType?has_content && "hidden-form" == linkType) || linkUrl?has_content></a><#rt/></#if>
+  </#if>
+</#macro>
+
+<#macro renderMenuItemBegin style toolTip linkStr containsNestedMenus>
+        <li<#if style?has_content> class="${style}"</#if><#if toolTip?has_content> title="${toolTip}"</#if>><#if linkStr?has_content>${linkStr}</#if><#if containsNestedMenus><ul></#if><#rt/>
+</#macro>
+
+<#macro renderMenuItemEnd containsNestedMenus>
+<#if containsNestedMenus></ul></#if></li>
+</#macro>
diff --git a/plugins/birt/webapp/birt/WEB-INF/birt.tld b/plugins/birt/webapp/birt/WEB-INF/birt.tld
index f00d7e8..514cc59 100644
--- a/plugins/birt/webapp/birt/WEB-INF/birt.tld
+++ b/plugins/birt/webapp/birt/WEB-INF/birt.tld
@@ -1,1175 +1,1175 @@
-<?xml version='1.0' encoding='ISO-8859-1' ?>

-<!DOCTYPE taglib

-    PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"

-    "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">

-<!--

-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.

--->

-<taglib>

-    <tlib-version>1.0</tlib-version>

-    <jsp-version>1.2</jsp-version>

-    <short-name>BIRT Tag Library</short-name>

-    <uri>http://www.eclipse.org/birt/taglibs/birt.tld</uri>

-    <description>

-        This Tag Library makes user develope JSP with BIRT Viewer component easily.

-    </description>

-    

-    <!--**********************************************-->

-    <!--             Viewer Tag                       -->

-    <!--**********************************************-->

-    <tag>

-        <name>viewer</name>

-        <tag-class>org.eclipse.birt.report.taglib.ViewerTag</tag-class>

-        <body-content>JSP</body-content>

-        <description>

-            The viewer tag is to specify how to import and control BIRT Report Viewer into JSP page.

-            This tag will use Ajax framework to retrieve report content.

-        </description>

-

-        <attribute>

-            <name>id</name>

-            <required>true</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the current viewer id. It should be unique.

-                It can contain number,letter or underline.

-            </description>            

-        </attribute>    

-

-        <attribute>

-            <name>pattern</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies which servlet pattern to be used to preview report.

-                Default value is frameset.

-                ( frameset or run )

-            </description>

-        </attribute>

-                        

-        <attribute>

-            <name>baseURL</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies base URL of BIRT viewer.

-                Default to the current context.

-            </description>

-        </attribute>

-        

-        <attribute>

-            <name>title</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report title displayed at the top.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>isHostPage</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether the viewer occupies the whole page.

-                Default to false.

-            </description>

-        </attribute>

-

-       <attribute>

-            <name>scrolling </name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the IFrame style "scrolling ".

-                If isHostPage is true, ignore this attribute.

-                ( auto | yes | no )

-            </description>

-        </attribute>

-

-       <attribute>

-            <name>position</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the style "position" of report container.

-                If isHostPage is true, ignore this attribute.

-                ( static | absolute | fixed | relative )

-            </description>

-        </attribute>

-

-       <attribute>

-            <name>style</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the style of report container.

-                If isHostPage is true, ignore this attribute.

-            </description>

-        </attribute>

-                        

-        <attribute>

-            <name>height</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the height of report container in pixels.

-                If isHostPage is true, ignore this attribute.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>width</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the width of report container in pixels.

-                If isHostPage is true, ignore this attribute.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>top</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the top of report container in pixels.

-                If isHostPage is true, ignore this attribute.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>left</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                 Sets the left of report container in pixels.

-                 If isHostPage is true, ignore this attribute.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>frameborder</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                 Specifies whether displays the iframe border.

-                Default to no. 

-                If isHostPage is true, ignore this attribute.

-                ( Yes | No )

-            </description>

-        </attribute>

-                        

-        <attribute>

-            <name>reportDesign</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report design file name.

-                ( Absolute path, relative path or URL )

-            </description>    

-        </attribute>        

-

-        <attribute>

-            <name>reportDocument</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report document file name. 

-                Noted: only support "file:" URL format.

-                ( Absolute path, relative path or URL ) 

-            </description>    

-        </attribute>        

-

-        <attribute>

-            <name>reportletId</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the instance id of reportlet.

-                The "reportDocument" attribute should be required.

-                Noted: frameset pattern doesn't support reportlet.

-            </description>    

-        </attribute>

-                

-        <attribute>

-            <name>bookmark</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the targeted bookmark name.

-            </description>            

-        </attribute>

-        

-        <attribute>

-            <name>locale</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the Locale information.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>timeZone</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies a time zone id. For example: "America/Los_Angeles" or "GMT+1" or "GMT+01:00".

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>svg</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether supports the SVG output format or not.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>format</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the output format of report.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>emitterId</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the emitter id for the report output.

-            </description>            

-        </attribute>

-        

-        <attribute>

-            <name>pageOverflow</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the page overflow setting for the PDF format.

-                One of the following values:

-                0 for "auto", 1 for "actual size", 2 for "fit to page". 

-            </description>            

-        </attribute>

-        

-        <attribute>

-            <name>rtl</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether supports rtl page or not.

-            </description>            

-        </attribute>

-                

-        <attribute>

-            <name>pageNum</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies output page number when render document file.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>pageRange</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies page range when render document file.

-            </description>            

-        </attribute>

-                                

-        <attribute>

-            <name>resourceFolder</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the referenced resource folder.

-                Default value is defined in web.xml.

-            </description>            

-        </attribute>

-                                            

-        <attribute>

-            <name>forceOverwriteDocument</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether forces to overwrite the generated document.

-                If allowPageBreak is false,ignore this attribute.

-                Default value is defined in web.xml.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>showTitle</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether shows the report title.

-                Default to true.

-            </description>            

-        </attribute>

-        

-        <attribute>

-            <name>showToolBar</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether shows the toolbar.

-                Default to true.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>showNavigationBar</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether shows the Navigation Bar.

-                If allowPageBreak is false,ignore this attribute.

-                Default to true.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>showParameterPage</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether show the parameter dialog or not.

-                Default to true.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>isReportlet</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether render reportlet by bookmark.

-                Default to false.

-            </description>            

-        </attribute>

-        

-    </tag>

-

-     <!--**********************************************-->

-    <!--             Report Tag                       -->

-    <!--**********************************************-->

-    <tag>

-        <name>report</name>

-        <tag-class>org.eclipse.birt.report.taglib.ReportTag</tag-class>

-        <body-content>JSP</body-content>

-        <description>

-            The report tag can provide fast report preview without Ajax framework. 

-            The report content can be output to web browser directly.

-        </description>

-

-        <attribute>

-            <name>id</name>

-            <required>true</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the current viewer id. It should be unique.

-                It can contain number,letter or underline.

-            </description>            

-        </attribute>    

-                

-        <attribute>

-            <name>baseURL</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies base URL of BIRT viewer.

-                Default to the current context.

-                If report container is DIV, ignore this attribute.

-            </description>

-        </attribute>

-        

-        <attribute>

-            <name>isHostPage</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether the viewer occupies the whole page.

-                Default to false.

-            </description>

-        </attribute>

-

-       <attribute>

-            <name>scrolling </name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the DIV/IFrame style "scrolling ".

-                If isHostPage is true, ignore this attribute.

-                ( auto | yes | no )

-            </description>

-        </attribute>

-

-       <attribute>

-            <name>position</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the style "position" of report container.

-                If isHostPage is true, ignore this attribute.

-                ( static | absolute | fixed | relative )

-            </description>

-        </attribute>

-

-       <attribute>

-            <name>style</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the style of report container.

-                If isHostPage is true, ignore this attribute.

-            </description>

-        </attribute>

-                        

-        <attribute>

-            <name>height</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the height of report container in pixels.

-                If isHostPage is true, ignore this attribute.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>width</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the width of report container in pixels.

-                If isHostPage is true, ignore this attribute.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>top</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the top of report container in pixels.

-                If isHostPage is true, ignore this attribute.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>left</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                 Sets the left of report container in pixels.

-                 If isHostPage is true, ignore this attribute.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>frameborder</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                 Specifies whether displays the iframe border.

-                 Available when user IFrame.

-                Default to no.

-                ( Yes | No )

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>reportDesign</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report design file name.

-                ( Absolute path, relative path or URL )

-            </description>    

-        </attribute>        

-

-        <attribute>

-            <name>reportDocument</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report document file name. 

-                Noted: only support "file:" URL format.

-                ( Absolute path, relative path or URL ) 

-            </description>    

-        </attribute>

-

-        <attribute>

-            <name>reportletId</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the instance id of reportlet.

-                The "reportDocument" attribute should be required.

-            </description>    

-        </attribute>

-                            

-        <attribute>

-            <name>bookmark</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the targeted bookmark name.

-            </description>            

-        </attribute>

-        

-        <attribute>

-            <name>locale</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the Locale information.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>timeZone</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies a time zone id. For example: "America/Los_Angeles" or "GMT+1" or "GMT+01:00".

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>svg</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether supports the SVG output format or not.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>format</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the output format of report.

-            </description>            

-        </attribute>

-        

-        <attribute>

-            <name>emitterId</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the emitter id for the report output.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>pageOverflow</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the page overflow setting for the PDF format.

-                One of the following values:

-                0 for "auto", 1 for "actual size", 2 for "fit to page". 

-            </description>            

-        </attribute>

-        

-        <attribute>

-            <name>rtl</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether supports rtl page or not.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>showParameterPage</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether show the parameter dialog or not.

-                Default to true.

-                If report container is DIV, ignore this attribute.

-            </description>            

-        </attribute>

-                                                

-        <attribute>

-            <name>resourceFolder</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the referenced resource folder.

-                Default value is defined in web.xml.

-            </description>            

-        </attribute>            

-                                    

-        <attribute>

-            <name>reportContainer</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies iframe or div as report container.

-                Default to iframe.

-                ( iframe | div )

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>pageNum</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies output page number when render document file.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>pageRange</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies page range when render document file.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>isReportlet</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether render reportlet by bookmark.

-                Default to false.

-            </description>            

-        </attribute>

-                

-    </tag>    

-    

-    <!--**********************************************-->

-    <!--             Report Parameter Tag             -->

-    <!--**********************************************-->

-     <tag>

-        <name>param</name>

-        <tag-class>org.eclipse.birt.report.taglib.ParamTag</tag-class>

-        <body-content>JSP</body-content>

-        <description>

-            The param tag specifies the parameters defined in report design file.

-        </description>

-        <attribute>

-            <name>name</name>

-            <required>true</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report parameter name.

-            </description>

-        </attribute>

-        <attribute>

-            <name>pattern</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report parameter pattern format.

-            </description>

-        </attribute>     

-        <attribute>

-            <name>value</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report parameter value. If doesn't set, value is null.

-            </description>

-        </attribute>

-        <attribute>

-            <name>displayText</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report parameter display text.

-            </description>

-        </attribute>

-        <attribute>

-            <name>delim</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the delimiter for multiple values.

-                Defaults to pipe "|".

-            </description>

-        </attribute>

-        <attribute>

-            <name>isLocale</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether the report parameter value is a locale/format related string.

-            </description>

-        </attribute>

-     </tag>   

-

-    <!--**********************************************-->

-    <!--             Report Parameter Value Tag       -->

-    <!--**********************************************-->

-     <tag>

-        <name>value</name>

-        <tag-class>org.eclipse.birt.report.taglib.ParamValueTag</tag-class>        

-        <body-content>JSP</body-content>

-        <description>

-            The param value tag specifies multiple values for a given param tag.

-        </description>

-        <attribute>

-            <name>value</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report parameter value. If doesn't set, value is null.

-            </description>

-        </attribute>

-        <attribute>

-            <name>displayText</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report parameter display text.

-            </description>

-        </attribute>

-     </tag>   

-     

-    <!--**********************************************-->

-    <!--             ParameterPage Tag                -->

-    <!--**********************************************-->

-    <tag>

-        <name>parameterPage</name>

-        <tag-class>org.eclipse.birt.report.taglib.RequesterTag</tag-class>

-        <body-content>JSP</body-content>

-        <description>

-            The parameterPage tag can help developers to display BIRT parameter page or create a user-defined parameter page.

-            This tag can collect these parameters and submit to BIRT servlet to handle request.

-        </description>

-        

-        <attribute>

-            <name>id</name>

-            <required>true</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the parameter page id.It should be unique.

-                It can contain number,letter or underline.                

-            </description>            

-        </attribute>    

-        

-        <attribute>

-            <name>name</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the parameter page name. 

-                If attribute 'isCustom' is true, this name should be required and unique.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>isCustom</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether uses the user-defined parameter page.

-                If false, use the BIRT parameter dialog.

-                Default to false.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>title</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report title displayed at the top.

-            </description>

-        </attribute>

-                        

-          <attribute>

-            <name>baseURL</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies base URL of BIRT viewer. 

-                Default to the current context.

-            </description>

-        </attribute>

-        

-        <attribute>

-            <name>scrolling </name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the DIV/IFrame style "scrolling ".

-                ( auto | yes | no )

-            </description>

-        </attribute>

-        

-       <attribute>

-            <name>position</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the style "position" of parameter page.

-                ( static | absolute | fixed | relative )

-            </description>

-        </attribute>

-

-       <attribute>

-            <name>style</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the style of parameter page.

-            </description>

-        </attribute>

-                        

-        <attribute>

-            <name>height</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the height of parameter page in pixels.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>width</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the width of parameter page in pixels.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>top</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Sets the top of parameter page in pixels.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>left</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                 Sets the left of parameter page in pixels.

-            </description>

-        </attribute>

-

-        <attribute>

-            <name>frameborder</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                 Specifies whether displays the iframe border.

-                Default to no.

-                If set "isCustom" to true, ignore this attribute.

-                ( Yes | No )

-            </description>

-        </attribute>

-                        

-        <attribute>

-            <name>reportDesign</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report design file name.

-                ( Absolute path, relative path or URL )

-            </description>    

-        </attribute>        

-

-        <attribute>

-            <name>reportDocument</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report document file name. 

-                Noted: only support "file:" URL format.

-                ( Absolute path, relative path or URL ) 

-            </description>    

-        </attribute>        

-

-        <attribute>

-            <name>reportletId</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the instance id of reportlet.

-                The "reportDocument" attribute should be required.

-                Noted: frameset pattern doesn't support reportlet.

-            </description>    

-        </attribute>

-

-        <attribute>

-            <name>pattern</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the servlet pattern for request submit. 

-                BIRT supports three patterns: frameset, run and preview. 

-                Can refer to the user-defined servlet pattern.

-                Default to frameset.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>target</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the target window for request submit.

-            </description>            

-        </attribute>

-                        

-        <attribute>

-            <name>bookmark</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the targeted bookmark name.

-            </description>            

-        </attribute>

-        

-        <attribute>

-            <name>locale</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the Locale information.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>timeZone</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies a time zone id. For example: "America/Los_Angeles" or "GMT+1" or "GMT+01:00".

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>svg</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether supports the SVG output format or not.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>format</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the output format of report.

-            </description>            

-        </attribute>

-        

-        <attribute>

-            <name>emitterId</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the emitter id for the report output.

-            </description>            

-        </attribute>

-        

-        <attribute>

-            <name>pageOverflow</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the page overflow setting for the PDF format.

-                One of the following values:

-                0 for "auto", 1 for "actual size", 2 for "fit to page". 

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>rtl</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether supports rtl page or not.

-            </description>            

-        </attribute>

-                            

-        <attribute>

-            <name>resourceFolder</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the referenced resource folder.

-                Default value is defined in web.xml.

-            </description>            

-        </attribute>            

-                                

-        <attribute>

-            <name>forceOverwriteDocument</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether forces to overwrite the generated document.

-                If allowPageBreak is false,ignore this attribute.

-                Default value is defined in web.xml.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>showTitle</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether shows the report title.

-                Default to true.

-            </description>            

-        </attribute>

-        

-        <attribute>

-            <name>showToolBar</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether shows the toolbar.

-                Default to true.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>showNavigationBar</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether shows the Navigation Bar.

-                If allowPageBreak is false,ignore this attribute.

-                Default to true.

-            </description>            

-        </attribute>

-

-        <attribute>

-            <name>isReportlet</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether render reportlet by bookmark.

-                Default to false.

-            </description>            

-        </attribute>

-                        

-    </tag>

-

-    <!--**********************************************-->

-    <!--      Report Parameter Definition Tag         -->

-    <!--**********************************************-->

-     <tag>

-        <name>paramDef</name>

-        <tag-class>org.eclipse.birt.report.taglib.ParamDefTag</tag-class>

-        <body-content>JSP</body-content>

-        <description>

-            The param tag is used to generate html code for defined parameter in ParameterPage tag.

-        </description>

-        <attribute>

-            <name>id</name>

-            <required>true</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the id of parameter control.It should be unique.

-                It can contain number,letter or underline.

-            </description>

-        </attribute>

-        <attribute>

-            <name>name</name>

-            <required>true</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report parameter name.

-            </description>

-        </attribute>

-        <attribute>

-            <name>pattern</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report parameter pattern format.

-                It is used to parse defined parameter value string.

-            </description>

-        </attribute>     

-        <attribute>

-            <name>value</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report parameter value. If doesn't set, use default value.

-            </description>

-        </attribute>

-        <attribute>

-            <name>displayText</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the report parameter display text.

-            </description>

-        </attribute>

-        <attribute>

-            <name>isLocale</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies whether the report parameter value is a locale/format related string.

-                It is used to parse defined parameter value string.

-            </description>

-        </attribute>

-        <attribute>

-            <name>title</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the title attribute of parameter control.

-            </description>

-        </attribute>        

-        <attribute>

-            <name>cssClass</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the css class attribute of parameter control.

-            </description>

-        </attribute>

-        <attribute>

-            <name>style</name>

-            <required>false</required>

-            <rtexprvalue>true</rtexprvalue>

-            <description>

-                Specifies the parameter control style.

-            </description>

-        </attribute>        

-     </tag>                

+<?xml version='1.0' encoding='ISO-8859-1' ?>
+<!DOCTYPE taglib
+    PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+    "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<!--
+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.
+-->
+<taglib>
+    <tlib-version>1.0</tlib-version>
+    <jsp-version>1.2</jsp-version>
+    <short-name>BIRT Tag Library</short-name>
+    <uri>http://www.eclipse.org/birt/taglibs/birt.tld</uri>
+    <description>
+        This Tag Library makes user develope JSP with BIRT Viewer component easily.
+    </description>
+    
+    <!--**********************************************-->
+    <!--             Viewer Tag                       -->
+    <!--**********************************************-->
+    <tag>
+        <name>viewer</name>
+        <tag-class>org.eclipse.birt.report.taglib.ViewerTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            The viewer tag is to specify how to import and control BIRT Report Viewer into JSP page.
+            This tag will use Ajax framework to retrieve report content.
+        </description>
+
+        <attribute>
+            <name>id</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the current viewer id. It should be unique.
+                It can contain number,letter or underline.
+            </description>            
+        </attribute>    
+
+        <attribute>
+            <name>pattern</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies which servlet pattern to be used to preview report.
+                Default value is frameset.
+                ( frameset or run )
+            </description>
+        </attribute>
+                        
+        <attribute>
+            <name>baseURL</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies base URL of BIRT viewer.
+                Default to the current context.
+            </description>
+        </attribute>
+        
+        <attribute>
+            <name>title</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report title displayed at the top.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>isHostPage</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether the viewer occupies the whole page.
+                Default to false.
+            </description>
+        </attribute>
+
+       <attribute>
+            <name>scrolling </name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the IFrame style "scrolling ".
+                If isHostPage is true, ignore this attribute.
+                ( auto | yes | no )
+            </description>
+        </attribute>
+
+       <attribute>
+            <name>position</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the style "position" of report container.
+                If isHostPage is true, ignore this attribute.
+                ( static | absolute | fixed | relative )
+            </description>
+        </attribute>
+
+       <attribute>
+            <name>style</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the style of report container.
+                If isHostPage is true, ignore this attribute.
+            </description>
+        </attribute>
+                        
+        <attribute>
+            <name>height</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the height of report container in pixels.
+                If isHostPage is true, ignore this attribute.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>width</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the width of report container in pixels.
+                If isHostPage is true, ignore this attribute.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>top</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the top of report container in pixels.
+                If isHostPage is true, ignore this attribute.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>left</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                 Sets the left of report container in pixels.
+                 If isHostPage is true, ignore this attribute.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>frameborder</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                 Specifies whether displays the iframe border.
+                Default to no. 
+                If isHostPage is true, ignore this attribute.
+                ( Yes | No )
+            </description>
+        </attribute>
+                        
+        <attribute>
+            <name>reportDesign</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report design file name.
+                ( Absolute path, relative path or URL )
+            </description>    
+        </attribute>        
+
+        <attribute>
+            <name>reportDocument</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report document file name. 
+                Noted: only support "file:" URL format.
+                ( Absolute path, relative path or URL ) 
+            </description>    
+        </attribute>        
+
+        <attribute>
+            <name>reportletId</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the instance id of reportlet.
+                The "reportDocument" attribute should be required.
+                Noted: frameset pattern doesn't support reportlet.
+            </description>    
+        </attribute>
+                
+        <attribute>
+            <name>bookmark</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the targeted bookmark name.
+            </description>            
+        </attribute>
+        
+        <attribute>
+            <name>locale</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the Locale information.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>timeZone</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies a time zone id. For example: "America/Los_Angeles" or "GMT+1" or "GMT+01:00".
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>svg</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether supports the SVG output format or not.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>format</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the output format of report.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>emitterId</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the emitter id for the report output.
+            </description>            
+        </attribute>
+        
+        <attribute>
+            <name>pageOverflow</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the page overflow setting for the PDF format.
+                One of the following values:
+                0 for "auto", 1 for "actual size", 2 for "fit to page". 
+            </description>            
+        </attribute>
+        
+        <attribute>
+            <name>rtl</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether supports rtl page or not.
+            </description>            
+        </attribute>
+                
+        <attribute>
+            <name>pageNum</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies output page number when render document file.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>pageRange</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies page range when render document file.
+            </description>            
+        </attribute>
+                                
+        <attribute>
+            <name>resourceFolder</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the referenced resource folder.
+                Default value is defined in web.xml.
+            </description>            
+        </attribute>
+                                            
+        <attribute>
+            <name>forceOverwriteDocument</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether forces to overwrite the generated document.
+                If allowPageBreak is false,ignore this attribute.
+                Default value is defined in web.xml.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>showTitle</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether shows the report title.
+                Default to true.
+            </description>            
+        </attribute>
+        
+        <attribute>
+            <name>showToolBar</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether shows the toolbar.
+                Default to true.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>showNavigationBar</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether shows the Navigation Bar.
+                If allowPageBreak is false,ignore this attribute.
+                Default to true.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>showParameterPage</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether show the parameter dialog or not.
+                Default to true.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>isReportlet</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether render reportlet by bookmark.
+                Default to false.
+            </description>            
+        </attribute>
+        
+    </tag>
+
+     <!--**********************************************-->
+    <!--             Report Tag                       -->
+    <!--**********************************************-->
+    <tag>
+        <name>report</name>
+        <tag-class>org.eclipse.birt.report.taglib.ReportTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            The report tag can provide fast report preview without Ajax framework. 
+            The report content can be output to web browser directly.
+        </description>
+
+        <attribute>
+            <name>id</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the current viewer id. It should be unique.
+                It can contain number,letter or underline.
+            </description>            
+        </attribute>    
+                
+        <attribute>
+            <name>baseURL</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies base URL of BIRT viewer.
+                Default to the current context.
+                If report container is DIV, ignore this attribute.
+            </description>
+        </attribute>
+        
+        <attribute>
+            <name>isHostPage</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether the viewer occupies the whole page.
+                Default to false.
+            </description>
+        </attribute>
+
+       <attribute>
+            <name>scrolling </name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the DIV/IFrame style "scrolling ".
+                If isHostPage is true, ignore this attribute.
+                ( auto | yes | no )
+            </description>
+        </attribute>
+
+       <attribute>
+            <name>position</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the style "position" of report container.
+                If isHostPage is true, ignore this attribute.
+                ( static | absolute | fixed | relative )
+            </description>
+        </attribute>
+
+       <attribute>
+            <name>style</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the style of report container.
+                If isHostPage is true, ignore this attribute.
+            </description>
+        </attribute>
+                        
+        <attribute>
+            <name>height</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the height of report container in pixels.
+                If isHostPage is true, ignore this attribute.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>width</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the width of report container in pixels.
+                If isHostPage is true, ignore this attribute.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>top</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the top of report container in pixels.
+                If isHostPage is true, ignore this attribute.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>left</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                 Sets the left of report container in pixels.
+                 If isHostPage is true, ignore this attribute.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>frameborder</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                 Specifies whether displays the iframe border.
+                 Available when user IFrame.
+                Default to no.
+                ( Yes | No )
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>reportDesign</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report design file name.
+                ( Absolute path, relative path or URL )
+            </description>    
+        </attribute>        
+
+        <attribute>
+            <name>reportDocument</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report document file name. 
+                Noted: only support "file:" URL format.
+                ( Absolute path, relative path or URL ) 
+            </description>    
+        </attribute>
+
+        <attribute>
+            <name>reportletId</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the instance id of reportlet.
+                The "reportDocument" attribute should be required.
+            </description>    
+        </attribute>
+                            
+        <attribute>
+            <name>bookmark</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the targeted bookmark name.
+            </description>            
+        </attribute>
+        
+        <attribute>
+            <name>locale</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the Locale information.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>timeZone</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies a time zone id. For example: "America/Los_Angeles" or "GMT+1" or "GMT+01:00".
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>svg</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether supports the SVG output format or not.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>format</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the output format of report.
+            </description>            
+        </attribute>
+        
+        <attribute>
+            <name>emitterId</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the emitter id for the report output.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>pageOverflow</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the page overflow setting for the PDF format.
+                One of the following values:
+                0 for "auto", 1 for "actual size", 2 for "fit to page". 
+            </description>            
+        </attribute>
+        
+        <attribute>
+            <name>rtl</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether supports rtl page or not.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>showParameterPage</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether show the parameter dialog or not.
+                Default to true.
+                If report container is DIV, ignore this attribute.
+            </description>            
+        </attribute>
+                                                
+        <attribute>
+            <name>resourceFolder</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the referenced resource folder.
+                Default value is defined in web.xml.
+            </description>            
+        </attribute>            
+                                    
+        <attribute>
+            <name>reportContainer</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies iframe or div as report container.
+                Default to iframe.
+                ( iframe | div )
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>pageNum</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies output page number when render document file.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>pageRange</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies page range when render document file.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>isReportlet</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether render reportlet by bookmark.
+                Default to false.
+            </description>            
+        </attribute>
+                
+    </tag>    
+    
+    <!--**********************************************-->
+    <!--             Report Parameter Tag             -->
+    <!--**********************************************-->
+     <tag>
+        <name>param</name>
+        <tag-class>org.eclipse.birt.report.taglib.ParamTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            The param tag specifies the parameters defined in report design file.
+        </description>
+        <attribute>
+            <name>name</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report parameter name.
+            </description>
+        </attribute>
+        <attribute>
+            <name>pattern</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report parameter pattern format.
+            </description>
+        </attribute>     
+        <attribute>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report parameter value. If doesn't set, value is null.
+            </description>
+        </attribute>
+        <attribute>
+            <name>displayText</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report parameter display text.
+            </description>
+        </attribute>
+        <attribute>
+            <name>delim</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the delimiter for multiple values.
+                Defaults to pipe "|".
+            </description>
+        </attribute>
+        <attribute>
+            <name>isLocale</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether the report parameter value is a locale/format related string.
+            </description>
+        </attribute>
+     </tag>   
+
+    <!--**********************************************-->
+    <!--             Report Parameter Value Tag       -->
+    <!--**********************************************-->
+     <tag>
+        <name>value</name>
+        <tag-class>org.eclipse.birt.report.taglib.ParamValueTag</tag-class>        
+        <body-content>JSP</body-content>
+        <description>
+            The param value tag specifies multiple values for a given param tag.
+        </description>
+        <attribute>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report parameter value. If doesn't set, value is null.
+            </description>
+        </attribute>
+        <attribute>
+            <name>displayText</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report parameter display text.
+            </description>
+        </attribute>
+     </tag>   
+     
+    <!--**********************************************-->
+    <!--             ParameterPage Tag                -->
+    <!--**********************************************-->
+    <tag>
+        <name>parameterPage</name>
+        <tag-class>org.eclipse.birt.report.taglib.RequesterTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            The parameterPage tag can help developers to display BIRT parameter page or create a user-defined parameter page.
+            This tag can collect these parameters and submit to BIRT servlet to handle request.
+        </description>
+        
+        <attribute>
+            <name>id</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the parameter page id.It should be unique.
+                It can contain number,letter or underline.                
+            </description>            
+        </attribute>    
+        
+        <attribute>
+            <name>name</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the parameter page name. 
+                If attribute 'isCustom' is true, this name should be required and unique.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>isCustom</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether uses the user-defined parameter page.
+                If false, use the BIRT parameter dialog.
+                Default to false.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>title</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report title displayed at the top.
+            </description>
+        </attribute>
+                        
+          <attribute>
+            <name>baseURL</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies base URL of BIRT viewer. 
+                Default to the current context.
+            </description>
+        </attribute>
+        
+        <attribute>
+            <name>scrolling </name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the DIV/IFrame style "scrolling ".
+                ( auto | yes | no )
+            </description>
+        </attribute>
+        
+       <attribute>
+            <name>position</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the style "position" of parameter page.
+                ( static | absolute | fixed | relative )
+            </description>
+        </attribute>
+
+       <attribute>
+            <name>style</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the style of parameter page.
+            </description>
+        </attribute>
+                        
+        <attribute>
+            <name>height</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the height of parameter page in pixels.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>width</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the width of parameter page in pixels.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>top</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Sets the top of parameter page in pixels.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>left</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                 Sets the left of parameter page in pixels.
+            </description>
+        </attribute>
+
+        <attribute>
+            <name>frameborder</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                 Specifies whether displays the iframe border.
+                Default to no.
+                If set "isCustom" to true, ignore this attribute.
+                ( Yes | No )
+            </description>
+        </attribute>
+                        
+        <attribute>
+            <name>reportDesign</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report design file name.
+                ( Absolute path, relative path or URL )
+            </description>    
+        </attribute>        
+
+        <attribute>
+            <name>reportDocument</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report document file name. 
+                Noted: only support "file:" URL format.
+                ( Absolute path, relative path or URL ) 
+            </description>    
+        </attribute>        
+
+        <attribute>
+            <name>reportletId</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the instance id of reportlet.
+                The "reportDocument" attribute should be required.
+                Noted: frameset pattern doesn't support reportlet.
+            </description>    
+        </attribute>
+
+        <attribute>
+            <name>pattern</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the servlet pattern for request submit. 
+                BIRT supports three patterns: frameset, run and preview. 
+                Can refer to the user-defined servlet pattern.
+                Default to frameset.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>target</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the target window for request submit.
+            </description>            
+        </attribute>
+                        
+        <attribute>
+            <name>bookmark</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the targeted bookmark name.
+            </description>            
+        </attribute>
+        
+        <attribute>
+            <name>locale</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the Locale information.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>timeZone</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies a time zone id. For example: "America/Los_Angeles" or "GMT+1" or "GMT+01:00".
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>svg</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether supports the SVG output format or not.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>format</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the output format of report.
+            </description>            
+        </attribute>
+        
+        <attribute>
+            <name>emitterId</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the emitter id for the report output.
+            </description>            
+        </attribute>
+        
+        <attribute>
+            <name>pageOverflow</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the page overflow setting for the PDF format.
+                One of the following values:
+                0 for "auto", 1 for "actual size", 2 for "fit to page". 
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>rtl</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether supports rtl page or not.
+            </description>            
+        </attribute>
+                            
+        <attribute>
+            <name>resourceFolder</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the referenced resource folder.
+                Default value is defined in web.xml.
+            </description>            
+        </attribute>            
+                                
+        <attribute>
+            <name>forceOverwriteDocument</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether forces to overwrite the generated document.
+                If allowPageBreak is false,ignore this attribute.
+                Default value is defined in web.xml.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>showTitle</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether shows the report title.
+                Default to true.
+            </description>            
+        </attribute>
+        
+        <attribute>
+            <name>showToolBar</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether shows the toolbar.
+                Default to true.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>showNavigationBar</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether shows the Navigation Bar.
+                If allowPageBreak is false,ignore this attribute.
+                Default to true.
+            </description>            
+        </attribute>
+
+        <attribute>
+            <name>isReportlet</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether render reportlet by bookmark.
+                Default to false.
+            </description>            
+        </attribute>
+                        
+    </tag>
+
+    <!--**********************************************-->
+    <!--      Report Parameter Definition Tag         -->
+    <!--**********************************************-->
+     <tag>
+        <name>paramDef</name>
+        <tag-class>org.eclipse.birt.report.taglib.ParamDefTag</tag-class>
+        <body-content>JSP</body-content>
+        <description>
+            The param tag is used to generate html code for defined parameter in ParameterPage tag.
+        </description>
+        <attribute>
+            <name>id</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the id of parameter control.It should be unique.
+                It can contain number,letter or underline.
+            </description>
+        </attribute>
+        <attribute>
+            <name>name</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report parameter name.
+            </description>
+        </attribute>
+        <attribute>
+            <name>pattern</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report parameter pattern format.
+                It is used to parse defined parameter value string.
+            </description>
+        </attribute>     
+        <attribute>
+            <name>value</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report parameter value. If doesn't set, use default value.
+            </description>
+        </attribute>
+        <attribute>
+            <name>displayText</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the report parameter display text.
+            </description>
+        </attribute>
+        <attribute>
+            <name>isLocale</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies whether the report parameter value is a locale/format related string.
+                It is used to parse defined parameter value string.
+            </description>
+        </attribute>
+        <attribute>
+            <name>title</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the title attribute of parameter control.
+            </description>
+        </attribute>        
+        <attribute>
+            <name>cssClass</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the css class attribute of parameter control.
+            </description>
+        </attribute>
+        <attribute>
+            <name>style</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+            <description>
+                Specifies the parameter control style.
+            </description>
+        </attribute>        
+     </tag>                
 </taglib>
\ No newline at end of file
diff --git a/plugins/birt/webapp/birt/error/error.jsp b/plugins/birt/webapp/birt/error/error.jsp
index abb46dd..d6a9331 100644
--- a/plugins/birt/webapp/birt/error/error.jsp
+++ b/plugins/birt/webapp/birt/error/error.jsp
@@ -1,52 +1,52 @@
-<%--

-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.

---%>

-<%@ page import="org.apache.ofbiz.base.util.*" %>

-<html>

-<head>

-<title>OFBiz Message</title>

-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

-</head>

-

-<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>

-

-<body bgcolor="#FFFFFF">

-<div align="center">

-  <br/>

-  <table width="100%" border="1" height="200">

-    <tr>

-      <td>

-        <table width="100%" border="0" height="200">

-          <tr bgcolor="#CC6666"> 

-            <td height="45"> 

-              <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>

-            </td>

-          </tr>

-          <tr> 

-            <td>

-              <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>

-            </td>

-          </tr>

-        </table>

-      </td>

-    </tr>

-  </table>

-</div>

-<div align="center"></div>

-</body>

-</html>

+<%--
+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.
+--%>
+<%@ page import="org.apache.ofbiz.base.util.*" %>
+<html>
+<head>
+<title>OFBiz Message</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>
+
+<body bgcolor="#FFFFFF">
+<div align="center">
+  <br/>
+  <table width="100%" border="1" height="200">
+    <tr>
+      <td>
+        <table width="100%" border="0" height="200">
+          <tr bgcolor="#CC6666"> 
+            <td height="45"> 
+              <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>
+            </td>
+          </tr>
+          <tr> 
+            <td>
+              <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+</div>
+<div align="center"></div>
+</body>
+</html>
diff --git a/plugins/birt/webapp/birt/index.jsp b/plugins/birt/webapp/birt/index.jsp
index 9d916ea..e3c3cdf 100644
--- a/plugins/birt/webapp/birt/index.jsp
+++ b/plugins/birt/webapp/birt/index.jsp
@@ -1,19 +1,19 @@
-<%--

-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.

---%>

-<%response.sendRedirect("control/main");%>

+<%--
+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.
+--%>
+<%response.sendRedirect("control/main");%>
diff --git a/plugins/pricat/README.md b/plugins/pricat/README.md
index 39a64c2..360c548 100644
--- a/plugins/pricat/README.md
+++ b/plugins/pricat/README.md
@@ -1,14 +1,14 @@
-<img src="http://ofbiz.apache.org/images/logo.png" alt="Apache OFBiz" />

-

-# PriCat component

-PriCat is the abbreviation of Price and Catalog/Category. The PriCat component is to support importing/parsing excel files with price and catalog/category data. The excel files can be checked by version, header column names, currencyId. Each row can be validated by facility(name, Id and ownership), required fields, string or number and etc.

-

-PriCat component contains two webapps: /pricat/ and /pricatdemo/. In production environment, you SHOULD remove or disable the /pricatdemo/.

-

-## more information

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

-PriCat Demos

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

-/pricatdemo/control/SamplePricat/: you can use this demo to implement your own excel templates.

-

+<img src="http://ofbiz.apache.org/images/logo.png" alt="Apache OFBiz" />
+
+# PriCat component
+PriCat is the abbreviation of Price and Catalog/Category. The PriCat component is to support importing/parsing excel files with price and catalog/category data. The excel files can be checked by version, header column names, currencyId. Each row can be validated by facility(name, Id and ownership), required fields, string or number and etc.
+
+PriCat component contains two webapps: /pricat/ and /pricatdemo/. In production environment, you SHOULD remove or disable the /pricatdemo/.
+
+## more information
+---------------------------------------
+PriCat Demos
+---------------------------------------
+/pricatdemo/control/SamplePricat/: you can use this demo to implement your own excel templates.
+
 /pricatdemo/control/countdownreport and /pricatdemo/control/countupreport: these 2 demos are on html report, you can try this way to display the processing report of rebuilding of lucene index or marchine learning data.
\ No newline at end of file
diff --git a/plugins/pricat/config/pricat.properties b/plugins/pricat/config/pricat.properties
index 65c7b34..7bdffc6 100644
--- a/plugins/pricat/config/pricat.properties
+++ b/plugins/pricat/config/pricat.properties
@@ -1,24 +1,24 @@
-###############################################################################

-# 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.

-###############################################################################

-

-# the latest pricat version to parse and download

-pricat.latest.version=V1.1

-

-# the max number of pricat history files to keep

-pricat.history.max.filenumber=20

+###############################################################################
+# 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.
+###############################################################################
+
+# the latest pricat version to parse and download
+pricat.latest.version=V1.1
+
+# the max number of pricat history files to keep
+pricat.history.max.filenumber=20
diff --git a/plugins/pricat/webapp/pricat/error/error.jsp b/plugins/pricat/webapp/pricat/error/error.jsp
index 7f4af8f..5f4de01 100644
--- a/plugins/pricat/webapp/pricat/error/error.jsp
+++ b/plugins/pricat/webapp/pricat/error/error.jsp
@@ -1,52 +1,52 @@
-<%--

-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.

---%>

-<%@ page import="org.apache.ofbiz.base.util.*" %>

-<html>

-<head>

-<title>OFBiz Message</title>

-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

-</head>

-

-<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>

-

-<body bgcolor="#FFFFFF">

-<div align="center">

-  <br/>

-  <table width="100%" border="1" height="200">

-    <tr>

-      <td>

-        <table width="100%" border="0" height="200">

-          <tr bgcolor="#CC6666">

-            <td height="45">

-              <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>

-            </td>

-          </tr>

-          <tr>

-            <td>

-              <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>

-            </td>

-          </tr>

-        </table>

-      </td>

-    </tr>

-  </table>

-</div>

-<div align="center"></div>

-</body>

-</html>

+<%--
+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.
+--%>
+<%@ page import="org.apache.ofbiz.base.util.*" %>
+<html>
+<head>
+<title>OFBiz Message</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>
+
+<body bgcolor="#FFFFFF">
+<div align="center">
+  <br/>
+  <table width="100%" border="1" height="200">
+    <tr>
+      <td>
+        <table width="100%" border="0" height="200">
+          <tr bgcolor="#CC6666">
+            <td height="45">
+              <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+</div>
+<div align="center"></div>
+</body>
+</html>
diff --git a/plugins/pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl b/plugins/pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl
index 74ebf3c..ab86270 100644
--- a/plugins/pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl
+++ b/plugins/pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl
@@ -1,109 +1,109 @@
-<#--

-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.

--->

-<div class="row">

-    <div class="col-sm-12 m-b-xs text-left p-xs">

-        <label >${uiLabelMap.ExcelImportHistoryList}</label>

-        <span class="tooltip pad-left30 top">${uiLabelMap.OnlyYourOwnImportHistoryDisplayed}</span>

-    </div> 

-</div>

-

-<div id="loadBody" style="display:none">

-</div>

-<table id="productlist" name="productlist" class="table table-striped ms-table-primary">

-    <thead>

-        <th></th>

-        <th>${uiLabelMap.SerialNumber}</th>

-        <th>${uiLabelMap.Filename}</th>

-        <th>${uiLabelMap.FromDate}</th>

-        <th>${uiLabelMap.ThruDate}</th>

-        <th>${uiLabelMap.ImportStatus}</th>

-        <th>${uiLabelMap.ThruReasonId}</th>

-        <th>${uiLabelMap.Actions}</th>

-    </thead>

-    <tbody>

-        <#if (data?has_content)>

-            <#list data as historyEntry>

-                <tr name="${historyEntry.sequenceNum!}">

-                    <td>

-                    <#if historyEntry.statusId?exists && historyEntry.statusId == 'EXCEL_IMPORTING'>

-                        <img src="/erptheme/images/blue_anime.gif" alt="${uiLabelMap.EXCE_IMPORTING}" tooltip="${uiLabelMap.EXCE_IMPORTING}">

-                    <#elseif historyEntry.statusId?exists && historyEntry.statusId == 'EXCEL_IMPORTED' && historyEntry.thruReasonId?exists && historyEntry.thruReasonId?has_content>

-                        <#if historyEntry.thruReasonId == 'EXCEL_IMPORT_SUCCESS'>

-                        <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-ok-sign success-color">${uiLabelMap.ReasonOK}</i></button>

-                        <#elseif historyEntry.thruReasonId == 'EXCEL_IMPORT_STOPPED'>

-                        <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-remove-sign stopped-color">${uiLabelMap.ReasonStopped}</i></button>

-                        <#elseif historyEntry.thruReasonId == 'EXCEL_IMPORT_ERROR'>

-                        <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-exclamation-sign error-color"></i>${uiLabelMap.ReasonError}</button>

-                        <#elseif historyEntry.thruReasonId == 'EXCEL_IMPORT_QUEST'>

-                        <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-question-sign question-color"></i>${uiLabelMap.ReasonWarning}</button>

-                        </#if>

-                    </#if>

-                    </td>

-                    <td>${historyEntry.sequenceNum!}</td>

-                      <td style="text-align:right;">${historyEntry.fileName!}</td>

-                    <td><#if historyEntry.fromDate?exists && historyEntry.fromDate?has_content>${historyEntry.fromDate?string("yyyy-MM-dd HH:mm:ss")}</#if></td>

-                    <td><#if historyEntry.thruDate?exists && historyEntry.thruDate?has_content>${historyEntry.thruDate?string("yyyy-MM-dd HH:mm:ss")}</#if></td>

-                    <td><#if historyEntry.statusId?exists && historyEntry.statusId?has_content>${uiLabelMap.get(historyEntry.statusId)}</#if></td>

-                    <td><#if historyEntry.statusId?exists && historyEntry.statusId == "EXCEL_IMPORTED" && historyEntry.thruReasonId?exists && historyEntry.thruReasonId?has_content>${uiLabelMap.get(historyEntry.thruReasonId)}</#if></td>

-                    <td>

-                        <#assign buttons = 0 />

-                        <#if historyEntry.logFileName?exists && historyEntry.logFileName?has_content>

-                            <#if Static["org.apache.ofbiz.base.util.FileUtil"].getFile(historyEntry.logFileName).exists()>

-                            <button id="excel-import-log" type="button" onclick="viewExcelImportLog(${historyEntry.sequenceNum});" data-tooltip="${uiLabelMap.ViewExcelImportLogContent}">

-                                <i class="icon-comments icon-blue">${uiLabelMap.ViewPricatLog}</i>

-                            </button>

-                            <#assign buttons = buttons + 1 />

-                            </#if>

-                        </#if>

-                        <#if buttons == 0>

-                            <#--- <button id="excel-import-empty" type="button"></button> -->

-                            <#assign buttons = buttons + 1 />

-                        </#if>

-                        <#if historyEntry.logFileName?exists && historyEntry.logFileName?has_content>

-                            <#if Static["org.apache.ofbiz.pricat.AbstractPricatParser"].isCommentedExcelExists(request, historyEntry.sequenceNum)>

-                            <button id="excel-import-download" type="button" onclick="downloadCommentedExcel(${historyEntry.sequenceNum});" data-tooltip="${uiLabelMap.DownloadCommentedExcel}">

-                                <i class="icon-download icon-blue">${uiLabelMap.DownloadCommentedPricat}</i>

-                            </button>

-                            <#assign buttons = buttons + 1 />

-                            </#if>

-                        </#if>

-                        <#if buttons == 1>

-                            <#--- <button id="excel-import-empty" type="button"></button> -->

-                        </#if>

-                    </td>

-                </tr>

-            </#list>

-        <#else>

-            <tr>

-                <td colspan="10" style="text-align:center;vertical-align:middle;height:60px;">

-                    ${uiLabelMap.ExcelImportTipNoData}

-                </td>

-            </tr>

-        </#if>

-    </tbody>

-</table>

-<script type="text/javascript" language="JavaScript">

-    function viewExcelImportLog(sequenceNum) {

-        document.location = "<@ofbizUrl>viewExcelImportLog</@ofbizUrl>?sequenceNum=" + sequenceNum;

-    }

-

-    function downloadCommentedExcel(sequenceNum) {

-        document.location = "<@ofbizUrl>downloadCommentedExcel</@ofbizUrl>?sequenceNum=" + sequenceNum;

-    }

+<#--
+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.
+-->
+<div class="row">
+    <div class="col-sm-12 m-b-xs text-left p-xs">
+        <label >${uiLabelMap.ExcelImportHistoryList}</label>
+        <span class="tooltip pad-left30 top">${uiLabelMap.OnlyYourOwnImportHistoryDisplayed}</span>
+    </div> 
+</div>
+
+<div id="loadBody" style="display:none">
+</div>
+<table id="productlist" name="productlist" class="table table-striped ms-table-primary">
+    <thead>
+        <th></th>
+        <th>${uiLabelMap.SerialNumber}</th>
+        <th>${uiLabelMap.Filename}</th>
+        <th>${uiLabelMap.FromDate}</th>
+        <th>${uiLabelMap.ThruDate}</th>
+        <th>${uiLabelMap.ImportStatus}</th>
+        <th>${uiLabelMap.ThruReasonId}</th>
+        <th>${uiLabelMap.Actions}</th>
+    </thead>
+    <tbody>
+        <#if (data?has_content)>
+            <#list data as historyEntry>
+                <tr name="${historyEntry.sequenceNum!}">
+                    <td>
+                    <#if historyEntry.statusId?exists && historyEntry.statusId == 'EXCEL_IMPORTING'>
+                        <img src="/erptheme/images/blue_anime.gif" alt="${uiLabelMap.EXCE_IMPORTING}" tooltip="${uiLabelMap.EXCE_IMPORTING}">
+                    <#elseif historyEntry.statusId?exists && historyEntry.statusId == 'EXCEL_IMPORTED' && historyEntry.thruReasonId?exists && historyEntry.thruReasonId?has_content>
+                        <#if historyEntry.thruReasonId == 'EXCEL_IMPORT_SUCCESS'>
+                        <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-ok-sign success-color">${uiLabelMap.ReasonOK}</i></button>
+                        <#elseif historyEntry.thruReasonId == 'EXCEL_IMPORT_STOPPED'>
+                        <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-remove-sign stopped-color">${uiLabelMap.ReasonStopped}</i></button>
+                        <#elseif historyEntry.thruReasonId == 'EXCEL_IMPORT_ERROR'>
+                        <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-exclamation-sign error-color"></i>${uiLabelMap.ReasonError}</button>
+                        <#elseif historyEntry.thruReasonId == 'EXCEL_IMPORT_QUEST'>
+                        <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-question-sign question-color"></i>${uiLabelMap.ReasonWarning}</button>
+                        </#if>
+                    </#if>
+                    </td>
+                    <td>${historyEntry.sequenceNum!}</td>
+                      <td style="text-align:right;">${historyEntry.fileName!}</td>
+                    <td><#if historyEntry.fromDate?exists && historyEntry.fromDate?has_content>${historyEntry.fromDate?string("yyyy-MM-dd HH:mm:ss")}</#if></td>
+                    <td><#if historyEntry.thruDate?exists && historyEntry.thruDate?has_content>${historyEntry.thruDate?string("yyyy-MM-dd HH:mm:ss")}</#if></td>
+                    <td><#if historyEntry.statusId?exists && historyEntry.statusId?has_content>${uiLabelMap.get(historyEntry.statusId)}</#if></td>
+                    <td><#if historyEntry.statusId?exists && historyEntry.statusId == "EXCEL_IMPORTED" && historyEntry.thruReasonId?exists && historyEntry.thruReasonId?has_content>${uiLabelMap.get(historyEntry.thruReasonId)}</#if></td>
+                    <td>
+                        <#assign buttons = 0 />
+                        <#if historyEntry.logFileName?exists && historyEntry.logFileName?has_content>
+                            <#if Static["org.apache.ofbiz.base.util.FileUtil"].getFile(historyEntry.logFileName).exists()>
+                            <button id="excel-import-log" type="button" onclick="viewExcelImportLog(${historyEntry.sequenceNum});" data-tooltip="${uiLabelMap.ViewExcelImportLogContent}">
+                                <i class="icon-comments icon-blue">${uiLabelMap.ViewPricatLog}</i>
+                            </button>
+                            <#assign buttons = buttons + 1 />
+                            </#if>
+                        </#if>
+                        <#if buttons == 0>
+                            <#--- <button id="excel-import-empty" type="button"></button> -->
+                            <#assign buttons = buttons + 1 />
+                        </#if>
+                        <#if historyEntry.logFileName?exists && historyEntry.logFileName?has_content>
+                            <#if Static["org.apache.ofbiz.pricat.AbstractPricatParser"].isCommentedExcelExists(request, historyEntry.sequenceNum)>
+                            <button id="excel-import-download" type="button" onclick="downloadCommentedExcel(${historyEntry.sequenceNum});" data-tooltip="${uiLabelMap.DownloadCommentedExcel}">
+                                <i class="icon-download icon-blue">${uiLabelMap.DownloadCommentedPricat}</i>
+                            </button>
+                            <#assign buttons = buttons + 1 />
+                            </#if>
+                        </#if>
+                        <#if buttons == 1>
+                            <#--- <button id="excel-import-empty" type="button"></button> -->
+                        </#if>
+                    </td>
+                </tr>
+            </#list>
+        <#else>
+            <tr>
+                <td colspan="10" style="text-align:center;vertical-align:middle;height:60px;">
+                    ${uiLabelMap.ExcelImportTipNoData}
+                </td>
+            </tr>
+        </#if>
+    </tbody>
+</table>
+<script type="text/javascript" language="JavaScript">
+    function viewExcelImportLog(sequenceNum) {
+        document.location = "<@ofbizUrl>viewExcelImportLog</@ofbizUrl>?sequenceNum=" + sequenceNum;
+    }
+
+    function downloadCommentedExcel(sequenceNum) {
+        document.location = "<@ofbizUrl>downloadCommentedExcel</@ofbizUrl>?sequenceNum=" + sequenceNum;
+    }
 </script>
\ No newline at end of file
diff --git a/plugins/pricat/webapp/pricat/ftl/viewExcelImportHistory.ftl b/plugins/pricat/webapp/pricat/ftl/viewExcelImportHistory.ftl
index 834fac1..4b997d9 100644
--- a/plugins/pricat/webapp/pricat/ftl/viewExcelImportHistory.ftl
+++ b/plugins/pricat/webapp/pricat/ftl/viewExcelImportHistory.ftl
@@ -1,31 +1,31 @@
-<#--

-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.

--->

-<div id="wrapper">

-    <div id="page-wrapper" class="gray-bg">

-        <div class="row">

-            <div class="col-lg-12">

-                <div class="ibox float-e-margins">

-                    <div class="ibox-content text-left p-md">

-                        <#include "component://pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl"/>

-                    </div>

-                </div>

-            </div>

-        </div>

-    </div>

+<#--
+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.
+-->
+<div id="wrapper">
+    <div id="page-wrapper" class="gray-bg">
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="ibox float-e-margins">
+                    <div class="ibox-content text-left p-md">
+                        <#include "component://pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl"/>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/plugins/pricat/webapp/pricat/ftl/viewExcelImportLog.ftl b/plugins/pricat/webapp/pricat/ftl/viewExcelImportLog.ftl
index d98fe72..d400a82 100644
--- a/plugins/pricat/webapp/pricat/ftl/viewExcelImportLog.ftl
+++ b/plugins/pricat/webapp/pricat/ftl/viewExcelImportLog.ftl
@@ -1,39 +1,39 @@
-<#--

-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.

--->

-<div id="wrapper">

-    <div id="page-wrapper" class="gray-bg">

-        <div class="row">

-            <div class="col-lg-12">

-                <div class="ibox float-e-margins">

-                    <div id="htmlreport" class="ibox-content text-left p-md">

-                        

-                    </div>

-                </div>

-            </div>

-        </div>

-    </div>

-</div>

-

-<script language='JavaScript'>

-<!--

-jQuery(document).ready( function() {

-    jQuery("#htmlreport").html("${StringUtil.wrapString(logFileContent!)}");

-});

-//-->

-</script>

+<#--
+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.
+-->
+<div id="wrapper">
+    <div id="page-wrapper" class="gray-bg">
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="ibox float-e-margins">
+                    <div id="htmlreport" class="ibox-content text-left p-md">
+                        
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script language='JavaScript'>
+<!--
+jQuery(document).ready( function() {
+    jQuery("#htmlreport").html("${StringUtil.wrapString(logFileContent!)}");
+});
+//-->
+</script>
diff --git a/plugins/pricat/webapp/pricatdemo/error/error.jsp b/plugins/pricat/webapp/pricatdemo/error/error.jsp
index 7f4af8f..5f4de01 100644
--- a/plugins/pricat/webapp/pricatdemo/error/error.jsp
+++ b/plugins/pricat/webapp/pricatdemo/error/error.jsp
@@ -1,52 +1,52 @@
-<%--

-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.

---%>

-<%@ page import="org.apache.ofbiz.base.util.*" %>

-<html>

-<head>

-<title>OFBiz Message</title>

-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

-</head>

-

-<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>

-

-<body bgcolor="#FFFFFF">

-<div align="center">

-  <br/>

-  <table width="100%" border="1" height="200">

-    <tr>

-      <td>

-        <table width="100%" border="0" height="200">

-          <tr bgcolor="#CC6666">

-            <td height="45">

-              <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>

-            </td>

-          </tr>

-          <tr>

-            <td>

-              <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>

-            </td>

-          </tr>

-        </table>

-      </td>

-    </tr>

-  </table>

-</div>

-<div align="center"></div>

-</body>

-</html>

+<%--
+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.
+--%>
+<%@ page import="org.apache.ofbiz.base.util.*" %>
+<html>
+<head>
+<title>OFBiz Message</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>
+
+<body bgcolor="#FFFFFF">
+<div align="center">
+  <br/>
+  <table width="100%" border="1" height="200">
+    <tr>
+      <td>
+        <table width="100%" border="0" height="200">
+          <tr bgcolor="#CC6666">
+            <td height="45">
+              <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+</div>
+<div align="center"></div>
+</body>
+</html>
diff --git a/plugins/projectmgr/webapp/projectmgr/error/error.jsp b/plugins/projectmgr/webapp/projectmgr/error/error.jsp
index 7f4af8f..5f4de01 100644
--- a/plugins/projectmgr/webapp/projectmgr/error/error.jsp
+++ b/plugins/projectmgr/webapp/projectmgr/error/error.jsp
@@ -1,52 +1,52 @@
-<%--

-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.

---%>

-<%@ page import="org.apache.ofbiz.base.util.*" %>

-<html>

-<head>

-<title>OFBiz Message</title>

-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

-</head>

-

-<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>

-

-<body bgcolor="#FFFFFF">

-<div align="center">

-  <br/>

-  <table width="100%" border="1" height="200">

-    <tr>

-      <td>

-        <table width="100%" border="0" height="200">

-          <tr bgcolor="#CC6666">

-            <td height="45">

-              <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>

-            </td>

-          </tr>

-          <tr>

-            <td>

-              <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>

-            </td>

-          </tr>

-        </table>

-      </td>

-    </tr>

-  </table>

-</div>

-<div align="center"></div>

-</body>

-</html>

+<%--
+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.
+--%>
+<%@ page import="org.apache.ofbiz.base.util.*" %>
+<html>
+<head>
+<title>OFBiz Message</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>
+
+<body bgcolor="#FFFFFF">
+<div align="center">
+  <br/>
+  <table width="100%" border="1" height="200">
+    <tr>
+      <td>
+        <table width="100%" border="0" height="200">
+          <tr bgcolor="#CC6666">
+            <td height="45">
+              <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+</div>
+<div align="center"></div>
+</body>
+</html>
diff --git a/plugins/solr/home/solrdefault/conf/admin-extra.html b/plugins/solr/home/solrdefault/conf/admin-extra.html
index 8f2b32a..fecab20 100644
--- a/plugins/solr/home/solrdefault/conf/admin-extra.html
+++ b/plugins/solr/home/solrdefault/conf/admin-extra.html
@@ -1,24 +1,24 @@
-<!--

- 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.

--->

-

-<!-- The content of this page will be statically included into the top-

-right box of the cores overview page. Uncomment this as an example to 

-see there the content will show up.

-

-<img src="img/ico/construction.png"> This line will appear at the top-

-right box on collection1's Overview

--->

+<!--
+ 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.
+-->
+
+<!-- The content of this page will be statically included into the top-
+right box of the cores overview page. Uncomment this as an example to 
+see there the content will show up.
+
+<img src="img/ico/construction.png"> This line will appear at the top-
+right box on collection1's Overview
+-->
diff --git a/plugins/solr/home/solrdefault/conf/admin-extra.menu-bottom.html b/plugins/solr/home/solrdefault/conf/admin-extra.menu-bottom.html
index 5f5eddd..3359a46 100644
--- a/plugins/solr/home/solrdefault/conf/admin-extra.menu-bottom.html
+++ b/plugins/solr/home/solrdefault/conf/admin-extra.menu-bottom.html
@@ -1,25 +1,25 @@
-<!--

- 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.

--->

-

-<!-- admin-extra.menu-bottom.html -->

-<!--

-<li>

-  <a href="#" style="background-image: url(img/ico/construction.png);">

-    LAST ITEM

-  </a>

-</li>

--->

+<!--
+ 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.
+-->
+
+<!-- admin-extra.menu-bottom.html -->
+<!--
+<li>
+  <a href="#" style="background-image: url(img/ico/construction.png);">
+    LAST ITEM
+  </a>
+</li>
+-->
diff --git a/plugins/solr/home/solrdefault/conf/admin-extra.menu-top.html b/plugins/solr/home/solrdefault/conf/admin-extra.menu-top.html
index 6c980eb..0886cee 100644
--- a/plugins/solr/home/solrdefault/conf/admin-extra.menu-top.html
+++ b/plugins/solr/home/solrdefault/conf/admin-extra.menu-top.html
@@ -1,25 +1,25 @@
-<!--

- 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.

--->

-

-<!-- admin-extra.menu-top.html -->

-<!--

-<li>

-  <a href="#" style="background-image: url(img/ico/construction.png);">

-    FIRST ITEM

-  </a>

-</li>

--->

+<!--
+ 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.
+-->
+
+<!-- admin-extra.menu-top.html -->
+<!--
+<li>
+  <a href="#" style="background-image: url(img/ico/construction.png);">
+    FIRST ITEM
+  </a>
+</li>
+-->
diff --git a/plugins/solr/home/solrdefault/conf/lang/contractions_ca.txt b/plugins/solr/home/solrdefault/conf/lang/contractions_ca.txt
index 116644f..307a85f 100644
--- a/plugins/solr/home/solrdefault/conf/lang/contractions_ca.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/contractions_ca.txt
@@ -1,8 +1,8 @@
-# Set of Catalan contractions for ElisionFilter

-# TODO: load this as a resource from the analyzer and sync it in build.xml

-d

-l

-m

-n

-s

-t

+# Set of Catalan contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+d
+l
+m
+n
+s
+t
diff --git a/plugins/solr/home/solrdefault/conf/lang/contractions_fr.txt b/plugins/solr/home/solrdefault/conf/lang/contractions_fr.txt
index 6de73c2..f1bba51 100644
--- a/plugins/solr/home/solrdefault/conf/lang/contractions_fr.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/contractions_fr.txt
@@ -1,15 +1,15 @@
-# Set of French contractions for ElisionFilter

-# TODO: load this as a resource from the analyzer and sync it in build.xml

-l

-m

-t

-qu

-n

-s

-j

-d

-c

-jusqu

-quoiqu

-lorsqu

-puisqu

+# Set of French contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+l
+m
+t
+qu
+n
+s
+j
+d
+c
+jusqu
+quoiqu
+lorsqu
+puisqu
diff --git a/plugins/solr/home/solrdefault/conf/lang/contractions_ga.txt b/plugins/solr/home/solrdefault/conf/lang/contractions_ga.txt
index 849b0c6..9ebe7fa 100644
--- a/plugins/solr/home/solrdefault/conf/lang/contractions_ga.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/contractions_ga.txt
@@ -1,5 +1,5 @@
-# Set of Irish contractions for ElisionFilter

-# TODO: load this as a resource from the analyzer and sync it in build.xml

-d

-m

-b

+# Set of Irish contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+d
+m
+b
diff --git a/plugins/solr/home/solrdefault/conf/lang/contractions_it.txt b/plugins/solr/home/solrdefault/conf/lang/contractions_it.txt
index 790b5af..cac0409 100644
--- a/plugins/solr/home/solrdefault/conf/lang/contractions_it.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/contractions_it.txt
@@ -1,23 +1,23 @@
-# Set of Italian contractions for ElisionFilter

-# TODO: load this as a resource from the analyzer and sync it in build.xml

-c

-l 

-all 

-dall 

-dell 

-nell 

-sull 

-coll 

-pell 

-gl 

-agl 

-dagl 

-degl 

-negl 

-sugl 

-un 

-m 

-t 

-s 

-v 

-d

+# Set of Italian contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+c
+l 
+all 
+dall 
+dell 
+nell 
+sull 
+coll 
+pell 
+gl 
+agl 
+dagl 
+degl 
+negl 
+sugl 
+un 
+m 
+t 
+s 
+v 
+d
diff --git a/plugins/solr/home/solrdefault/conf/lang/hyphenations_ga.txt b/plugins/solr/home/solrdefault/conf/lang/hyphenations_ga.txt
index fce4100..4d2642c 100644
--- a/plugins/solr/home/solrdefault/conf/lang/hyphenations_ga.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/hyphenations_ga.txt
@@ -1,5 +1,5 @@
-# Set of Irish hyphenations for StopFilter

-# TODO: load this as a resource from the analyzer and sync it in build.xml

-h

-n

-t

+# Set of Irish hyphenations for StopFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+h
+n
+t
diff --git a/plugins/solr/home/solrdefault/conf/lang/stemdict_nl.txt b/plugins/solr/home/solrdefault/conf/lang/stemdict_nl.txt
index 01dd3bb..4410729 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stemdict_nl.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stemdict_nl.txt
@@ -1,6 +1,6 @@
-# Set of overrides for the dutch stemmer

-# TODO: load this as a resource from the analyzer and sync it in build.xml

-fiets	fiets

-bromfiets	bromfiets

-ei	eier

-kind	kinder

+# Set of overrides for the dutch stemmer
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+fiets	fiets
+bromfiets	bromfiets
+ei	eier
+kind	kinder
diff --git a/plugins/solr/home/solrdefault/conf/lang/stoptags_ja.txt b/plugins/solr/home/solrdefault/conf/lang/stoptags_ja.txt
index 2faf2a6..71b7508 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stoptags_ja.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stoptags_ja.txt
@@ -1,420 +1,420 @@
-#

-# This file defines a Japanese stoptag set for JapanesePartOfSpeechStopFilter.

-#

-# Any token with a part-of-speech tag that exactly matches those defined in this

-# file are removed from the token stream.

-#

-# Set your own stoptags by uncommenting the lines below.  Note that comments are

-# not allowed on the same line as a stoptag.  See LUCENE-3745 for frequency lists,

-# etc. that can be useful for building you own stoptag set.

-#

-# The entire possible tagset is provided below for convenience.

-#

-#####

-#  noun: unclassified nouns

-#名詞

-#

-#  noun-common: Common nouns or nouns where the sub-classification is undefined

-#名詞-一般

-#

-#  noun-proper: Proper nouns where the sub-classification is undefined 

-#名詞-固有名詞

-#

-#  noun-proper-misc: miscellaneous proper nouns

-#名詞-固有名詞-一般

-#

-#  noun-proper-person: Personal names where the sub-classification is undefined

-#名詞-固有名詞-人名

-#

-#  noun-proper-person-misc: names that cannot be divided into surname and 

-#  given name; foreign names; names where the surname or given name is unknown.

-#  e.g. お市の方

-#名詞-固有名詞-人名-一般

-#

-#  noun-proper-person-surname: Mainly Japanese surnames.

-#  e.g. 山田

-#名詞-固有名詞-人名-姓

-#

-#  noun-proper-person-given_name: Mainly Japanese given names.

-#  e.g. 太郎

-#名詞-固有名詞-人名-名

-#

-#  noun-proper-organization: Names representing organizations.

-#  e.g. 通産省, NHK

-#名詞-固有名詞-組織

-#

-#  noun-proper-place: Place names where the sub-classification is undefined

-#名詞-固有名詞-地域

-#

-#  noun-proper-place-misc: Place names excluding countries.

-#  e.g. アジア, バルセロナ, 京都

-#名詞-固有名詞-地域-一般

-#

-#  noun-proper-place-country: Country names. 

-#  e.g. 日本, オーストラリア

-#名詞-固有名詞-地域-国

-#

-#  noun-pronoun: Pronouns where the sub-classification is undefined

-#名詞-代名詞

-#

-#  noun-pronoun-misc: miscellaneous pronouns: 

-#  e.g. それ, ここ, あいつ, あなた, あちこち, いくつ, どこか, なに, みなさん, みんな, わたくし, われわれ

-#名詞-代名詞-一般

-#

-#  noun-pronoun-contraction: Spoken language contraction made by combining a 

-#  pronoun and the particle 'wa'.

-#  e.g. ありゃ, こりゃ, こりゃあ, そりゃ, そりゃあ 

-#名詞-代名詞-縮約

-#

-#  noun-adverbial: Temporal nouns such as names of days or months that behave 

-#  like adverbs. Nouns that represent amount or ratios and can be used adverbially,

-#  e.g. 金曜, 一月, 午後, 少量

-#名詞-副詞可能

-#

-#  noun-verbal: Nouns that take arguments with case and can appear followed by 

-#  'suru' and related verbs (する, できる, なさる, くださる)

-#  e.g. インプット, 愛着, 悪化, 悪戦苦闘, 一安心, 下取り

-#名詞-サ変接続

-#

-#  noun-adjective-base: The base form of adjectives, words that appear before な ("na")

-#  e.g. 健康, 安易, 駄目, だめ

-#名詞-形容動詞語幹

-#

-#  noun-numeric: Arabic numbers, Chinese numerals, and counters like 何 (回), 数.

-#  e.g. 0, 1, 2, 何, 数, 幾

-#名詞-数

-#

-#  noun-affix: noun affixes where the sub-classification is undefined

-#名詞-非自立

-#

-#  noun-affix-misc: Of adnominalizers, the case-marker の ("no"), and words that 

-#  attach to the base form of inflectional words, words that cannot be classified 

-#  into any of the other categories below. This category includes indefinite nouns.

-#  e.g. あかつき, 暁, かい, 甲斐, 気, きらい, 嫌い, くせ, 癖, こと, 事, ごと, 毎, しだい, 次第, 

-#       順, せい, 所為, ついで, 序で, つもり, 積もり, 点, どころ, の, はず, 筈, はずみ, 弾み, 

-#       拍子, ふう, ふり, 振り, ほう, 方, 旨, もの, 物, 者, ゆえ, 故, ゆえん, 所以, わけ, 訳,

-#       わり, 割り, 割, ん-口語/, もん-口語/

-#名詞-非自立-一般

-#

-#  noun-affix-adverbial: noun affixes that that can behave as adverbs.

-#  e.g. あいだ, 間, あげく, 挙げ句, あと, 後, 余り, 以外, 以降, 以後, 以上, 以前, 一方, うえ, 

-#       上, うち, 内, おり, 折り, かぎり, 限り, きり, っきり, 結果, ころ, 頃, さい, 際, 最中, さなか, 

-#       最中, じたい, 自体, たび, 度, ため, 為, つど, 都度, とおり, 通り, とき, 時, ところ, 所, 

-#       とたん, 途端, なか, 中, のち, 後, ばあい, 場合, 日, ぶん, 分, ほか, 他, まえ, 前, まま, 

-#       儘, 侭, みぎり, 矢先

-#名詞-非自立-副詞可能

-#

-#  noun-affix-aux: noun affixes treated as 助動詞 ("auxiliary verb") in school grammars 

-#  with the stem よう(だ) ("you(da)").

-#  e.g.  よう, やう, 様 (よう)

-#名詞-非自立-助動詞語幹

-#  

-#  noun-affix-adjective-base: noun affixes that can connect to the indeclinable

-#  connection form な (aux "da").

-#  e.g. みたい, ふう

-#名詞-非自立-形容動詞語幹

-#

-#  noun-special: special nouns where the sub-classification is undefined.

-#名詞-特殊

-#

-#  noun-special-aux: The そうだ ("souda") stem form that is used for reporting news, is 

-#  treated as 助動詞 ("auxiliary verb") in school grammars, and attach to the base 

-#  form of inflectional words.

-#  e.g. そう

-#名詞-特殊-助動詞語幹

-#

-#  noun-suffix: noun suffixes where the sub-classification is undefined.

-#名詞-接尾

-#

-#  noun-suffix-misc: Of the nouns or stem forms of other parts of speech that connect 

-#  to ガル or タイ and can combine into compound nouns, words that cannot be classified into

-#  any of the other categories below. In general, this category is more inclusive than 

-#  接尾語 ("suffix") and is usually the last element in a compound noun.

-#  e.g. おき, かた, 方, 甲斐 (がい), がかり, ぎみ, 気味, ぐるみ, (~した) さ, 次第, 済 (ず) み,

-#       よう, (でき)っこ, 感, 観, 性, 学, 類, 面, 用

-#名詞-接尾-一般

-#

-#  noun-suffix-person: Suffixes that form nouns and attach to person names more often

-#  than other nouns.

-#  e.g. 君, 様, 著

-#名詞-接尾-人名

-#

-#  noun-suffix-place: Suffixes that form nouns and attach to place names more often 

-#  than other nouns.

-#  e.g. 町, 市, 県

-#名詞-接尾-地域

-#

-#  noun-suffix-verbal: Of the suffixes that attach to nouns and form nouns, those that 

-#  can appear before スル ("suru").

-#  e.g. 化, 視, 分け, 入り, 落ち, 買い

-#名詞-接尾-サ変接続

-#

-#  noun-suffix-aux: The stem form of そうだ (様態) that is used to indicate conditions, 

-#  is treated as 助動詞 ("auxiliary verb") in school grammars, and attach to the 

-#  conjunctive form of inflectional words.

-#  e.g. そう

-#名詞-接尾-助動詞語幹

-#

-#  noun-suffix-adjective-base: Suffixes that attach to other nouns or the conjunctive 

-#  form of inflectional words and appear before the copula だ ("da").

-#  e.g. 的, げ, がち

-#名詞-接尾-形容動詞語幹

-#

-#  noun-suffix-adverbial: Suffixes that attach to other nouns and can behave as adverbs.

-#  e.g. 後 (ご), 以後, 以降, 以前, 前後, 中, 末, 上, 時 (じ)

-#名詞-接尾-副詞可能

-#

-#  noun-suffix-classifier: Suffixes that attach to numbers and form nouns. This category 

-#  is more inclusive than 助数詞 ("classifier") and includes common nouns that attach 

-#  to numbers.

-#  e.g. 個, つ, 本, 冊, パーセント, cm, kg, カ月, か国, 区画, 時間, 時半

-#名詞-接尾-助数詞

-#

-#  noun-suffix-special: Special suffixes that mainly attach to inflecting words.

-#  e.g. (楽し) さ, (考え) 方

-#名詞-接尾-特殊

-#

-#  noun-suffix-conjunctive: Nouns that behave like conjunctions and join two words 

-#  together.

-#  e.g. (日本) 対 (アメリカ), 対 (アメリカ), (3) 対 (5), (女優) 兼 (主婦)

-#名詞-接続詞的

-#

-#  noun-verbal_aux: Nouns that attach to the conjunctive particle て ("te") and are 

-#  semantically verb-like.

-#  e.g. ごらん, ご覧, 御覧, 頂戴

-#名詞-動詞非自立的

-#

-#  noun-quotation: text that cannot be segmented into words, proverbs, Chinese poetry, 

-#  dialects, English, etc. Currently, the only entry for 名詞 引用文字列 ("noun quotation") 

-#  is いわく ("iwaku").

-#名詞-引用文字列

-#

-#  noun-nai_adjective: Words that appear before the auxiliary verb ない ("nai") and

-#  behave like an adjective.

-#  e.g. 申し訳, 仕方, とんでも, 違い

-#名詞-ナイ形容詞語幹

-#

-#####

-#  prefix: unclassified prefixes

-#接頭詞

-#

-#  prefix-nominal: Prefixes that attach to nouns (including adjective stem forms) 

-#  excluding numerical expressions.

-#  e.g. お (水), 某 (氏), 同 (社), 故 (~氏), 高 (品質), お (見事), ご (立派)

-#接頭詞-名詞接続

-#

-#  prefix-verbal: Prefixes that attach to the imperative form of a verb or a verb

-#  in conjunctive form followed by なる/なさる/くださる.

-#  e.g. お (読みなさい), お (座り)

-#接頭詞-動詞接続

-#

-#  prefix-adjectival: Prefixes that attach to adjectives.

-#  e.g. お (寒いですねえ), バカ (でかい)

-#接頭詞-形容詞接続

-#

-#  prefix-numerical: Prefixes that attach to numerical expressions.

-#  e.g. 約, およそ, 毎時

-#接頭詞-数接続

-#

-#####

-#  verb: unclassified verbs

-#動詞

-#

-#  verb-main:

-#動詞-自立

-#

-#  verb-auxiliary:

-#動詞-非自立

-#

-#  verb-suffix:

-#動詞-接尾

-#

-#####

-#  adjective: unclassified adjectives

-#形容詞

-#

-#  adjective-main:

-#形容詞-自立

-#

-#  adjective-auxiliary:

-#形容詞-非自立

-#

-#  adjective-suffix:

-#形容詞-接尾

-#

-#####

-#  adverb: unclassified adverbs

-#副詞

-#

-#  adverb-misc: Words that can be segmented into one unit and where adnominal 

-#  modification is not possible.

-#  e.g. あいかわらず, 多分

-#副詞-一般

-#

-#  adverb-particle_conjunction: Adverbs that can be followed by の, は, に, 

-#  な, する, だ, etc.

-#  e.g. こんなに, そんなに, あんなに, なにか, なんでも

-#副詞-助詞類接続

-#

-#####

-#  adnominal: Words that only have noun-modifying forms.

-#  e.g. この, その, あの, どの, いわゆる, なんらかの, 何らかの, いろんな, こういう, そういう, ああいう, 

-#       どういう, こんな, そんな, あんな, どんな, 大きな, 小さな, おかしな, ほんの, たいした, 

-#       「(, も) さる (ことながら)」, 微々たる, 堂々たる, 単なる, いかなる, 我が」「同じ, 亡き

-#連体詞

-#

-#####

-#  conjunction: Conjunctions that can occur independently.

-#  e.g. が, けれども, そして, じゃあ, それどころか

-接続詞

-#

-#####

-#  particle: unclassified particles.

-助詞

-#

-#  particle-case: case particles where the subclassification is undefined.

-助詞-格助詞

-#

-#  particle-case-misc: Case particles.

-#  e.g. から, が, で, と, に, へ, より, を, の, にて

-助詞-格助詞-一般

-#

-#  particle-case-quote: the "to" that appears after nouns, a person’s speech, 

-#  quotation marks, expressions of decisions from a meeting, reasons, judgements,

-#  conjectures, etc.

-#  e.g. ( だ) と (述べた.), ( である) と (して執行猶予...)

-助詞-格助詞-引用

-#

-#  particle-case-compound: Compounds of particles and verbs that mainly behave 

-#  like case particles.

-#  e.g. という, といった, とかいう, として, とともに, と共に, でもって, にあたって, に当たって, に当って,

-#       にあたり, に当たり, に当り, に当たる, にあたる, において, に於いて,に於て, における, に於ける, 

-#       にかけ, にかけて, にかんし, に関し, にかんして, に関して, にかんする, に関する, に際し, 

-#       に際して, にしたがい, に従い, に従う, にしたがって, に従って, にたいし, に対し, にたいして, 

-#       に対して, にたいする, に対する, について, につき, につけ, につけて, につれ, につれて, にとって,

-#       にとり, にまつわる, によって, に依って, に因って, により, に依り, に因り, による, に依る, に因る, 

-#       にわたって, にわたる, をもって, を以って, を通じ, を通じて, を通して, をめぐって, をめぐり, をめぐる,

-#       って-口語/, ちゅう-関西弁「という」/, (何) ていう (人)-口語/, っていう-口語/, といふ, とかいふ

-助詞-格助詞-連語

-#

-#  particle-conjunctive:

-#  e.g. から, からには, が, けれど, けれども, けど, し, つつ, て, で, と, ところが, どころか, とも, ども, 

-#       ながら, なり, ので, のに, ば, ものの, や ( した), やいなや, (ころん) じゃ(いけない)-口語/, 

-#       (行っ) ちゃ(いけない)-口語/, (言っ) たって (しかたがない)-口語/, (それがなく)ったって (平気)-口語/

-助詞-接続助詞

-#

-#  particle-dependency:

-#  e.g. こそ, さえ, しか, すら, は, も, ぞ

-助詞-係助詞

-#

-#  particle-adverbial:

-#  e.g. がてら, かも, くらい, 位, ぐらい, しも, (学校) じゃ(これが流行っている)-口語/, 

-#       (それ)じゃあ (よくない)-口語/, ずつ, (私) なぞ, など, (私) なり (に), (先生) なんか (大嫌い)-口語/,

-#       (私) なんぞ, (先生) なんて (大嫌い)-口語/, のみ, だけ, (私) だって-口語/, だに, 

-#       (彼)ったら-口語/, (お茶) でも (いかが), 等 (とう), (今後) とも, ばかり, ばっか-口語/, ばっかり-口語/,

-#       ほど, 程, まで, 迄, (誰) も (が)([助詞-格助詞] および [助詞-係助詞] の前に位置する「も」)

-助詞-副助詞

-#

-#  particle-interjective: particles with interjective grammatical roles.

-#  e.g. (松島) や

-助詞-間投助詞

-#

-#  particle-coordinate:

-#  e.g. と, たり, だの, だり, とか, なり, や, やら

-助詞-並立助詞

-#

-#  particle-final:

-#  e.g. かい, かしら, さ, ぜ, (だ)っけ-口語/, (とまってる) で-方言/, な, ナ, なあ-口語/, ぞ, ね, ネ, 

-#       ねぇ-口語/, ねえ-口語/, ねん-方言/, の, のう-口語/, や, よ, ヨ, よぉ-口語/, わ, わい-口語/

-助詞-終助詞

-#

-#  particle-adverbial/conjunctive/final: The particle "ka" when unknown whether it is 

-#  adverbial, conjunctive, or sentence final. For example:

-#       (a) 「A か B か」. Ex:「(国内で運用する) か,(海外で運用する) か (.)」

-#       (b) Inside an adverb phrase. Ex:「(幸いという) か (, 死者はいなかった.)」

-#           「(祈りが届いたせい) か (, 試験に合格した.)」

-#       (c) 「かのように」. Ex:「(何もなかった) か (のように振る舞った.)」

-#  e.g. か

-助詞-副助詞/並立助詞/終助詞

-#

-#  particle-adnominalizer: The "no" that attaches to nouns and modifies 

-#  non-inflectional words.

-助詞-連体化

-#

-#  particle-adnominalizer: The "ni" and "to" that appear following nouns and adverbs 

-#  that are giongo, giseigo, or gitaigo.

-#  e.g. に, と

-助詞-副詞化

-#

-#  particle-special: A particle that does not fit into one of the above classifications. 

-#  This includes particles that are used in Tanka, Haiku, and other poetry.

-#  e.g. かな, けむ, ( しただろう) に, (あんた) にゃ(わからん), (俺) ん (家)

-助詞-特殊

-#

-#####

-#  auxiliary-verb:

-助動詞

-#

-#####

-#  interjection: Greetings and other exclamations.

-#  e.g. おはよう, おはようございます, こんにちは, こんばんは, ありがとう, どうもありがとう, ありがとうございます, 

-#       いただきます, ごちそうさま, さよなら, さようなら, はい, いいえ, ごめん, ごめんなさい

-#感動詞

-#

-#####

-#  symbol: unclassified Symbols.

-記号

-#

-#  symbol-misc: A general symbol not in one of the categories below.

-#  e.g. [○◎@$〒→+]

-記号-一般

-#

-#  symbol-comma: Commas

-#  e.g. [,、]

-記号-読点

-#

-#  symbol-period: Periods and full stops.

-#  e.g. [..。]

-記号-句点

-#

-#  symbol-space: Full-width whitespace.

-記号-空白

-#

-#  symbol-open_bracket:

-#  e.g. [({‘“『【]

-記号-括弧開

-#

-#  symbol-close_bracket:

-#  e.g. [)}’”』」】]

-記号-括弧閉

-#

-#  symbol-alphabetic:

-#記号-アルファベット

-#

-#####

-#  other: unclassified other

-#その他

-#

-#  other-interjection: Words that are hard to classify as noun-suffixes or 

-#  sentence-final particles.

-#  e.g. (だ)ァ

-その他-間投

-#

-#####

-#  filler: Aizuchi that occurs during a conversation or sounds inserted as filler.

-#  e.g. あの, うんと, えと

-フィラー

-#

-#####

-#  non-verbal: non-verbal sound.

-非言語音

-#

-#####

-#  fragment:

-#語断片

-#

-#####

-#  unknown: unknown part of speech.

-#未知語

-#

-##### End of file

+#
+# This file defines a Japanese stoptag set for JapanesePartOfSpeechStopFilter.
+#
+# Any token with a part-of-speech tag that exactly matches those defined in this
+# file are removed from the token stream.
+#
+# Set your own stoptags by uncommenting the lines below.  Note that comments are
+# not allowed on the same line as a stoptag.  See LUCENE-3745 for frequency lists,
+# etc. that can be useful for building you own stoptag set.
+#
+# The entire possible tagset is provided below for convenience.
+#
+#####
+#  noun: unclassified nouns
+#名詞
+#
+#  noun-common: Common nouns or nouns where the sub-classification is undefined
+#名詞-一般
+#
+#  noun-proper: Proper nouns where the sub-classification is undefined 
+#名詞-固有名詞
+#
+#  noun-proper-misc: miscellaneous proper nouns
+#名詞-固有名詞-一般
+#
+#  noun-proper-person: Personal names where the sub-classification is undefined
+#名詞-固有名詞-人名
+#
+#  noun-proper-person-misc: names that cannot be divided into surname and 
+#  given name; foreign names; names where the surname or given name is unknown.
+#  e.g. お市の方
+#名詞-固有名詞-人名-一般
+#
+#  noun-proper-person-surname: Mainly Japanese surnames.
+#  e.g. 山田
+#名詞-固有名詞-人名-姓
+#
+#  noun-proper-person-given_name: Mainly Japanese given names.
+#  e.g. 太郎
+#名詞-固有名詞-人名-名
+#
+#  noun-proper-organization: Names representing organizations.
+#  e.g. 通産省, NHK
+#名詞-固有名詞-組織
+#
+#  noun-proper-place: Place names where the sub-classification is undefined
+#名詞-固有名詞-地域
+#
+#  noun-proper-place-misc: Place names excluding countries.
+#  e.g. アジア, バルセロナ, 京都
+#名詞-固有名詞-地域-一般
+#
+#  noun-proper-place-country: Country names. 
+#  e.g. 日本, オーストラリア
+#名詞-固有名詞-地域-国
+#
+#  noun-pronoun: Pronouns where the sub-classification is undefined
+#名詞-代名詞
+#
+#  noun-pronoun-misc: miscellaneous pronouns: 
+#  e.g. それ, ここ, あいつ, あなた, あちこち, いくつ, どこか, なに, みなさん, みんな, わたくし, われわれ
+#名詞-代名詞-一般
+#
+#  noun-pronoun-contraction: Spoken language contraction made by combining a 
+#  pronoun and the particle 'wa'.
+#  e.g. ありゃ, こりゃ, こりゃあ, そりゃ, そりゃあ 
+#名詞-代名詞-縮約
+#
+#  noun-adverbial: Temporal nouns such as names of days or months that behave 
+#  like adverbs. Nouns that represent amount or ratios and can be used adverbially,
+#  e.g. 金曜, 一月, 午後, 少量
+#名詞-副詞可能
+#
+#  noun-verbal: Nouns that take arguments with case and can appear followed by 
+#  'suru' and related verbs (する, できる, なさる, くださる)
+#  e.g. インプット, 愛着, 悪化, 悪戦苦闘, 一安心, 下取り
+#名詞-サ変接続
+#
+#  noun-adjective-base: The base form of adjectives, words that appear before な ("na")
+#  e.g. 健康, 安易, 駄目, だめ
+#名詞-形容動詞語幹
+#
+#  noun-numeric: Arabic numbers, Chinese numerals, and counters like 何 (回), 数.
+#  e.g. 0, 1, 2, 何, 数, 幾
+#名詞-数
+#
+#  noun-affix: noun affixes where the sub-classification is undefined
+#名詞-非自立
+#
+#  noun-affix-misc: Of adnominalizers, the case-marker の ("no"), and words that 
+#  attach to the base form of inflectional words, words that cannot be classified 
+#  into any of the other categories below. This category includes indefinite nouns.
+#  e.g. あかつき, 暁, かい, 甲斐, 気, きらい, 嫌い, くせ, 癖, こと, 事, ごと, 毎, しだい, 次第, 
+#       順, せい, 所為, ついで, 序で, つもり, 積もり, 点, どころ, の, はず, 筈, はずみ, 弾み, 
+#       拍子, ふう, ふり, 振り, ほう, 方, 旨, もの, 物, 者, ゆえ, 故, ゆえん, 所以, わけ, 訳,
+#       わり, 割り, 割, ん-口語/, もん-口語/
+#名詞-非自立-一般
+#
+#  noun-affix-adverbial: noun affixes that that can behave as adverbs.
+#  e.g. あいだ, 間, あげく, 挙げ句, あと, 後, 余り, 以外, 以降, 以後, 以上, 以前, 一方, うえ, 
+#       上, うち, 内, おり, 折り, かぎり, 限り, きり, っきり, 結果, ころ, 頃, さい, 際, 最中, さなか, 
+#       最中, じたい, 自体, たび, 度, ため, 為, つど, 都度, とおり, 通り, とき, 時, ところ, 所, 
+#       とたん, 途端, なか, 中, のち, 後, ばあい, 場合, 日, ぶん, 分, ほか, 他, まえ, 前, まま, 
+#       儘, 侭, みぎり, 矢先
+#名詞-非自立-副詞可能
+#
+#  noun-affix-aux: noun affixes treated as 助動詞 ("auxiliary verb") in school grammars 
+#  with the stem よう(だ) ("you(da)").
+#  e.g.  よう, やう, 様 (よう)
+#名詞-非自立-助動詞語幹
+#  
+#  noun-affix-adjective-base: noun affixes that can connect to the indeclinable
+#  connection form な (aux "da").
+#  e.g. みたい, ふう
+#名詞-非自立-形容動詞語幹
+#
+#  noun-special: special nouns where the sub-classification is undefined.
+#名詞-特殊
+#
+#  noun-special-aux: The そうだ ("souda") stem form that is used for reporting news, is 
+#  treated as 助動詞 ("auxiliary verb") in school grammars, and attach to the base 
+#  form of inflectional words.
+#  e.g. そう
+#名詞-特殊-助動詞語幹
+#
+#  noun-suffix: noun suffixes where the sub-classification is undefined.
+#名詞-接尾
+#
+#  noun-suffix-misc: Of the nouns or stem forms of other parts of speech that connect 
+#  to ガル or タイ and can combine into compound nouns, words that cannot be classified into
+#  any of the other categories below. In general, this category is more inclusive than 
+#  接尾語 ("suffix") and is usually the last element in a compound noun.
+#  e.g. おき, かた, 方, 甲斐 (がい), がかり, ぎみ, 気味, ぐるみ, (~した) さ, 次第, 済 (ず) み,
+#       よう, (でき)っこ, 感, 観, 性, 学, 類, 面, 用
+#名詞-接尾-一般
+#
+#  noun-suffix-person: Suffixes that form nouns and attach to person names more often
+#  than other nouns.
+#  e.g. 君, 様, 著
+#名詞-接尾-人名
+#
+#  noun-suffix-place: Suffixes that form nouns and attach to place names more often 
+#  than other nouns.
+#  e.g. 町, 市, 県
+#名詞-接尾-地域
+#
+#  noun-suffix-verbal: Of the suffixes that attach to nouns and form nouns, those that 
+#  can appear before スル ("suru").
+#  e.g. 化, 視, 分け, 入り, 落ち, 買い
+#名詞-接尾-サ変接続
+#
+#  noun-suffix-aux: The stem form of そうだ (様態) that is used to indicate conditions, 
+#  is treated as 助動詞 ("auxiliary verb") in school grammars, and attach to the 
+#  conjunctive form of inflectional words.
+#  e.g. そう
+#名詞-接尾-助動詞語幹
+#
+#  noun-suffix-adjective-base: Suffixes that attach to other nouns or the conjunctive 
+#  form of inflectional words and appear before the copula だ ("da").
+#  e.g. 的, げ, がち
+#名詞-接尾-形容動詞語幹
+#
+#  noun-suffix-adverbial: Suffixes that attach to other nouns and can behave as adverbs.
+#  e.g. 後 (ご), 以後, 以降, 以前, 前後, 中, 末, 上, 時 (じ)
+#名詞-接尾-副詞可能
+#
+#  noun-suffix-classifier: Suffixes that attach to numbers and form nouns. This category 
+#  is more inclusive than 助数詞 ("classifier") and includes common nouns that attach 
+#  to numbers.
+#  e.g. 個, つ, 本, 冊, パーセント, cm, kg, カ月, か国, 区画, 時間, 時半
+#名詞-接尾-助数詞
+#
+#  noun-suffix-special: Special suffixes that mainly attach to inflecting words.
+#  e.g. (楽し) さ, (考え) 方
+#名詞-接尾-特殊
+#
+#  noun-suffix-conjunctive: Nouns that behave like conjunctions and join two words 
+#  together.
+#  e.g. (日本) 対 (アメリカ), 対 (アメリカ), (3) 対 (5), (女優) 兼 (主婦)
+#名詞-接続詞的
+#
+#  noun-verbal_aux: Nouns that attach to the conjunctive particle て ("te") and are 
+#  semantically verb-like.
+#  e.g. ごらん, ご覧, 御覧, 頂戴
+#名詞-動詞非自立的
+#
+#  noun-quotation: text that cannot be segmented into words, proverbs, Chinese poetry, 
+#  dialects, English, etc. Currently, the only entry for 名詞 引用文字列 ("noun quotation") 
+#  is いわく ("iwaku").
+#名詞-引用文字列
+#
+#  noun-nai_adjective: Words that appear before the auxiliary verb ない ("nai") and
+#  behave like an adjective.
+#  e.g. 申し訳, 仕方, とんでも, 違い
+#名詞-ナイ形容詞語幹
+#
+#####
+#  prefix: unclassified prefixes
+#接頭詞
+#
+#  prefix-nominal: Prefixes that attach to nouns (including adjective stem forms) 
+#  excluding numerical expressions.
+#  e.g. お (水), 某 (氏), 同 (社), 故 (~氏), 高 (品質), お (見事), ご (立派)
+#接頭詞-名詞接続
+#
+#  prefix-verbal: Prefixes that attach to the imperative form of a verb or a verb
+#  in conjunctive form followed by なる/なさる/くださる.
+#  e.g. お (読みなさい), お (座り)
+#接頭詞-動詞接続
+#
+#  prefix-adjectival: Prefixes that attach to adjectives.
+#  e.g. お (寒いですねえ), バカ (でかい)
+#接頭詞-形容詞接続
+#
+#  prefix-numerical: Prefixes that attach to numerical expressions.
+#  e.g. 約, およそ, 毎時
+#接頭詞-数接続
+#
+#####
+#  verb: unclassified verbs
+#動詞
+#
+#  verb-main:
+#動詞-自立
+#
+#  verb-auxiliary:
+#動詞-非自立
+#
+#  verb-suffix:
+#動詞-接尾
+#
+#####
+#  adjective: unclassified adjectives
+#形容詞
+#
+#  adjective-main:
+#形容詞-自立
+#
+#  adjective-auxiliary:
+#形容詞-非自立
+#
+#  adjective-suffix:
+#形容詞-接尾
+#
+#####
+#  adverb: unclassified adverbs
+#副詞
+#
+#  adverb-misc: Words that can be segmented into one unit and where adnominal 
+#  modification is not possible.
+#  e.g. あいかわらず, 多分
+#副詞-一般
+#
+#  adverb-particle_conjunction: Adverbs that can be followed by の, は, に, 
+#  な, する, だ, etc.
+#  e.g. こんなに, そんなに, あんなに, なにか, なんでも
+#副詞-助詞類接続
+#
+#####
+#  adnominal: Words that only have noun-modifying forms.
+#  e.g. この, その, あの, どの, いわゆる, なんらかの, 何らかの, いろんな, こういう, そういう, ああいう, 
+#       どういう, こんな, そんな, あんな, どんな, 大きな, 小さな, おかしな, ほんの, たいした, 
+#       「(, も) さる (ことながら)」, 微々たる, 堂々たる, 単なる, いかなる, 我が」「同じ, 亡き
+#連体詞
+#
+#####
+#  conjunction: Conjunctions that can occur independently.
+#  e.g. が, けれども, そして, じゃあ, それどころか
+接続詞
+#
+#####
+#  particle: unclassified particles.
+助詞
+#
+#  particle-case: case particles where the subclassification is undefined.
+助詞-格助詞
+#
+#  particle-case-misc: Case particles.
+#  e.g. から, が, で, と, に, へ, より, を, の, にて
+助詞-格助詞-一般
+#
+#  particle-case-quote: the "to" that appears after nouns, a person’s speech, 
+#  quotation marks, expressions of decisions from a meeting, reasons, judgements,
+#  conjectures, etc.
+#  e.g. ( だ) と (述べた.), ( である) と (して執行猶予...)
+助詞-格助詞-引用
+#
+#  particle-case-compound: Compounds of particles and verbs that mainly behave 
+#  like case particles.
+#  e.g. という, といった, とかいう, として, とともに, と共に, でもって, にあたって, に当たって, に当って,
+#       にあたり, に当たり, に当り, に当たる, にあたる, において, に於いて,に於て, における, に於ける, 
+#       にかけ, にかけて, にかんし, に関し, にかんして, に関して, にかんする, に関する, に際し, 
+#       に際して, にしたがい, に従い, に従う, にしたがって, に従って, にたいし, に対し, にたいして, 
+#       に対して, にたいする, に対する, について, につき, につけ, につけて, につれ, につれて, にとって,
+#       にとり, にまつわる, によって, に依って, に因って, により, に依り, に因り, による, に依る, に因る, 
+#       にわたって, にわたる, をもって, を以って, を通じ, を通じて, を通して, をめぐって, をめぐり, をめぐる,
+#       って-口語/, ちゅう-関西弁「という」/, (何) ていう (人)-口語/, っていう-口語/, といふ, とかいふ
+助詞-格助詞-連語
+#
+#  particle-conjunctive:
+#  e.g. から, からには, が, けれど, けれども, けど, し, つつ, て, で, と, ところが, どころか, とも, ども, 
+#       ながら, なり, ので, のに, ば, ものの, や ( した), やいなや, (ころん) じゃ(いけない)-口語/, 
+#       (行っ) ちゃ(いけない)-口語/, (言っ) たって (しかたがない)-口語/, (それがなく)ったって (平気)-口語/
+助詞-接続助詞
+#
+#  particle-dependency:
+#  e.g. こそ, さえ, しか, すら, は, も, ぞ
+助詞-係助詞
+#
+#  particle-adverbial:
+#  e.g. がてら, かも, くらい, 位, ぐらい, しも, (学校) じゃ(これが流行っている)-口語/, 
+#       (それ)じゃあ (よくない)-口語/, ずつ, (私) なぞ, など, (私) なり (に), (先生) なんか (大嫌い)-口語/,
+#       (私) なんぞ, (先生) なんて (大嫌い)-口語/, のみ, だけ, (私) だって-口語/, だに, 
+#       (彼)ったら-口語/, (お茶) でも (いかが), 等 (とう), (今後) とも, ばかり, ばっか-口語/, ばっかり-口語/,
+#       ほど, 程, まで, 迄, (誰) も (が)([助詞-格助詞] および [助詞-係助詞] の前に位置する「も」)
+助詞-副助詞
+#
+#  particle-interjective: particles with interjective grammatical roles.
+#  e.g. (松島) や
+助詞-間投助詞
+#
+#  particle-coordinate:
+#  e.g. と, たり, だの, だり, とか, なり, や, やら
+助詞-並立助詞
+#
+#  particle-final:
+#  e.g. かい, かしら, さ, ぜ, (だ)っけ-口語/, (とまってる) で-方言/, な, ナ, なあ-口語/, ぞ, ね, ネ, 
+#       ねぇ-口語/, ねえ-口語/, ねん-方言/, の, のう-口語/, や, よ, ヨ, よぉ-口語/, わ, わい-口語/
+助詞-終助詞
+#
+#  particle-adverbial/conjunctive/final: The particle "ka" when unknown whether it is 
+#  adverbial, conjunctive, or sentence final. For example:
+#       (a) 「A か B か」. Ex:「(国内で運用する) か,(海外で運用する) か (.)」
+#       (b) Inside an adverb phrase. Ex:「(幸いという) か (, 死者はいなかった.)」
+#           「(祈りが届いたせい) か (, 試験に合格した.)」
+#       (c) 「かのように」. Ex:「(何もなかった) か (のように振る舞った.)」
+#  e.g. か
+助詞-副助詞/並立助詞/終助詞
+#
+#  particle-adnominalizer: The "no" that attaches to nouns and modifies 
+#  non-inflectional words.
+助詞-連体化
+#
+#  particle-adnominalizer: The "ni" and "to" that appear following nouns and adverbs 
+#  that are giongo, giseigo, or gitaigo.
+#  e.g. に, と
+助詞-副詞化
+#
+#  particle-special: A particle that does not fit into one of the above classifications. 
+#  This includes particles that are used in Tanka, Haiku, and other poetry.
+#  e.g. かな, けむ, ( しただろう) に, (あんた) にゃ(わからん), (俺) ん (家)
+助詞-特殊
+#
+#####
+#  auxiliary-verb:
+助動詞
+#
+#####
+#  interjection: Greetings and other exclamations.
+#  e.g. おはよう, おはようございます, こんにちは, こんばんは, ありがとう, どうもありがとう, ありがとうございます, 
+#       いただきます, ごちそうさま, さよなら, さようなら, はい, いいえ, ごめん, ごめんなさい
+#感動詞
+#
+#####
+#  symbol: unclassified Symbols.
+記号
+#
+#  symbol-misc: A general symbol not in one of the categories below.
+#  e.g. [○◎@$〒→+]
+記号-一般
+#
+#  symbol-comma: Commas
+#  e.g. [,、]
+記号-読点
+#
+#  symbol-period: Periods and full stops.
+#  e.g. [..。]
+記号-句点
+#
+#  symbol-space: Full-width whitespace.
+記号-空白
+#
+#  symbol-open_bracket:
+#  e.g. [({‘“『【]
+記号-括弧開
+#
+#  symbol-close_bracket:
+#  e.g. [)}’”』」】]
+記号-括弧閉
+#
+#  symbol-alphabetic:
+#記号-アルファベット
+#
+#####
+#  other: unclassified other
+#その他
+#
+#  other-interjection: Words that are hard to classify as noun-suffixes or 
+#  sentence-final particles.
+#  e.g. (だ)ァ
+その他-間投
+#
+#####
+#  filler: Aizuchi that occurs during a conversation or sounds inserted as filler.
+#  e.g. あの, うんと, えと
+フィラー
+#
+#####
+#  non-verbal: non-verbal sound.
+非言語音
+#
+#####
+#  fragment:
+#語断片
+#
+#####
+#  unknown: unknown part of speech.
+#未知語
+#
+##### End of file
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_ar.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_ar.txt
index aca2430..046829d 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_ar.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_ar.txt
@@ -1,125 +1,125 @@
-# This file was created by Jacques Savoy and is distributed under the BSD license.

-# See http://members.unine.ch/jacques.savoy/clef/index.html.

-# Also see http://www.opensource.org/licenses/bsd-license.html

-# Cleaned on October 11, 2009 (not normalized, so use before normalization)

-# This means that when modifying this list, you might need to add some 

-# redundant entries, for example containing forms with both أ and ا

-من

-ومن

-منها

-منه

-في

-وفي

-فيها

-فيه



-ثم

-او

-أو


-بها

-به



-اى

-اي

-أي

-أى

-لا

-ولا

-الا

-ألا

-إلا

-لكن

-ما

-وما

-كما

-فما

-عن

-مع

-اذا

-إذا

-ان

-أن

-إن

-انها

-أنها

-إنها

-انه

-أنه

-إنه

-بان

-بأن

-فان

-فأن

-وان

-وأن

-وإن

-التى

-التي

-الذى

-الذي

-الذين

-الى

-الي

-إلى

-إلي

-على

-عليها

-عليه

-اما

-أما

-إما

-ايضا

-أيضا

-كل

-وكل

-لم

-ولم

-لن

-ولن

-هى

-هي

-هو

-وهى

-وهي

-وهو

-فهى

-فهي

-فهو

-انت

-أنت

-لك

-لها

-له

-هذه

-هذا

-تلك

-ذلك

-هناك

-كانت

-كان

-يكون

-تكون

-وكانت

-وكان

-غير

-بعض

-قد

-نحو

-بين

-بينما

-منذ

-ضمن

-حيث

-الان

-الآن

-خلال

-بعد

-قبل

-حتى

-عند

-عندما

-لدى

-جميع

+# This file was created by Jacques Savoy and is distributed under the BSD license.
+# See http://members.unine.ch/jacques.savoy/clef/index.html.
+# Also see http://www.opensource.org/licenses/bsd-license.html
+# Cleaned on October 11, 2009 (not normalized, so use before normalization)
+# This means that when modifying this list, you might need to add some 
+# redundant entries, for example containing forms with both أ and ا
+من
+ومن
+منها
+منه
+في
+وفي
+فيها
+فيه


+ثم
+او
+أو

+بها
+به


+اى
+اي
+أي
+أى
+لا
+ولا
+الا
+ألا
+إلا
+لكن
+ما
+وما
+كما
+فما
+عن
+مع
+اذا
+إذا
+ان
+أن
+إن
+انها
+أنها
+إنها
+انه
+أنه
+إنه
+بان
+بأن
+فان
+فأن
+وان
+وأن
+وإن
+التى
+التي
+الذى
+الذي
+الذين
+الى
+الي
+إلى
+إلي
+على
+عليها
+عليه
+اما
+أما
+إما
+ايضا
+أيضا
+كل
+وكل
+لم
+ولم
+لن
+ولن
+هى
+هي
+هو
+وهى
+وهي
+وهو
+فهى
+فهي
+فهو
+انت
+أنت
+لك
+لها
+له
+هذه
+هذا
+تلك
+ذلك
+هناك
+كانت
+كان
+يكون
+تكون
+وكانت
+وكان
+غير
+بعض
+قد
+نحو
+بين
+بينما
+منذ
+ضمن
+حيث
+الان
+الآن
+خلال
+بعد
+قبل
+حتى
+عند
+عندما
+لدى
+جميع
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_bg.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_bg.txt
index 842ee8a..1ae4ba2 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_bg.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_bg.txt
@@ -1,193 +1,193 @@
-# This file was created by Jacques Savoy and is distributed under the BSD license.

-# See http://members.unine.ch/jacques.savoy/clef/index.html.

-# Also see http://www.opensource.org/licenses/bsd-license.html


-аз

-ако

-ала

-бе

-без

-беше

-би

-бил

-била

-били

-било

-близо

-бъдат

-бъде

-бяха


-вас

-ваш

-ваша

-вероятно

-вече

-взема

-ви

-вие

-винаги

-все

-всеки

-всички

-всичко

-всяка

-във

-въпреки

-върху


-ги

-главно

-го


-да

-дали

-до

-докато

-докога

-дори

-досега

-доста


-едва

-един

-ето

-за

-зад

-заедно

-заради

-засега

-затова

-защо

-защото


-из

-или

-им

-има

-имат

-иска


-каза

-как

-каква

-какво

-както

-какъв

-като

-кога

-когато

-което

-които

-кой

-който

-колко

-която

-къде

-където

-към

-ли


-ме

-между

-мен

-ми

-мнозина

-мога

-могат

-може

-моля

-момента

-му


-на

-над

-назад

-най

-направи

-напред

-например

-нас

-не

-него

-нея

-ни

-ние

-никой

-нито

-но

-някои

-някой

-няма

-обаче

-около

-освен

-особено

-от

-отгоре

-отново

-още

-пак

-по

-повече

-повечето

-под

-поне

-поради

-после

-почти

-прави

-пред

-преди

-през

-при

-пък

-първо


-са

-само

-се

-сега

-си

-скоро

-след

-сме

-според

-сред

-срещу

-сте

-съм

-със

-също


-тази

-така

-такива

-такъв

-там

-твой

-те

-тези

-ти

-тн

-то

-това

-тогава

-този

-той

-толкова

-точно

-трябва

-тук

-тъй

-тя

-тях


-харесва


-че

-често

-чрез

-ще

-щом


+# This file was created by Jacques Savoy and is distributed under the BSD license.
+# See http://members.unine.ch/jacques.savoy/clef/index.html.
+# Also see http://www.opensource.org/licenses/bsd-license.html

+аз
+ако
+ала
+бе
+без
+беше
+би
+бил
+била
+били
+било
+близо
+бъдат
+бъде
+бяха

+вас
+ваш
+ваша
+вероятно
+вече
+взема
+ви
+вие
+винаги
+все
+всеки
+всички
+всичко
+всяка
+във
+въпреки
+върху

+ги
+главно
+го

+да
+дали
+до
+докато
+докога
+дори
+досега
+доста

+едва
+един
+ето
+за
+зад
+заедно
+заради
+засега
+затова
+защо
+защото

+из
+или
+им
+има
+имат
+иска

+каза
+как
+каква
+какво
+както
+какъв
+като
+кога
+когато
+което
+които
+кой
+който
+колко
+която
+къде
+където
+към
+ли

+ме
+между
+мен
+ми
+мнозина
+мога
+могат
+може
+моля
+момента
+му

+на
+над
+назад
+най
+направи
+напред
+например
+нас
+не
+него
+нея
+ни
+ние
+никой
+нито
+но
+някои
+някой
+няма
+обаче
+около
+освен
+особено
+от
+отгоре
+отново
+още
+пак
+по
+повече
+повечето
+под
+поне
+поради
+после
+почти
+прави
+пред
+преди
+през
+при
+пък
+първо

+са
+само
+се
+сега
+си
+скоро
+след
+сме
+според
+сред
+срещу
+сте
+съм
+със
+също

+тази
+така
+такива
+такъв
+там
+твой
+те
+тези
+ти
+тн
+то
+това
+тогава
+този
+той
+толкова
+точно
+трябва
+тук
+тъй
+тя
+тях

+харесва

+че
+често
+чрез
+ще
+щом

diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_ca.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_ca.txt
index e618af5..3da65de 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_ca.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_ca.txt
@@ -1,220 +1,220 @@
-# Catalan stopwords from http://github.com/vcl/cue.language (Apache 2 Licensed)

-a

-abans

-ací

-ah

-així

-això

-al

-als

-aleshores

-algun

-alguna

-algunes

-alguns

-alhora

-allà

-allí

-allò

-altra

-altre

-altres

-amb

-ambdós

-ambdues

-apa

-aquell

-aquella

-aquelles

-aquells

-aquest

-aquesta

-aquestes

-aquests

-aquí

-baix

-cada

-cadascú

-cadascuna

-cadascunes

-cadascuns

-com

-contra

-d'un

-d'una

-d'unes

-d'uns

-dalt

-de

-del

-dels

-des

-després

-dins

-dintre

-donat

-doncs

-durant

-e

-eh

-el

-els

-em

-en

-encara

-ens

-entre

-érem

-eren

-éreu

-es

-és

-esta

-està

-estàvem

-estaven

-estàveu

-esteu

-et

-etc

-ets

-fins

-fora

-gairebé

-ha

-han

-has

-havia

-he

-hem

-heu

-hi 

-ho

-i

-igual

-iguals

-ja

-l'hi

-la

-les

-li

-li'n

-llavors

-m'he

-ma

-mal

-malgrat

-mateix

-mateixa

-mateixes

-mateixos

-me

-mentre

-més

-meu

-meus

-meva

-meves

-molt

-molta

-moltes

-molts

-mon

-mons

-n'he

-n'hi

-ne

-ni

-no

-nogensmenys

-només

-nosaltres

-nostra

-nostre

-nostres

-o

-oh

-oi

-on

-pas

-pel

-pels

-per

-però

-perquè

-poc 

-poca

-pocs

-poques

-potser

-propi

-qual

-quals

-quan

-quant 

-que

-què

-quelcom

-qui

-quin

-quina

-quines

-quins

-s'ha

-s'han

-sa

-semblant

-semblants

-ses

-seu 

-seus

-seva

-seva

-seves

-si

-sobre

-sobretot

-sóc

-solament

-sols

-son 

-són

-sons 

-sota

-sou

-t'ha

-t'han

-t'he

-ta

-tal

-també

-tampoc

-tan

-tant

-tanta

-tantes

-teu

-teus

-teva

-teves

-ton

-tons

-tot

-tota

-totes

-tots

-un

-una

-unes

-uns

-us

-va

-vaig

-vam

-van

-vas

-veu

-vosaltres

-vostra

-vostre

-vostres

+# Catalan stopwords from http://github.com/vcl/cue.language (Apache 2 Licensed)
+a
+abans
+ací
+ah
+així
+això
+al
+als
+aleshores
+algun
+alguna
+algunes
+alguns
+alhora
+allà
+allí
+allò
+altra
+altre
+altres
+amb
+ambdós
+ambdues
+apa
+aquell
+aquella
+aquelles
+aquells
+aquest
+aquesta
+aquestes
+aquests
+aquí
+baix
+cada
+cadascú
+cadascuna
+cadascunes
+cadascuns
+com
+contra
+d'un
+d'una
+d'unes
+d'uns
+dalt
+de
+del
+dels
+des
+després
+dins
+dintre
+donat
+doncs
+durant
+e
+eh
+el
+els
+em
+en
+encara
+ens
+entre
+érem
+eren
+éreu
+es
+és
+esta
+està
+estàvem
+estaven
+estàveu
+esteu
+et
+etc
+ets
+fins
+fora
+gairebé
+ha
+han
+has
+havia
+he
+hem
+heu
+hi 
+ho
+i
+igual
+iguals
+ja
+l'hi
+la
+les
+li
+li'n
+llavors
+m'he
+ma
+mal
+malgrat
+mateix
+mateixa
+mateixes
+mateixos
+me
+mentre
+més
+meu
+meus
+meva
+meves
+molt
+molta
+moltes
+molts
+mon
+mons
+n'he
+n'hi
+ne
+ni
+no
+nogensmenys
+només
+nosaltres
+nostra
+nostre
+nostres
+o
+oh
+oi
+on
+pas
+pel
+pels
+per
+però
+perquè
+poc 
+poca
+pocs
+poques
+potser
+propi
+qual
+quals
+quan
+quant 
+que
+què
+quelcom
+qui
+quin
+quina
+quines
+quins
+s'ha
+s'han
+sa
+semblant
+semblants
+ses
+seu 
+seus
+seva
+seva
+seves
+si
+sobre
+sobretot
+sóc
+solament
+sols
+son 
+són
+sons 
+sota
+sou
+t'ha
+t'han
+t'he
+ta
+tal
+també
+tampoc
+tan
+tant
+tanta
+tantes
+teu
+teus
+teva
+teves
+ton
+tons
+tot
+tota
+totes
+tots
+un
+una
+unes
+uns
+us
+va
+vaig
+vam
+van
+vas
+veu
+vosaltres
+vostra
+vostre
+vostres
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_ckb.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_ckb.txt
index c3e1e5f..87abf11 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_ckb.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_ckb.txt
@@ -1,136 +1,136 @@
-# set of kurdish stopwords

-# note these have been normalized with our scheme (e represented with U+06D5, etc)

-# constructed from:

-# * Fig 5 of "Building A Test Collection For Sorani Kurdish" (Esmaili et al)

-# * "Sorani Kurdish: A Reference Grammar with selected readings" (Thackston)

-# * Corpus-based analysis of 77M word Sorani collection: wikipedia, news, blogs, etc

-

-# and


-# which

-کە

-# of


-# made/did

-کرد

-# that/which

-ئەوەی

-# on/head

-سەر

-# two

-دوو

-# also

-هەروەها

-# from/that

-لەو

-# makes/does

-دەکات

-# some

-چەند

-# every

-هەر

-

-# demonstratives

-# that

-ئەو

-# this

-ئەم

-

-# personal pronouns

-# I

-من

-# we

-ئێمە

-# you

-تۆ

-# you

-ئێوە

-# he/she/it

-ئەو

-# they

-ئەوان

-

-# prepositions

-# to/with/by

-بە

-پێ

-# without

-بەبێ

-# along with/while/during

-بەدەم

-# in the opinion of

-بەلای

-# according to

-بەپێی

-# before

-بەرلە

-# in the direction of

-بەرەوی

-# in front of/toward

-بەرەوە

-# before/in the face of

-بەردەم

-# without

-بێ

-# except for

-بێجگە

-# for

-بۆ

-# on/in

-دە

-تێ

-# with

-دەگەڵ

-# after

-دوای

-# except for/aside from

-جگە

-# in/from

-لە

-لێ

-# in front of/before/because of

-لەبەر

-# between/among

-لەبەینی

-# concerning/about

-لەبابەت

-# concerning

-لەبارەی

-# instead of

-لەباتی

-# beside

-لەبن

-# instead of

-لەبرێتی

-# behind

-لەدەم

-# with/together with

-لەگەڵ

-# by

-لەلایەن

-# within

-لەناو

-# between/among

-لەنێو

-# for the sake of

-لەپێناوی

-# with respect to

-لەرەوی

-# by means of/for

-لەرێ

-# for the sake of

-لەرێگا

-# on/on top of/according to

-لەسەر

-# under

-لەژێر

-# between/among

-ناو

-# between/among

-نێوان

-# after

-پاش

-# before

-پێش

-# like

-وەک

+# set of kurdish stopwords
+# note these have been normalized with our scheme (e represented with U+06D5, etc)
+# constructed from:
+# * Fig 5 of "Building A Test Collection For Sorani Kurdish" (Esmaili et al)
+# * "Sorani Kurdish: A Reference Grammar with selected readings" (Thackston)
+# * Corpus-based analysis of 77M word Sorani collection: wikipedia, news, blogs, etc
+
+# and

+# which
+کە
+# of

+# made/did
+کرد
+# that/which
+ئەوەی
+# on/head
+سەر
+# two
+دوو
+# also
+هەروەها
+# from/that
+لەو
+# makes/does
+دەکات
+# some
+چەند
+# every
+هەر
+
+# demonstratives
+# that
+ئەو
+# this
+ئەم
+
+# personal pronouns
+# I
+من
+# we
+ئێمە
+# you
+تۆ
+# you
+ئێوە
+# he/she/it
+ئەو
+# they
+ئەوان
+
+# prepositions
+# to/with/by
+بە
+پێ
+# without
+بەبێ
+# along with/while/during
+بەدەم
+# in the opinion of
+بەلای
+# according to
+بەپێی
+# before
+بەرلە
+# in the direction of
+بەرەوی
+# in front of/toward
+بەرەوە
+# before/in the face of
+بەردەم
+# without
+بێ
+# except for
+بێجگە
+# for
+بۆ
+# on/in
+دە
+تێ
+# with
+دەگەڵ
+# after
+دوای
+# except for/aside from
+جگە
+# in/from
+لە
+لێ
+# in front of/before/because of
+لەبەر
+# between/among
+لەبەینی
+# concerning/about
+لەبابەت
+# concerning
+لەبارەی
+# instead of
+لەباتی
+# beside
+لەبن
+# instead of
+لەبرێتی
+# behind
+لەدەم
+# with/together with
+لەگەڵ
+# by
+لەلایەن
+# within
+لەناو
+# between/among
+لەنێو
+# for the sake of
+لەپێناوی
+# with respect to
+لەرەوی
+# by means of/for
+لەرێ
+# for the sake of
+لەرێگا
+# on/on top of/according to
+لەسەر
+# under
+لەژێر
+# between/among
+ناو
+# between/among
+نێوان
+# after
+پاش
+# before
+پێش
+# like
+وەک
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_cz.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_cz.txt
index e928df9..53c6097 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_cz.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_cz.txt
@@ -1,172 +1,172 @@
-a

-s

-k

-o

-i

-u

-v

-z

-dnes

-cz

-tímto

-budeš

-budem

-byli

-jseš

-můj

-svým

-ta

-tomto

-tohle

-tuto

-tyto

-jej

-zda

-proč

-máte

-tato

-kam

-tohoto

-kdo

-kteří

-mi

-nám

-tom

-tomuto

-mít

-nic

-proto

-kterou

-byla

-toho

-protože

-asi

-ho

-naši

-napište

-re

-což

-tím

-takže

-svých

-její

-svými

-jste

-aj

-tu

-tedy

-teto

-bylo

-kde

-ke

-pravé

-ji

-nad

-nejsou

-či

-pod

-téma

-mezi

-přes

-ty

-pak

-vám

-ani

-když

-však

-neg

-jsem

-tento

-článku

-články

-aby

-jsme

-před

-pta

-jejich

-byl

-ještě

-až

-bez

-také

-pouze

-první

-vaše

-která

-nás

-nový

-tipy

-pokud

-může

-strana

-jeho

-své

-jiné

-zprávy

-nové

-není

-vás

-jen

-podle

-zde

-už

-být

-více

-bude

-již

-než

-který

-by

-které

-co

-nebo

-ten

-tak

-má

-při

-od

-po

-jsou

-jak

-další

-ale

-si

-se

-ve

-to

-jako

-za

-zpět

-ze

-do

-pro

-je

-na

-atd

-atp

-jakmile

-přičemž

-já

-on

-ona

-ono

-oni

-ony

-my

-vy

-jí

-ji

-mě

-mne

-jemu

-tomu

-těm

-těmu

-němu

-němuž

-jehož

-jíž

-jelikož

-jež

-jakož

-načež

+a
+s
+k
+o
+i
+u
+v
+z
+dnes
+cz
+tímto
+budeš
+budem
+byli
+jseš
+můj
+svým
+ta
+tomto
+tohle
+tuto
+tyto
+jej
+zda
+proč
+máte
+tato
+kam
+tohoto
+kdo
+kteří
+mi
+nám
+tom
+tomuto
+mít
+nic
+proto
+kterou
+byla
+toho
+protože
+asi
+ho
+naši
+napište
+re
+což
+tím
+takže
+svých
+její
+svými
+jste
+aj
+tu
+tedy
+teto
+bylo
+kde
+ke
+pravé
+ji
+nad
+nejsou
+či
+pod
+téma
+mezi
+přes
+ty
+pak
+vám
+ani
+když
+však
+neg
+jsem
+tento
+článku
+články
+aby
+jsme
+před
+pta
+jejich
+byl
+ještě
+až
+bez
+také
+pouze
+první
+vaše
+která
+nás
+nový
+tipy
+pokud
+může
+strana
+jeho
+své
+jiné
+zprávy
+nové
+není
+vás
+jen
+podle
+zde
+už
+být
+více
+bude
+již
+než
+který
+by
+které
+co
+nebo
+ten
+tak
+má
+při
+od
+po
+jsou
+jak
+další
+ale
+si
+se
+ve
+to
+jako
+za
+zpět
+ze
+do
+pro
+je
+na
+atd
+atp
+jakmile
+přičemž
+já
+on
+ona
+ono
+oni
+ony
+my
+vy
+jí
+ji
+mě
+mne
+jemu
+tomu
+těm
+těmu
+němu
+němuž
+jehož
+jíž
+jelikož
+jež
+jakož
+načež
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_da.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_da.txt
index e25d49c..42e6145 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_da.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_da.txt
@@ -1,110 +1,110 @@
- | From svn.tartarus.org/snowball/trunk/website/algorithms/danish/stop.txt

- | This file is distributed under the BSD License.

- | See http://snowball.tartarus.org/license.php

- | Also see http://www.opensource.org/licenses/bsd-license.html

- |  - Encoding was converted to UTF-8.

- |  - This notice was added.

- |

- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"

-

- | A Danish stop word list. Comments begin with vertical bar. Each stop

- | word is at the start of a line.

-

- | This is a ranked list (commonest to rarest) of stopwords derived from

- | a large text sample.

-

-

-og           | and

-i            | in

-jeg          | I

-det          | that (dem. pronoun)/it (pers. pronoun)

-at           | that (in front of a sentence)/to (with infinitive)

-en           | a/an

-den          | it (pers. pronoun)/that (dem. pronoun)

-til          | to/at/for/until/against/by/of/into, more

-er           | present tense of "to be"

-som          | who, as

-på           | on/upon/in/on/at/to/after/of/with/for, on

-de           | they

-med          | with/by/in, along

-han          | he

-af           | of/by/from/off/for/in/with/on, off

-for          | at/for/to/from/by/of/ago, in front/before, because

-ikke         | not

-der          | who/which, there/those

-var          | past tense of "to be"

-mig          | me/myself

-sig          | oneself/himself/herself/itself/themselves

-men          | but

-et           | a/an/one, one (number), someone/somebody/one

-har          | present tense of "to have"

-om           | round/about/for/in/a, about/around/down, if

-vi           | we

-min          | my

-havde        | past tense of "to have"

-ham          | him

-hun          | she

-nu           | now

-over         | over/above/across/by/beyond/past/on/about, over/past

-da           | then, when/as/since

-fra          | from/off/since, off, since

-du           | you

-ud           | out

-sin          | his/her/its/one's

-dem          | them

-os           | us/ourselves

-op           | up

-man          | you/one

-hans         | his

-hvor         | where

-eller        | or

-hvad         | what

-skal         | must/shall etc.

-selv         | myself/youself/herself/ourselves etc., even

-her          | here

-alle         | all/everyone/everybody etc.

-vil          | will (verb)

-blev         | past tense of "to stay/to remain/to get/to become"

-kunne        | could

-ind          | in

-når          | when

-være         | present tense of "to be"

-dog          | however/yet/after all

-noget        | something

-ville        | would

-jo           | you know/you see (adv), yes

-deres        | their/theirs

-efter        | after/behind/according to/for/by/from, later/afterwards

-ned          | down

-skulle       | should

-denne        | this

-end          | than

-dette        | this

-mit          | my/mine

-også         | also

-under        | under/beneath/below/during, below/underneath

-have         | have

-dig          | you

-anden        | other

-hende        | her

-mine         | my

-alt          | everything

-meget        | much/very, plenty of

-sit          | his, her, its, one's

-sine         | his, her, its, one's

-vor          | our

-mod          | against

-disse        | these

-hvis         | if

-din          | your/yours

-nogle        | some

-hos          | by/at

-blive        | be/become

-mange        | many

-ad           | by/through

-bliver       | present tense of "to be/to become"

-hendes       | her/hers

-været        | be

-thi          | for (conj)

-jer          | you

-sådan        | such, like this/like that

+ | From svn.tartarus.org/snowball/trunk/website/algorithms/danish/stop.txt
+ | This file is distributed under the BSD License.
+ | See http://snowball.tartarus.org/license.php
+ | Also see http://www.opensource.org/licenses/bsd-license.html
+ |  - Encoding was converted to UTF-8.
+ |  - This notice was added.
+ |
+ | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
+
+ | A Danish stop word list. Comments begin with vertical bar. Each stop
+ | word is at the start of a line.
+
+ | This is a ranked list (commonest to rarest) of stopwords derived from
+ | a large text sample.
+
+
+og           | and
+i            | in
+jeg          | I
+det          | that (dem. pronoun)/it (pers. pronoun)
+at           | that (in front of a sentence)/to (with infinitive)
+en           | a/an
+den          | it (pers. pronoun)/that (dem. pronoun)
+til          | to/at/for/until/against/by/of/into, more
+er           | present tense of "to be"
+som          | who, as
+på           | on/upon/in/on/at/to/after/of/with/for, on
+de           | they
+med          | with/by/in, along
+han          | he
+af           | of/by/from/off/for/in/with/on, off
+for          | at/for/to/from/by/of/ago, in front/before, because
+ikke         | not
+der          | who/which, there/those
+var          | past tense of "to be"
+mig          | me/myself
+sig          | oneself/himself/herself/itself/themselves
+men          | but
+et           | a/an/one, one (number), someone/somebody/one
+har          | present tense of "to have"
+om           | round/about/for/in/a, about/around/down, if
+vi           | we
+min          | my
+havde        | past tense of "to have"
+ham          | him
+hun          | she
+nu           | now
+over         | over/above/across/by/beyond/past/on/about, over/past
+da           | then, when/as/since
+fra          | from/off/since, off, since
+du           | you
+ud           | out
+sin          | his/her/its/one's
+dem          | them
+os           | us/ourselves
+op           | up
+man          | you/one
+hans         | his
+hvor         | where
+eller        | or
+hvad         | what
+skal         | must/shall etc.
+selv         | myself/youself/herself/ourselves etc., even
+her          | here
+alle         | all/everyone/everybody etc.
+vil          | will (verb)
+blev         | past tense of "to stay/to remain/to get/to become"
+kunne        | could
+ind          | in
+når          | when
+være         | present tense of "to be"
+dog          | however/yet/after all
+noget        | something
+ville        | would
+jo           | you know/you see (adv), yes
+deres        | their/theirs
+efter        | after/behind/according to/for/by/from, later/afterwards
+ned          | down
+skulle       | should
+denne        | this
+end          | than
+dette        | this
+mit          | my/mine
+også         | also
+under        | under/beneath/below/during, below/underneath
+have         | have
+dig          | you
+anden        | other
+hende        | her
+mine         | my
+alt          | everything
+meget        | much/very, plenty of
+sit          | his, her, its, one's
+sine         | his, her, its, one's
+vor          | our
+mod          | against
+disse        | these
+hvis         | if
+din          | your/yours
+nogle        | some
+hos          | by/at
+blive        | be/become
+mange        | many
+ad           | by/through
+bliver       | present tense of "to be/to become"
+hendes       | her/hers
+været        | be
+thi          | for (conj)
+jer          | you
+sådan        | such, like this/like that
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_de.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_de.txt
index bb9933e..86525e7 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_de.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_de.txt
@@ -1,294 +1,294 @@
- | From svn.tartarus.org/snowball/trunk/website/algorithms/german/stop.txt

- | This file is distributed under the BSD License.

- | See http://snowball.tartarus.org/license.php

- | Also see http://www.opensource.org/licenses/bsd-license.html

- |  - Encoding was converted to UTF-8.

- |  - This notice was added.

- |

- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"

-

- | A German stop word list. Comments begin with vertical bar. Each stop

- | word is at the start of a line.

-

- | The number of forms in this list is reduced significantly by passing it

- | through the German stemmer.

-

-

-aber           |  but

-

-alle           |  all

-allem

-allen

-aller

-alles

-

-als            |  than, as

-also           |  so

-am             |  an + dem

-an             |  at

-

-ander          |  other

-andere

-anderem

-anderen

-anderer

-anderes

-anderm

-andern

-anderr

-anders

-

-auch           |  also

-auf            |  on

-aus            |  out of

-bei            |  by

-bin            |  am

-bis            |  until

-bist           |  art

-da             |  there

-damit          |  with it

-dann           |  then

-

-der            |  the

-den

-des

-dem

-die

-das

-

-daß            |  that

-

-derselbe       |  the same

-derselben

-denselben

-desselben

-demselben

-dieselbe

-dieselben

-dasselbe

-

-dazu           |  to that

-

-dein           |  thy

-deine

-deinem

-deinen

-deiner

-deines

-

-denn           |  because

-

-derer          |  of those

-dessen         |  of him

-

-dich           |  thee

-dir            |  to thee

-du             |  thou

-

-dies           |  this

-diese

-diesem

-diesen

-dieser

-dieses

-

-

-doch           |  (several meanings)

-dort           |  (over) there

-

-

-durch          |  through

-

-ein            |  a

-eine

-einem

-einen

-einer

-eines

-

-einig          |  some

-einige

-einigem

-einigen

-einiger

-einiges

-

-einmal         |  once

-

-er             |  he

-ihn            |  him

-ihm            |  to him

-

-es             |  it

-etwas          |  something

-

-euer           |  your

-eure

-eurem

-euren

-eurer

-eures

-

-für            |  for

-gegen          |  towards

-gewesen        |  p.p. of sein

-hab            |  have

-habe           |  have

-haben          |  have

-hat            |  has

-hatte          |  had

-hatten         |  had

-hier           |  here

-hin            |  there

-hinter         |  behind

-

-ich            |  I

-mich           |  me

-mir            |  to me

-

-

-ihr            |  you, to her

-ihre

-ihrem

-ihren

-ihrer

-ihres

-euch           |  to you

-

-im             |  in + dem

-in             |  in

-indem          |  while

-ins            |  in + das

-ist            |  is

-

-jede           |  each, every

-jedem

-jeden

-jeder

-jedes

-

-jene           |  that

-jenem

-jenen

-jener

-jenes

-

-jetzt          |  now

-kann           |  can

-

-kein           |  no

-keine

-keinem

-keinen

-keiner

-keines

-

-können         |  can

-könnte         |  could

-machen         |  do

-man            |  one

-

-manche         |  some, many a

-manchem

-manchen

-mancher

-manches

-

-mein           |  my

-meine

-meinem

-meinen

-meiner

-meines

-

-mit            |  with

-muss           |  must

-musste         |  had to

-nach           |  to(wards)

-nicht          |  not

-nichts         |  nothing

-noch           |  still, yet

-nun            |  now

-nur            |  only

-ob             |  whether

-oder           |  or

-ohne           |  without

-sehr           |  very

-

-sein           |  his

-seine

-seinem

-seinen

-seiner

-seines

-

-selbst         |  self

-sich           |  herself

-

-sie            |  they, she

-ihnen          |  to them

-

-sind           |  are

-so             |  so

-

-solche         |  such

-solchem

-solchen

-solcher

-solches

-

-soll           |  shall

-sollte         |  should

-sondern        |  but

-sonst          |  else

-über           |  over

-um             |  about, around

-und            |  and

-

-uns            |  us

-unse

-unsem

-unsen

-unser

-unses

-

-unter          |  under

-viel           |  much

-vom            |  von + dem

-von            |  from

-vor            |  before

-während        |  while

-war            |  was

-waren          |  were

-warst          |  wast

-was            |  what

-weg            |  away, off

-weil           |  because

-weiter         |  further

-

-welche         |  which

-welchem

-welchen

-welcher

-welches

-

-wenn           |  when

-werde          |  will

-werden         |  will

-wie            |  how

-wieder         |  again

-will           |  want

-wir            |  we

-wird           |  will

-wirst          |  willst

-wo             |  where

-wollen         |  want

-wollte         |  wanted

-würde          |  would

-würden         |  would

-zu             |  to

-zum            |  zu + dem

-zur            |  zu + der

-zwar           |  indeed

-zwischen       |  between

-

+ | From svn.tartarus.org/snowball/trunk/website/algorithms/german/stop.txt
+ | This file is distributed under the BSD License.
+ | See http://snowball.tartarus.org/license.php
+ | Also see http://www.opensource.org/licenses/bsd-license.html
+ |  - Encoding was converted to UTF-8.
+ |  - This notice was added.
+ |
+ | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
+
+ | A German stop word list. Comments begin with vertical bar. Each stop
+ | word is at the start of a line.
+
+ | The number of forms in this list is reduced significantly by passing it
+ | through the German stemmer.
+
+
+aber           |  but
+
+alle           |  all
+allem
+allen
+aller
+alles
+
+als            |  than, as
+also           |  so
+am             |  an + dem
+an             |  at
+
+ander          |  other
+andere
+anderem
+anderen
+anderer
+anderes
+anderm
+andern
+anderr
+anders
+
+auch           |  also
+auf            |  on
+aus            |  out of
+bei            |  by
+bin            |  am
+bis            |  until
+bist           |  art
+da             |  there
+damit          |  with it
+dann           |  then
+
+der            |  the
+den
+des
+dem
+die
+das
+
+daß            |  that
+
+derselbe       |  the same
+derselben
+denselben
+desselben
+demselben
+dieselbe
+dieselben
+dasselbe
+
+dazu           |  to that
+
+dein           |  thy
+deine
+deinem
+deinen
+deiner
+deines
+
+denn           |  because
+
+derer          |  of those
+dessen         |  of him
+
+dich           |  thee
+dir            |  to thee
+du             |  thou
+
+dies           |  this
+diese
+diesem
+diesen
+dieser
+dieses
+
+
+doch           |  (several meanings)
+dort           |  (over) there
+
+
+durch          |  through
+
+ein            |  a
+eine
+einem
+einen
+einer
+eines
+
+einig          |  some
+einige
+einigem
+einigen
+einiger
+einiges
+
+einmal         |  once
+
+er             |  he
+ihn            |  him
+ihm            |  to him
+
+es             |  it
+etwas          |  something
+
+euer           |  your
+eure
+eurem
+euren
+eurer
+eures
+
+für            |  for
+gegen          |  towards
+gewesen        |  p.p. of sein
+hab            |  have
+habe           |  have
+haben          |  have
+hat            |  has
+hatte          |  had
+hatten         |  had
+hier           |  here
+hin            |  there
+hinter         |  behind
+
+ich            |  I
+mich           |  me
+mir            |  to me
+
+
+ihr            |  you, to her
+ihre
+ihrem
+ihren
+ihrer
+ihres
+euch           |  to you
+
+im             |  in + dem
+in             |  in
+indem          |  while
+ins            |  in + das
+ist            |  is
+
+jede           |  each, every
+jedem
+jeden
+jeder
+jedes
+
+jene           |  that
+jenem
+jenen
+jener
+jenes
+
+jetzt          |  now
+kann           |  can
+
+kein           |  no
+keine
+keinem
+keinen
+keiner
+keines
+
+können         |  can
+könnte         |  could
+machen         |  do
+man            |  one
+
+manche         |  some, many a
+manchem
+manchen
+mancher
+manches
+
+mein           |  my
+meine
+meinem
+meinen
+meiner
+meines
+
+mit            |  with
+muss           |  must
+musste         |  had to
+nach           |  to(wards)
+nicht          |  not
+nichts         |  nothing
+noch           |  still, yet
+nun            |  now
+nur            |  only
+ob             |  whether
+oder           |  or
+ohne           |  without
+sehr           |  very
+
+sein           |  his
+seine
+seinem
+seinen
+seiner
+seines
+
+selbst         |  self
+sich           |  herself
+
+sie            |  they, she
+ihnen          |  to them
+
+sind           |  are
+so             |  so
+
+solche         |  such
+solchem
+solchen
+solcher
+solches
+
+soll           |  shall
+sollte         |  should
+sondern        |  but
+sonst          |  else
+über           |  over
+um             |  about, around
+und            |  and
+
+uns            |  us
+unse
+unsem
+unsen
+unser
+unses
+
+unter          |  under
+viel           |  much
+vom            |  von + dem
+von            |  from
+vor            |  before
+während        |  while
+war            |  was
+waren          |  were
+warst          |  wast
+was            |  what
+weg            |  away, off
+weil           |  because
+weiter         |  further
+
+welche         |  which
+welchem
+welchen
+welcher
+welches
+
+wenn           |  when
+werde          |  will
+werden         |  will
+wie            |  how
+wieder         |  again
+will           |  want
+wir            |  we
+wird           |  will
+wirst          |  willst
+wo             |  where
+wollen         |  want
+wollte         |  wanted
+würde          |  would
+würden         |  would
+zu             |  to
+zum            |  zu + dem
+zur            |  zu + der
+zwar           |  indeed
+zwischen       |  between
+
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_el.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_el.txt
index a5abfbe..232681f 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_el.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_el.txt
@@ -1,78 +1,78 @@
-# Lucene Greek Stopwords list

-# Note: by default this file is used after GreekLowerCaseFilter,

-# so when modifying this file use 'σ' instead of 'ς' 

-ο


-το

-οι

-τα

-του

-τησ

-των

-τον

-την

-και 

-κι


-ειμαι

-εισαι

-ειναι

-ειμαστε

-ειστε

-στο

-στον

-στη

-στην

-μα

-αλλα

-απο

-για

-προσ

-με

-σε

-ωσ

-παρα

-αντι

-κατα

-μετα

-θα

-να

-δε

-δεν

-μη

-μην

-επι

-ενω

-εαν

-αν

-τοτε

-που

-πωσ

-ποιοσ

-ποια

-ποιο

-ποιοι

-ποιεσ

-ποιων

-ποιουσ

-αυτοσ

-αυτη

-αυτο

-αυτοι

-αυτων

-αυτουσ

-αυτεσ

-αυτα

-εκεινοσ

-εκεινη

-εκεινο

-εκεινοι

-εκεινεσ

-εκεινα

-εκεινων

-εκεινουσ

-οπωσ

-ομωσ

-ισωσ

-οσο

-οτι

+# Lucene Greek Stopwords list
+# Note: by default this file is used after GreekLowerCaseFilter,
+# so when modifying this file use 'σ' instead of 'ς' 
+ο

+το
+οι
+τα
+του
+τησ
+των
+τον
+την
+και 
+κι

+ειμαι
+εισαι
+ειναι
+ειμαστε
+ειστε
+στο
+στον
+στη
+στην
+μα
+αλλα
+απο
+για
+προσ
+με
+σε
+ωσ
+παρα
+αντι
+κατα
+μετα
+θα
+να
+δε
+δεν
+μη
+μην
+επι
+ενω
+εαν
+αν
+τοτε
+που
+πωσ
+ποιοσ
+ποια
+ποιο
+ποιοι
+ποιεσ
+ποιων
+ποιουσ
+αυτοσ
+αυτη
+αυτο
+αυτοι
+αυτων
+αυτουσ
+αυτεσ
+αυτα
+εκεινοσ
+εκεινη
+εκεινο
+εκεινοι
+εκεινεσ
+εκεινα
+εκεινων
+εκεινουσ
+οπωσ
+ομωσ
+ισωσ
+οσο
+οτι
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_en.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_en.txt
index 224230c..2c164c0 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_en.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_en.txt
@@ -1,54 +1,54 @@
-# 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.

-

-# a couple of test stopwords to test that the words are really being

-# configured from this file:

-stopworda

-stopwordb

-

-# Standard english stop words taken from Lucene's StopAnalyzer

-a

-an

-and

-are

-as

-at

-be

-but

-by

-for

-if

-in

-into

-is

-it

-no

-not

-of

-on

-or

-such

-that

-the

-their

-then

-there

-these

-they

-this

-to

-was

-will

-with

+# 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.
+
+# a couple of test stopwords to test that the words are really being
+# configured from this file:
+stopworda
+stopwordb
+
+# Standard english stop words taken from Lucene's StopAnalyzer
+a
+an
+and
+are
+as
+at
+be
+but
+by
+for
+if
+in
+into
+is
+it
+no
+not
+of
+on
+or
+such
+that
+the
+their
+then
+there
+these
+they
+this
+to
+was
+will
+with
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_es.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_es.txt
index 99afd93..487d78c 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_es.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_es.txt
@@ -1,356 +1,356 @@
- | From svn.tartarus.org/snowball/trunk/website/algorithms/spanish/stop.txt

- | This file is distributed under the BSD License.

- | See http://snowball.tartarus.org/license.php

- | Also see http://www.opensource.org/licenses/bsd-license.html

- |  - Encoding was converted to UTF-8.

- |  - This notice was added.

- |

- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"

-

- | A Spanish stop word list. Comments begin with vertical bar. Each stop

- | word is at the start of a line.

-

-

- | The following is a ranked list (commonest to rarest) of stopwords

- | deriving from a large sample of text.

-

- | Extra words have been added at the end.

-

-de             |  from, of

-la             |  the, her

-que            |  who, that

-el             |  the

-en             |  in

-y              |  and

-a              |  to

-los            |  the, them

-del            |  de + el

-se             |  himself, from him etc

-las            |  the, them

-por            |  for, by, etc

-un             |  a

-para           |  for

-con            |  with

-no             |  no

-una            |  a

-su             |  his, her

-al             |  a + el

-  | es         from SER

-lo             |  him

-como           |  how

-más            |  more

-pero           |  pero

-sus            |  su plural

-le             |  to him, her

-ya             |  already

-o              |  or

-  | fue        from SER

-este           |  this

-  | ha         from HABER

-sí             |  himself etc

-porque         |  because

-esta           |  this

-  | son        from SER

-entre          |  between

-  | está     from ESTAR

-cuando         |  when

-muy            |  very

-sin            |  without

-sobre          |  on

-  | ser        from SER

-  | tiene      from TENER

-también        |  also

-me             |  me

-hasta          |  until

-hay            |  there is/are

-donde          |  where

-  | han        from HABER

-quien          |  whom, that

-  | están      from ESTAR

-  | estado     from ESTAR

-desde          |  from

-todo           |  all

-nos            |  us

-durante        |  during

-  | estados    from ESTAR

-todos          |  all

-uno            |  a

-les            |  to them

-ni             |  nor

-contra         |  against

-otros          |  other

-  | fueron     from SER

-ese            |  that

-eso            |  that

-  | había      from HABER

-ante           |  before

-ellos          |  they

-e              |  and (variant of y)

-esto           |  this

-mí             |  me

-antes          |  before

-algunos        |  some

-qué            |  what?

-unos           |  a

-yo             |  I

-otro           |  other

-otras          |  other

-otra           |  other

-él             |  he

-tanto          |  so much, many

-esa            |  that

-estos          |  these

-mucho          |  much, many

-quienes        |  who

-nada           |  nothing

-muchos         |  many

-cual           |  who

-  | sea        from SER

-poco           |  few

-ella           |  she

-estar          |  to be

-  | haber      from HABER

-estas          |  these

-  | estaba     from ESTAR

-  | estamos    from ESTAR

-algunas        |  some

-algo           |  something

-nosotros       |  we

-

-      | other forms

-

-mi             |  me

-mis            |  mi plural

-tú             |  thou

-te             |  thee

-ti             |  thee

-tu             |  thy

-tus            |  tu plural

-ellas          |  they

-nosotras       |  we

-vosotros       |  you

-vosotras       |  you

-os             |  you

-mío            |  mine

-mía            |

-míos           |

-mías           |

-tuyo           |  thine

-tuya           |

-tuyos          |

-tuyas          |

-suyo           |  his, hers, theirs

-suya           |

-suyos          |

-suyas          |

-nuestro        |  ours

-nuestra        |

-nuestros       |

-nuestras       |

-vuestro        |  yours

-vuestra        |

-vuestros       |

-vuestras       |

-esos           |  those

-esas           |  those

-

-               | forms of estar, to be (not including the infinitive):

-estoy

-estás

-está

-estamos

-estáis

-están

-esté

-estés

-estemos

-estéis

-estén

-estaré

-estarás

-estará

-estaremos

-estaréis

-estarán

-estaría

-estarías

-estaríamos

-estaríais

-estarían

-estaba

-estabas

-estábamos

-estabais

-estaban

-estuve

-estuviste

-estuvo

-estuvimos

-estuvisteis

-estuvieron

-estuviera

-estuvieras

-estuviéramos

-estuvierais

-estuvieran

-estuviese

-estuvieses

-estuviésemos

-estuvieseis

-estuviesen

-estando

-estado

-estada

-estados

-estadas

-estad

-

-               | forms of haber, to have (not including the infinitive):

-he

-has

-ha

-hemos

-habéis

-han

-haya

-hayas

-hayamos

-hayáis

-hayan

-habré

-habrás

-habrá

-habremos

-habréis

-habrán

-habría

-habrías

-habríamos

-habríais

-habrían

-había

-habías

-habíamos

-habíais

-habían

-hube

-hubiste

-hubo

-hubimos

-hubisteis

-hubieron

-hubiera

-hubieras

-hubiéramos

-hubierais

-hubieran

-hubiese

-hubieses

-hubiésemos

-hubieseis

-hubiesen

-habiendo

-habido

-habida

-habidos

-habidas

-

-               | forms of ser, to be (not including the infinitive):

-soy

-eres

-es

-somos

-sois

-son

-sea

-seas

-seamos

-seáis

-sean

-seré

-serás

-será

-seremos

-seréis

-serán

-sería

-serías

-seríamos

-seríais

-serían

-era

-eras

-éramos

-erais

-eran

-fui

-fuiste

-fue

-fuimos

-fuisteis

-fueron

-fuera

-fueras

-fuéramos

-fuerais

-fueran

-fuese

-fueses

-fuésemos

-fueseis

-fuesen

-siendo

-sido

-  |  sed also means 'thirst'

-

-               | forms of tener, to have (not including the infinitive):

-tengo

-tienes

-tiene

-tenemos

-tenéis

-tienen

-tenga

-tengas

-tengamos

-tengáis

-tengan

-tendré

-tendrás

-tendrá

-tendremos

-tendréis

-tendrán

-tendría

-tendrías

-tendríamos

-tendríais

-tendrían

-tenía

-tenías

-teníamos

-teníais

-tenían

-tuve

-tuviste

-tuvo

-tuvimos

-tuvisteis

-tuvieron

-tuviera

-tuvieras

-tuviéramos

-tuvierais

-tuvieran

-tuviese

-tuvieses

-tuviésemos

-tuvieseis

-tuviesen

-teniendo

-tenido

-tenida

-tenidos

-tenidas

-tened

-

+ | From svn.tartarus.org/snowball/trunk/website/algorithms/spanish/stop.txt
+ | This file is distributed under the BSD License.
+ | See http://snowball.tartarus.org/license.php
+ | Also see http://www.opensource.org/licenses/bsd-license.html
+ |  - Encoding was converted to UTF-8.
+ |  - This notice was added.
+ |
+ | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
+
+ | A Spanish stop word list. Comments begin with vertical bar. Each stop
+ | word is at the start of a line.
+
+
+ | The following is a ranked list (commonest to rarest) of stopwords
+ | deriving from a large sample of text.
+
+ | Extra words have been added at the end.
+
+de             |  from, of
+la             |  the, her
+que            |  who, that
+el             |  the
+en             |  in
+y              |  and
+a              |  to
+los            |  the, them
+del            |  de + el
+se             |  himself, from him etc
+las            |  the, them
+por            |  for, by, etc
+un             |  a
+para           |  for
+con            |  with
+no             |  no
+una            |  a
+su             |  his, her
+al             |  a + el
+  | es         from SER
+lo             |  him
+como           |  how
+más            |  more
+pero           |  pero
+sus            |  su plural
+le             |  to him, her
+ya             |  already
+o              |  or
+  | fue        from SER
+este           |  this
+  | ha         from HABER
+sí             |  himself etc
+porque         |  because
+esta           |  this
+  | son        from SER
+entre          |  between
+  | está     from ESTAR
+cuando         |  when
+muy            |  very
+sin            |  without
+sobre          |  on
+  | ser        from SER
+  | tiene      from TENER
+también        |  also
+me             |  me
+hasta          |  until
+hay            |  there is/are
+donde          |  where
+  | han        from HABER
+quien          |  whom, that
+  | están      from ESTAR
+  | estado     from ESTAR
+desde          |  from
+todo           |  all
+nos            |  us
+durante        |  during
+  | estados    from ESTAR
+todos          |  all
+uno            |  a
+les            |  to them
+ni             |  nor
+contra         |  against
+otros          |  other
+  | fueron     from SER
+ese            |  that
+eso            |  that
+  | había      from HABER
+ante           |  before
+ellos          |  they
+e              |  and (variant of y)
+esto           |  this
+mí             |  me
+antes          |  before
+algunos        |  some
+qué            |  what?
+unos           |  a
+yo             |  I
+otro           |  other
+otras          |  other
+otra           |  other
+él             |  he
+tanto          |  so much, many
+esa            |  that
+estos          |  these
+mucho          |  much, many
+quienes        |  who
+nada           |  nothing
+muchos         |  many
+cual           |  who
+  | sea        from SER
+poco           |  few
+ella           |  she
+estar          |  to be
+  | haber      from HABER
+estas          |  these
+  | estaba     from ESTAR
+  | estamos    from ESTAR
+algunas        |  some
+algo           |  something
+nosotros       |  we
+
+      | other forms
+
+mi             |  me
+mis            |  mi plural
+tú             |  thou
+te             |  thee
+ti             |  thee
+tu             |  thy
+tus            |  tu plural
+ellas          |  they
+nosotras       |  we
+vosotros       |  you
+vosotras       |  you
+os             |  you
+mío            |  mine
+mía            |
+míos           |
+mías           |
+tuyo           |  thine
+tuya           |
+tuyos          |
+tuyas          |
+suyo           |  his, hers, theirs
+suya           |
+suyos          |
+suyas          |
+nuestro        |  ours
+nuestra        |
+nuestros       |
+nuestras       |
+vuestro        |  yours
+vuestra        |
+vuestros       |
+vuestras       |
+esos           |  those
+esas           |  those
+
+               | forms of estar, to be (not including the infinitive):
+estoy
+estás
+está
+estamos
+estáis
+están
+esté
+estés
+estemos
+estéis
+estén
+estaré
+estarás
+estará
+estaremos
+estaréis
+estarán
+estaría
+estarías
+estaríamos
+estaríais
+estarían
+estaba
+estabas
+estábamos
+estabais
+estaban
+estuve
+estuviste
+estuvo
+estuvimos
+estuvisteis
+estuvieron
+estuviera
+estuvieras
+estuviéramos
+estuvierais
+estuvieran
+estuviese
+estuvieses
+estuviésemos
+estuvieseis
+estuviesen
+estando
+estado
+estada
+estados
+estadas
+estad
+
+               | forms of haber, to have (not including the infinitive):
+he
+has
+ha
+hemos
+habéis
+han
+haya
+hayas
+hayamos
+hayáis
+hayan
+habré
+habrás
+habrá
+habremos
+habréis
+habrán
+habría
+habrías
+habríamos
+habríais
+habrían
+había
+habías
+habíamos
+habíais
+habían
+hube
+hubiste
+hubo
+hubimos
+hubisteis
+hubieron
+hubiera
+hubieras
+hubiéramos
+hubierais
+hubieran
+hubiese
+hubieses
+hubiésemos
+hubieseis
+hubiesen
+habiendo
+habido
+habida
+habidos
+habidas
+
+               | forms of ser, to be (not including the infinitive):
+soy
+eres
+es
+somos
+sois
+son
+sea
+seas
+seamos
+seáis
+sean
+seré
+serás
+será
+seremos
+seréis
+serán
+sería
+serías
+seríamos
+seríais
+serían
+era
+eras
+éramos
+erais
+eran
+fui
+fuiste
+fue
+fuimos
+fuisteis
+fueron
+fuera
+fueras
+fuéramos
+fuerais
+fueran
+fuese
+fueses
+fuésemos
+fueseis
+fuesen
+siendo
+sido
+  |  sed also means 'thirst'
+
+               | forms of tener, to have (not including the infinitive):
+tengo
+tienes
+tiene
+tenemos
+tenéis
+tienen
+tenga
+tengas
+tengamos
+tengáis
+tengan
+tendré
+tendrás
+tendrá
+tendremos
+tendréis
+tendrán
+tendría
+tendrías
+tendríamos
+tendríais
+tendrían
+tenía
+tenías
+teníamos
+teníais
+tenían
+tuve
+tuviste
+tuvo
+tuvimos
+tuvisteis
+tuvieron
+tuviera
+tuvieras
+tuviéramos
+tuvierais
+tuvieran
+tuviese
+tuvieses
+tuviésemos
+tuvieseis
+tuviesen
+teniendo
+tenido
+tenida
+tenidos
+tenidas
+tened
+
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_eu.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_eu.txt
index 7e4e4bb..25f1db9 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_eu.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_eu.txt
@@ -1,99 +1,99 @@
-# example set of basque stopwords

-al

-anitz

-arabera

-asko

-baina

-bat

-batean

-batek

-bati

-batzuei

-batzuek

-batzuetan

-batzuk

-bera

-beraiek

-berau

-berauek

-bere

-berori

-beroriek

-beste

-bezala

-da

-dago

-dira

-ditu

-du

-dute

-edo

-egin

-ere

-eta

-eurak

-ez

-gainera

-gu

-gutxi

-guzti

-haiei

-haiek

-haietan

-hainbeste

-hala

-han

-handik

-hango

-hara

-hari

-hark

-hartan

-hau

-hauei

-hauek

-hauetan

-hemen

-hemendik

-hemengo

-hi

-hona

-honek

-honela

-honetan

-honi

-hor

-hori

-horiei

-horiek

-horietan

-horko

-horra

-horrek

-horrela

-horretan

-horri

-hortik

-hura

-izan

-ni

-noiz

-nola

-non

-nondik

-nongo

-nor

-nora

-ze

-zein

-zen

-zenbait

-zenbat

-zer

-zergatik

-ziren

-zituen

-zu

-zuek

-zuen

-zuten

+# example set of basque stopwords
+al
+anitz
+arabera
+asko
+baina
+bat
+batean
+batek
+bati
+batzuei
+batzuek
+batzuetan
+batzuk
+bera
+beraiek
+berau
+berauek
+bere
+berori
+beroriek
+beste
+bezala
+da
+dago
+dira
+ditu
+du
+dute
+edo
+egin
+ere
+eta
+eurak
+ez
+gainera
+gu
+gutxi
+guzti
+haiei
+haiek
+haietan
+hainbeste
+hala
+han
+handik
+hango
+hara
+hari
+hark
+hartan
+hau
+hauei
+hauek
+hauetan
+hemen
+hemendik
+hemengo
+hi
+hona
+honek
+honela
+honetan
+honi
+hor
+hori
+horiei
+horiek
+horietan
+horko
+horra
+horrek
+horrela
+horretan
+horri
+hortik
+hura
+izan
+ni
+noiz
+nola
+non
+nondik
+nongo
+nor
+nora
+ze
+zein
+zen
+zenbait
+zenbat
+zer
+zergatik
+ziren
+zituen
+zu
+zuek
+zuen
+zuten
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_fa.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_fa.txt
index 76bb635..723641c 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_fa.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_fa.txt
@@ -1,313 +1,313 @@
-# This file was created by Jacques Savoy and is distributed under the BSD license.

-# See http://members.unine.ch/jacques.savoy/clef/index.html.

-# Also see http://www.opensource.org/licenses/bsd-license.html

-# Note: by default this file is used after normalization, so when adding entries

-# to this file, use the arabic 'ي' instead of 'ی'

-انان

-نداشته

-سراسر

-خياه

-ايشان

-وي

-تاكنون

-بيشتري

-دوم

-پس

-ناشي

-وگو

-يا

-داشتند

-سپس

-هنگام

-هرگز

-پنج

-نشان

-امسال

-ديگر

-گروهي

-شدند

-چطور

-ده


-دو

-نخستين

-ولي

-چرا

-چه

-وسط


-كدام

-قابل

-يك

-رفت

-هفت

-همچنين

-در

-هزار

-بله

-بلي

-شايد

-اما

-شناسي

-گرفته

-دهد

-داشته

-دانست

-داشتن

-خواهيم

-ميليارد

-وقتيكه

-امد

-خواهد

-جز

-اورده

-شده

-بلكه

-خدمات

-شدن

-برخي

-نبود

-بسياري

-جلوگيري

-حق

-كردند

-نوعي

-بعري

-نكرده

-نظير

-نبايد

-بوده

-بودن

-داد

-اورد

-هست

-جايي

-شود

-دنبال

-داده

-بايد

-سابق

-هيچ

-همان

-انجا

-كمتر

-كجاست

-گردد

-كسي

-تر

-مردم

-تان

-دادن

-بودند

-سري

-جدا

-ندارند

-مگر

-يكديگر

-دارد

-دهند

-بنابراين

-هنگامي

-سمت

-جا

-انچه

-خود

-دادند

-زياد

-دارند

-اثر

-بدون

-بهترين

-بيشتر

-البته

-به

-براساس

-بيرون

-كرد

-بعضي

-گرفت

-توي

-اي

-ميليون

-او

-جريان

-تول

-بر

-مانند

-برابر

-باشيم

-مدتي

-گويند

-اكنون

-تا

-تنها

-جديد

-چند

-بي

-نشده

-كردن

-كردم

-گويد

-كرده

-كنيم

-نمي

-نزد

-روي

-قصد

-فقط

-بالاي

-ديگران

-اين

-ديروز

-توسط

-سوم

-ايم

-دانند

-سوي

-استفاده

-شما

-كنار

-داريم

-ساخته

-طور

-امده

-رفته

-نخست

-بيست

-نزديك

-طي

-كنيد

-از

-انها

-تمامي

-داشت

-يكي

-طريق

-اش

-چيست

-روب

-نمايد

-گفت

-چندين

-چيزي

-تواند

-ام

-ايا

-با

-ان

-ايد

-ترين

-اينكه

-ديگري

-راه

-هايي

-بروز

-همچنان

-پاعين

-كس

-حدود

-مختلف

-مقابل

-چيز

-گيرد

-ندارد

-ضد

-همچون

-سازي

-شان

-مورد

-باره

-مرسي

-خويش

-برخوردار

-چون

-خارج

-شش

-هنوز

-تحت

-ضمن

-هستيم

-گفته

-فكر

-بسيار

-پيش

-براي

-روزهاي

-انكه

-نخواهد

-بالا

-كل

-وقتي

-كي

-چنين

-كه

-گيري

-نيست

-است

-كجا

-كند

-نيز

-يابد

-بندي

-حتي

-توانند

-عقب

-خواست

-كنند

-بين

-تمام

-همه

-ما

-باشند

-مثل

-شد

-اري

-باشد

-اره

-طبق

-بعد

-اگر

-صورت

-غير

-جاي

-بيش

-ريزي

-اند

-زيرا

-چگونه

-بار

-لطفا

-مي

-درباره

-من

-ديده

-همين

-گذاري

-برداري

-علت

-گذاشته

-هم

-فوق

-نه

-ها

-شوند

-اباد

-همواره

-هر

-اول

-خواهند

-چهار

-نام

-امروز

-مان

-هاي

-قبل

-كنم

-سعي

-تازه

-را

-هستند

-زير

-جلوي

-عنوان

-بود

+# This file was created by Jacques Savoy and is distributed under the BSD license.
+# See http://members.unine.ch/jacques.savoy/clef/index.html.
+# Also see http://www.opensource.org/licenses/bsd-license.html
+# Note: by default this file is used after normalization, so when adding entries
+# to this file, use the arabic 'ي' instead of 'ی'
+انان
+نداشته
+سراسر
+خياه
+ايشان
+وي
+تاكنون
+بيشتري
+دوم
+پس
+ناشي
+وگو
+يا
+داشتند
+سپس
+هنگام
+هرگز
+پنج
+نشان
+امسال
+ديگر
+گروهي
+شدند
+چطور
+ده

+دو
+نخستين
+ولي
+چرا
+چه
+وسط

+كدام
+قابل
+يك
+رفت
+هفت
+همچنين
+در
+هزار
+بله
+بلي
+شايد
+اما
+شناسي
+گرفته
+دهد
+داشته
+دانست
+داشتن
+خواهيم
+ميليارد
+وقتيكه
+امد
+خواهد
+جز
+اورده
+شده
+بلكه
+خدمات
+شدن
+برخي
+نبود
+بسياري
+جلوگيري
+حق
+كردند
+نوعي
+بعري
+نكرده
+نظير
+نبايد
+بوده
+بودن
+داد
+اورد
+هست
+جايي
+شود
+دنبال
+داده
+بايد
+سابق
+هيچ
+همان
+انجا
+كمتر
+كجاست
+گردد
+كسي
+تر
+مردم
+تان
+دادن
+بودند
+سري
+جدا
+ندارند
+مگر
+يكديگر
+دارد
+دهند
+بنابراين
+هنگامي
+سمت
+جا
+انچه
+خود
+دادند
+زياد
+دارند
+اثر
+بدون
+بهترين
+بيشتر
+البته
+به
+براساس
+بيرون
+كرد
+بعضي
+گرفت
+توي
+اي
+ميليون
+او
+جريان
+تول
+بر
+مانند
+برابر
+باشيم
+مدتي
+گويند
+اكنون
+تا
+تنها
+جديد
+چند
+بي
+نشده
+كردن
+كردم
+گويد
+كرده
+كنيم
+نمي
+نزد
+روي
+قصد
+فقط
+بالاي
+ديگران
+اين
+ديروز
+توسط
+سوم
+ايم
+دانند
+سوي
+استفاده
+شما
+كنار
+داريم
+ساخته
+طور
+امده
+رفته
+نخست
+بيست
+نزديك
+طي
+كنيد
+از
+انها
+تمامي
+داشت
+يكي
+طريق
+اش
+چيست
+روب
+نمايد
+گفت
+چندين
+چيزي
+تواند
+ام
+ايا
+با
+ان
+ايد
+ترين
+اينكه
+ديگري
+راه
+هايي
+بروز
+همچنان
+پاعين
+كس
+حدود
+مختلف
+مقابل
+چيز
+گيرد
+ندارد
+ضد
+همچون
+سازي
+شان
+مورد
+باره
+مرسي
+خويش
+برخوردار
+چون
+خارج
+شش
+هنوز
+تحت
+ضمن
+هستيم
+گفته
+فكر
+بسيار
+پيش
+براي
+روزهاي
+انكه
+نخواهد
+بالا
+كل
+وقتي
+كي
+چنين
+كه
+گيري
+نيست
+است
+كجا
+كند
+نيز
+يابد
+بندي
+حتي
+توانند
+عقب
+خواست
+كنند
+بين
+تمام
+همه
+ما
+باشند
+مثل
+شد
+اري
+باشد
+اره
+طبق
+بعد
+اگر
+صورت
+غير
+جاي
+بيش
+ريزي
+اند
+زيرا
+چگونه
+بار
+لطفا
+مي
+درباره
+من
+ديده
+همين
+گذاري
+برداري
+علت
+گذاشته
+هم
+فوق
+نه
+ها
+شوند
+اباد
+همواره
+هر
+اول
+خواهند
+چهار
+نام
+امروز
+مان
+هاي
+قبل
+كنم
+سعي
+تازه
+را
+هستند
+زير
+جلوي
+عنوان
+بود
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_fi.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_fi.txt
index 4d70da3..4372c9a 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_fi.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_fi.txt
@@ -1,97 +1,97 @@
- | From svn.tartarus.org/snowball/trunk/website/algorithms/finnish/stop.txt

- | This file is distributed under the BSD License.

- | See http://snowball.tartarus.org/license.php

- | Also see http://www.opensource.org/licenses/bsd-license.html

- |  - Encoding was converted to UTF-8.

- |  - This notice was added.

- |

- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"

- 

-| forms of BE

-

-olla

-olen

-olet

-on

-olemme

-olette

-ovat

-ole        | negative form

-

-oli

-olisi

-olisit

-olisin

-olisimme

-olisitte

-olisivat

-olit

-olin

-olimme

-olitte

-olivat

-ollut

-olleet

-

-en         | negation

-et

-ei

-emme

-ette

-eivät

-

-|Nom   Gen    Acc    Part   Iness   Elat    Illat  Adess   Ablat   Allat   Ess    Trans

-minä   minun  minut  minua  minussa minusta minuun minulla minulta minulle               | I

-sinä   sinun  sinut  sinua  sinussa sinusta sinuun sinulla sinulta sinulle               | you

-hän    hänen  hänet  häntä  hänessä hänestä häneen hänellä häneltä hänelle               | he she

-me     meidän meidät meitä  meissä  meistä  meihin meillä  meiltä  meille                | we

-te     teidän teidät teitä  teissä  teistä  teihin teillä  teiltä  teille                | you

-he     heidän heidät heitä  heissä  heistä  heihin heillä  heiltä  heille                | they

-

-tämä   tämän         tätä   tässä   tästä   tähän  tallä   tältä   tälle   tänä   täksi  | this

-tuo    tuon          tuotä  tuossa  tuosta  tuohon tuolla  tuolta  tuolle  tuona  tuoksi | that

-se     sen           sitä   siinä   siitä   siihen sillä   siltä   sille   sinä   siksi  | it

-nämä   näiden        näitä  näissä  näistä  näihin näillä  näiltä  näille  näinä  näiksi | these

-nuo    noiden        noita  noissa  noista  noihin noilla  noilta  noille  noina  noiksi | those

-ne     niiden        niitä  niissä  niistä  niihin niillä  niiltä  niille  niinä  niiksi | they

-

-kuka   kenen kenet   ketä   kenessä kenestä keneen kenellä keneltä kenelle kenenä keneksi| who

-ketkä  keiden ketkä  keitä  keissä  keistä  keihin keillä  keiltä  keille  keinä  keiksi | (pl)

-mikä   minkä minkä   mitä   missä   mistä   mihin  millä   miltä   mille   minä   miksi  | which what

-mitkä                                                                                    | (pl)

-

-joka   jonka         jota   jossa   josta   johon  jolla   jolta   jolle   jona   joksi  | who which

-jotka  joiden        joita  joissa  joista  joihin joilla  joilta  joille  joina  joiksi | (pl)

-

-| conjunctions

-

-että   | that

-ja     | and

-jos    | if

-koska  | because

-kuin   | than

-mutta  | but

-niin   | so

-sekä   | and

-sillä  | for

-tai    | or

-vaan   | but

-vai    | or

-vaikka | although

-

-

-| prepositions

-

-kanssa  | with

-mukaan  | according to

-noin    | about

-poikki  | across

-yli     | over, across

-

-| other

-

-kun    | when

-niin   | so

-nyt    | now

-itse   | self

-

+ | From svn.tartarus.org/snowball/trunk/website/algorithms/finnish/stop.txt
+ | This file is distributed under the BSD License.
+ | See http://snowball.tartarus.org/license.php
+ | Also see http://www.opensource.org/licenses/bsd-license.html
+ |  - Encoding was converted to UTF-8.
+ |  - This notice was added.
+ |
+ | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
+ 
+| forms of BE
+
+olla
+olen
+olet
+on
+olemme
+olette
+ovat
+ole        | negative form
+
+oli
+olisi
+olisit
+olisin
+olisimme
+olisitte
+olisivat
+olit
+olin
+olimme
+olitte
+olivat
+ollut
+olleet
+
+en         | negation
+et
+ei
+emme
+ette
+eivät
+
+|Nom   Gen    Acc    Part   Iness   Elat    Illat  Adess   Ablat   Allat   Ess    Trans
+minä   minun  minut  minua  minussa minusta minuun minulla minulta minulle               | I
+sinä   sinun  sinut  sinua  sinussa sinusta sinuun sinulla sinulta sinulle               | you
+hän    hänen  hänet  häntä  hänessä hänestä häneen hänellä häneltä hänelle               | he she
+me     meidän meidät meitä  meissä  meistä  meihin meillä  meiltä  meille                | we
+te     teidän teidät teitä  teissä  teistä  teihin teillä  teiltä  teille                | you
+he     heidän heidät heitä  heissä  heistä  heihin heillä  heiltä  heille                | they
+
+tämä   tämän         tätä   tässä   tästä   tähän  tallä   tältä   tälle   tänä   täksi  | this
+tuo    tuon          tuotä  tuossa  tuosta  tuohon tuolla  tuolta  tuolle  tuona  tuoksi | that
+se     sen           sitä   siinä   siitä   siihen sillä   siltä   sille   sinä   siksi  | it
+nämä   näiden        näitä  näissä  näistä  näihin näillä  näiltä  näille  näinä  näiksi | these
+nuo    noiden        noita  noissa  noista  noihin noilla  noilta  noille  noina  noiksi | those
+ne     niiden        niitä  niissä  niistä  niihin niillä  niiltä  niille  niinä  niiksi | they
+
+kuka   kenen kenet   ketä   kenessä kenestä keneen kenellä keneltä kenelle kenenä keneksi| who
+ketkä  keiden ketkä  keitä  keissä  keistä  keihin keillä  keiltä  keille  keinä  keiksi | (pl)
+mikä   minkä minkä   mitä   missä   mistä   mihin  millä   miltä   mille   minä   miksi  | which what
+mitkä                                                                                    | (pl)
+
+joka   jonka         jota   jossa   josta   johon  jolla   jolta   jolle   jona   joksi  | who which
+jotka  joiden        joita  joissa  joista  joihin joilla  joilta  joille  joina  joiksi | (pl)
+
+| conjunctions
+
+että   | that
+ja     | and
+jos    | if
+koska  | because
+kuin   | than
+mutta  | but
+niin   | so
+sekä   | and
+sillä  | for
+tai    | or
+vaan   | but
+vai    | or
+vaikka | although
+
+
+| prepositions
+
+kanssa  | with
+mukaan  | according to
+noin    | about
+poikki  | across
+yli     | over, across
+
+| other
+
+kun    | when
+niin   | so
+nyt    | now
+itse   | self
+
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_fr.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_fr.txt
index fec3395..749abae 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_fr.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_fr.txt
@@ -1,186 +1,186 @@
- | From svn.tartarus.org/snowball/trunk/website/algorithms/french/stop.txt

- | This file is distributed under the BSD License.

- | See http://snowball.tartarus.org/license.php

- | Also see http://www.opensource.org/licenses/bsd-license.html

- |  - Encoding was converted to UTF-8.

- |  - This notice was added.

- |

- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"

-

- | A French stop word list. Comments begin with vertical bar. Each stop

- | word is at the start of a line.

-

-au             |  a + le

-aux            |  a + les

-avec           |  with

-ce             |  this

-ces            |  these

-dans           |  with

-de             |  of

-des            |  de + les

-du             |  de + le

-elle           |  she

-en             |  `of them' etc

-et             |  and

-eux            |  them

-il             |  he

-je             |  I

-la             |  the

-le             |  the

-leur           |  their

-lui            |  him

-ma             |  my (fem)

-mais           |  but

-me             |  me

-même           |  same; as in moi-même (myself) etc

-mes            |  me (pl)

-moi            |  me

-mon            |  my (masc)

-ne             |  not

-nos            |  our (pl)

-notre          |  our

-nous           |  we

-on             |  one

-ou             |  where

-par            |  by

-pas            |  not

-pour           |  for

-qu             |  que before vowel

-que            |  that

-qui            |  who

-sa             |  his, her (fem)

-se             |  oneself

-ses            |  his (pl)

-son            |  his, her (masc)

-sur            |  on

-ta             |  thy (fem)

-te             |  thee

-tes            |  thy (pl)

-toi            |  thee

-ton            |  thy (masc)

-tu             |  thou

-un             |  a

-une            |  a

-vos            |  your (pl)

-votre          |  your

-vous           |  you

-

-               |  single letter forms

-

-c              |  c'

-d              |  d'

-j              |  j'

-l              |  l'

-à              |  to, at

-m              |  m'

-n              |  n'

-s              |  s'

-t              |  t'

-y              |  there

-

-               | forms of être (not including the infinitive):

-été

-étée

-étées

-étés

-étant

-suis

-es

-est

-sommes

-êtes

-sont

-serai

-seras

-sera

-serons

-serez

-seront

-serais

-serait

-serions

-seriez

-seraient

-étais

-était

-étions

-étiez

-étaient

-fus

-fut

-fûmes

-fûtes

-furent

-sois

-soit

-soyons

-soyez

-soient

-fusse

-fusses

-fût

-fussions

-fussiez

-fussent

-

-               | forms of avoir (not including the infinitive):

-ayant

-eu

-eue

-eues

-eus

-ai

-as

-avons

-avez

-ont

-aurai

-auras

-aura

-aurons

-aurez

-auront

-aurais

-aurait

-aurions

-auriez

-auraient

-avais

-avait

-avions

-aviez

-avaient

-eut

-eûmes

-eûtes

-eurent

-aie

-aies

-ait

-ayons

-ayez

-aient

-eusse

-eusses

-eût

-eussions

-eussiez

-eussent

-

-               | Later additions (from Jean-Christophe Deschamps)

-ceci           |  this

-cela           |  that

-celà           |  that

-cet            |  this

-cette          |  this

-ici            |  here

-ils            |  they

-les            |  the (pl)

-leurs          |  their (pl)

-quel           |  which

-quels          |  which

-quelle         |  which

-quelles        |  which

-sans           |  without

-soi            |  oneself

-

+ | From svn.tartarus.org/snowball/trunk/website/algorithms/french/stop.txt
+ | This file is distributed under the BSD License.
+ | See http://snowball.tartarus.org/license.php
+ | Also see http://www.opensource.org/licenses/bsd-license.html
+ |  - Encoding was converted to UTF-8.
+ |  - This notice was added.
+ |
+ | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
+
+ | A French stop word list. Comments begin with vertical bar. Each stop
+ | word is at the start of a line.
+
+au             |  a + le
+aux            |  a + les
+avec           |  with
+ce             |  this
+ces            |  these
+dans           |  with
+de             |  of
+des            |  de + les
+du             |  de + le
+elle           |  she
+en             |  `of them' etc
+et             |  and
+eux            |  them
+il             |  he
+je             |  I
+la             |  the
+le             |  the
+leur           |  their
+lui            |  him
+ma             |  my (fem)
+mais           |  but
+me             |  me
+même           |  same; as in moi-même (myself) etc
+mes            |  me (pl)
+moi            |  me
+mon            |  my (masc)
+ne             |  not
+nos            |  our (pl)
+notre          |  our
+nous           |  we
+on             |  one
+ou             |  where
+par            |  by
+pas            |  not
+pour           |  for
+qu             |  que before vowel
+que            |  that
+qui            |  who
+sa             |  his, her (fem)
+se             |  oneself
+ses            |  his (pl)
+son            |  his, her (masc)
+sur            |  on
+ta             |  thy (fem)
+te             |  thee
+tes            |  thy (pl)
+toi            |  thee
+ton            |  thy (masc)
+tu             |  thou
+un             |  a
+une            |  a
+vos            |  your (pl)
+votre          |  your
+vous           |  you
+
+               |  single letter forms
+
+c              |  c'
+d              |  d'
+j              |  j'
+l              |  l'
+à              |  to, at
+m              |  m'
+n              |  n'
+s              |  s'
+t              |  t'
+y              |  there
+
+               | forms of être (not including the infinitive):
+été
+étée
+étées
+étés
+étant
+suis
+es
+est
+sommes
+êtes
+sont
+serai
+seras
+sera
+serons
+serez
+seront
+serais
+serait
+serions
+seriez
+seraient
+étais
+était
+étions
+étiez
+étaient
+fus
+fut
+fûmes
+fûtes
+furent
+sois
+soit
+soyons
+soyez
+soient
+fusse
+fusses
+fût
+fussions
+fussiez
+fussent
+
+               | forms of avoir (not including the infinitive):
+ayant
+eu
+eue
+eues
+eus
+ai
+as
+avons
+avez
+ont
+aurai
+auras
+aura
+aurons
+aurez
+auront
+aurais
+aurait
+aurions
+auriez
+auraient
+avais
+avait
+avions
+aviez
+avaient
+eut
+eûmes
+eûtes
+eurent
+aie
+aies
+ait
+ayons
+ayez
+aient
+eusse
+eusses
+eût
+eussions
+eussiez
+eussent
+
+               | Later additions (from Jean-Christophe Deschamps)
+ceci           |  this
+cela           |  that
+celà           |  that
+cet            |  this
+cette          |  this
+ici            |  here
+ils            |  they
+les            |  the (pl)
+leurs          |  their (pl)
+quel           |  which
+quels          |  which
+quelle         |  which
+quelles        |  which
+sans           |  without
+soi            |  oneself
+
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_ga.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_ga.txt
index f03e10a..9ff88d7 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_ga.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_ga.txt
@@ -1,110 +1,110 @@
-

-a

-ach

-ag

-agus

-an

-aon

-ar

-arna

-as

-b'

-ba

-beirt

-bhúr

-caoga

-ceathair

-ceathrar

-chomh

-chtó

-chuig

-chun

-cois

-céad

-cúig

-cúigear

-d'

-daichead

-dar

-de

-deich

-deichniúr

-den

-dhá

-do

-don

-dtí

-dá

-dár

-dó

-faoi

-faoin

-faoina

-faoinár

-fara

-fiche

-gach

-gan

-go

-gur

-haon

-hocht

-i

-iad

-idir

-in

-ina

-ins

-inár

-is

-le

-leis

-lena

-lenár

-m'

-mar

-mo

-mé

-na

-nach

-naoi

-naonúr

-ná

-ní

-níor

-nó

-nócha

-ocht

-ochtar

-os

-roimh

-sa

-seacht

-seachtar

-seachtó

-seasca

-seisear

-siad

-sibh

-sinn

-sna

-sé

-sí

-tar

-thar

-thú

-triúr

-trí

-trína

-trínár

-tríocha

-tú

-um

-ár


-éis



-ón

-óna

-ónár

+
+a
+ach
+ag
+agus
+an
+aon
+ar
+arna
+as
+b'
+ba
+beirt
+bhúr
+caoga
+ceathair
+ceathrar
+chomh
+chtó
+chuig
+chun
+cois
+céad
+cúig
+cúigear
+d'
+daichead
+dar
+de
+deich
+deichniúr
+den
+dhá
+do
+don
+dtí
+dá
+dár
+dó
+faoi
+faoin
+faoina
+faoinár
+fara
+fiche
+gach
+gan
+go
+gur
+haon
+hocht
+i
+iad
+idir
+in
+ina
+ins
+inár
+is
+le
+leis
+lena
+lenár
+m'
+mar
+mo
+mé
+na
+nach
+naoi
+naonúr
+ná
+ní
+níor
+nó
+nócha
+ocht
+ochtar
+os
+roimh
+sa
+seacht
+seachtar
+seachtó
+seasca
+seisear
+siad
+sibh
+sinn
+sna
+sé
+sí
+tar
+thar
+thú
+triúr
+trí
+trína
+trínár
+tríocha
+tú
+um
+ár

+éis


+ón
+óna
+ónár
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_gl.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_gl.txt
index 57803b3..d8760b1 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_gl.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_gl.txt
@@ -1,161 +1,161 @@
-# galican stopwords

-a

-aínda

-alí

-aquel

-aquela

-aquelas

-aqueles

-aquilo

-aquí

-ao

-aos

-as

-así


-ben

-cando

-che

-co

-coa

-comigo

-con

-connosco

-contigo

-convosco

-coas

-cos

-cun

-cuns

-cunha

-cunhas

-da

-dalgunha

-dalgunhas

-dalgún

-dalgúns

-das

-de

-del

-dela

-delas

-deles

-desde

-deste

-do

-dos

-dun

-duns

-dunha

-dunhas

-e

-el

-ela

-elas

-eles

-en

-era

-eran

-esa

-esas

-ese

-eses

-esta

-estar

-estaba

-está

-están

-este

-estes

-estiven

-estou

-eu


-facer

-foi

-foron

-fun

-había

-hai

-iso

-isto

-la

-las

-lle

-lles

-lo

-los

-mais

-me

-meu

-meus

-min

-miña

-miñas

-moi

-na

-nas

-neste

-nin

-no

-non

-nos

-nosa

-nosas

-noso

-nosos

-nós

-nun

-nunha

-nuns

-nunhas

-o

-os

-ou


-ós

-para

-pero

-pode

-pois

-pola

-polas

-polo

-polos

-por

-que

-se

-senón

-ser

-seu

-seus

-sexa

-sido

-sobre

-súa

-súas

-tamén

-tan

-te

-ten

-teñen

-teño

-ter

-teu

-teus

-ti

-tido

-tiña

-tiven

-túa

-túas

-un

-unha

-unhas

-uns

-vos

-vosa

-vosas

-voso

-vosos

-vós

+# galican stopwords
+a
+aínda
+alí
+aquel
+aquela
+aquelas
+aqueles
+aquilo
+aquí
+ao
+aos
+as
+así

+ben
+cando
+che
+co
+coa
+comigo
+con
+connosco
+contigo
+convosco
+coas
+cos
+cun
+cuns
+cunha
+cunhas
+da
+dalgunha
+dalgunhas
+dalgún
+dalgúns
+das
+de
+del
+dela
+delas
+deles
+desde
+deste
+do
+dos
+dun
+duns
+dunha
+dunhas
+e
+el
+ela
+elas
+eles
+en
+era
+eran
+esa
+esas
+ese
+eses
+esta
+estar
+estaba
+está
+están
+este
+estes
+estiven
+estou
+eu

+facer
+foi
+foron
+fun
+había
+hai
+iso
+isto
+la
+las
+lle
+lles
+lo
+los
+mais
+me
+meu
+meus
+min
+miña
+miñas
+moi
+na
+nas
+neste
+nin
+no
+non
+nos
+nosa
+nosas
+noso
+nosos
+nós
+nun
+nunha
+nuns
+nunhas
+o
+os
+ou

+ós
+para
+pero
+pode
+pois
+pola
+polas
+polo
+polos
+por
+que
+se
+senón
+ser
+seu
+seus
+sexa
+sido
+sobre
+súa
+súas
+tamén
+tan
+te
+ten
+teñen
+teño
+ter
+teu
+teus
+ti
+tido
+tiña
+tiven
+túa
+túas
+un
+unha
+unhas
+uns
+vos
+vosa
+vosas
+voso
+vosos
+vós
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_hi.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_hi.txt
index 1f19fd1..86286bb 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_hi.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_hi.txt
@@ -1,235 +1,235 @@
-# Also see http://www.opensource.org/licenses/bsd-license.html

-# See http://members.unine.ch/jacques.savoy/clef/index.html.

-# This file was created by Jacques Savoy and is distributed under the BSD license.

-# Note: by default this file also contains forms normalized by HindiNormalizer 

-# for spelling variation (see section below), such that it can be used whether or 

-# not you enable that feature. When adding additional entries to this list,

-# please add the normalized form as well. 

-अंदर

-अत

-अपना

-अपनी

-अपने

-अभी

-आदि

-आप

-इत्यादि

-इन 

-इनका

-इन्हीं

-इन्हें

-इन्हों

-इस

-इसका

-इसकी

-इसके

-इसमें

-इसी

-इसे

-उन

-उनका

-उनकी

-उनके

-उनको

-उन्हीं

-उन्हें

-उन्हों

-उस

-उसके

-उसी

-उसे

-एक

-एवं

-एस

-ऐसे

-और

-कई

-कर

-करता

-करते

-करना

-करने

-करें

-कहते

-कहा

-का

-काफ़ी

-कि

-कितना

-किन्हें

-किन्हों

-किया

-किर

-किस

-किसी

-किसे

-की

-कुछ

-कुल

-के

-को

-कोई

-कौन

-कौनसा

-गया

-घर

-जब

-जहाँ

-जा

-जितना

-जिन

-जिन्हें

-जिन्हों

-जिस

-जिसे

-जीधर

-जैसा

-जैसे

-जो

-तक

-तब

-तरह

-तिन

-तिन्हें

-तिन्हों

-तिस

-तिसे

-तो

-था

-थी

-थे

-दबारा

-दिया

-दुसरा

-दूसरे

-दो

-द्वारा

-न

-नहीं

-ना

-निहायत

-नीचे

-ने

-पर

-पर  

-पहले

-पूरा

-पे

-फिर

-बनी

-बही

-बहुत

-बाद

-बाला

-बिलकुल

-भी

-भीतर

-मगर

-मानो

-मे

-में

-यदि

-यह

-यहाँ

-यही

-या

-यिह 

-ये

-रखें

-रहा

-रहे

-ऱ्वासा

-लिए

-लिये

-लेकिन

-व

-वर्ग

-वह

-वह 

-वहाँ

-वहीं

-वाले

-वुह 

-वे

-वग़ैरह

-संग

-सकता

-सकते

-सबसे

-सभी

-साथ

-साबुत

-साभ

-सारा

-से

-सो

-ही

-हुआ

-हुई

-हुए

-है

-हैं

-हो

-होता

-होती

-होते

-होना

-होने

-# additional normalized forms of the above

-अपनि

-जेसे

-होति

-सभि

-तिंहों

-इंहों

-दवारा

-इसि

-किंहें

-थि

-उंहों

-ओर

-जिंहें

-वहिं

-अभि

-बनि

-हि

-उंहिं

-उंहें

-हें

-वगेरह

-एसे

-रवासा

-कोन

-निचे

-काफि

-उसि

-पुरा

-भितर

-हे

-बहि

-वहां

-कोइ

-यहां

-जिंहों

-तिंहें

-किसि

-कइ

-यहि

-इंहिं

-जिधर

-इंहें

-अदि

-इतयादि

-हुइ

-कोनसा

-इसकि

-दुसरे

-जहां

-अप

-किंहों

-उनकि

-भि

-वरग

-हुअ

-जेसा

-नहिं

+# Also see http://www.opensource.org/licenses/bsd-license.html
+# See http://members.unine.ch/jacques.savoy/clef/index.html.
+# This file was created by Jacques Savoy and is distributed under the BSD license.
+# Note: by default this file also contains forms normalized by HindiNormalizer 
+# for spelling variation (see section below), such that it can be used whether or 
+# not you enable that feature. When adding additional entries to this list,
+# please add the normalized form as well. 
+अंदर
+अत
+अपना
+अपनी
+अपने
+अभी
+आदि
+आप
+इत्यादि
+इन 
+इनका
+इन्हीं
+इन्हें
+इन्हों
+इस
+इसका
+इसकी
+इसके
+इसमें
+इसी
+इसे
+उन
+उनका
+उनकी
+उनके
+उनको
+उन्हीं
+उन्हें
+उन्हों
+उस
+उसके
+उसी
+उसे
+एक
+एवं
+एस
+ऐसे
+और
+कई
+कर
+करता
+करते
+करना
+करने
+करें
+कहते
+कहा
+का
+काफ़ी
+कि
+कितना
+किन्हें
+किन्हों
+किया
+किर
+किस
+किसी
+किसे
+की
+कुछ
+कुल
+के
+को
+कोई
+कौन
+कौनसा
+गया
+घर
+जब
+जहाँ
+जा
+जितना
+जिन
+जिन्हें
+जिन्हों
+जिस
+जिसे
+जीधर
+जैसा
+जैसे
+जो
+तक
+तब
+तरह
+तिन
+तिन्हें
+तिन्हों
+तिस
+तिसे
+तो
+था
+थी
+थे
+दबारा
+दिया
+दुसरा
+दूसरे
+दो
+द्वारा
+न
+नहीं
+ना
+निहायत
+नीचे
+ने
+पर
+पर  
+पहले
+पूरा
+पे
+फिर
+बनी
+बही
+बहुत
+बाद
+बाला
+बिलकुल
+भी
+भीतर
+मगर
+मानो
+मे
+में
+यदि
+यह
+यहाँ
+यही
+या
+यिह 
+ये
+रखें
+रहा
+रहे
+ऱ्वासा
+लिए
+लिये
+लेकिन
+व
+वर्ग
+वह
+वह 
+वहाँ
+वहीं
+वाले
+वुह 
+वे
+वग़ैरह
+संग
+सकता
+सकते
+सबसे
+सभी
+साथ
+साबुत
+साभ
+सारा
+से
+सो
+ही
+हुआ
+हुई
+हुए
+है
+हैं
+हो
+होता
+होती
+होते
+होना
+होने
+# additional normalized forms of the above
+अपनि
+जेसे
+होति
+सभि
+तिंहों
+इंहों
+दवारा
+इसि
+किंहें
+थि
+उंहों
+ओर
+जिंहें
+वहिं
+अभि
+बनि
+हि
+उंहिं
+उंहें
+हें
+वगेरह
+एसे
+रवासा
+कोन
+निचे
+काफि
+उसि
+पुरा
+भितर
+हे
+बहि
+वहां
+कोइ
+यहां
+जिंहों
+तिंहें
+किसि
+कइ
+यहि
+इंहिं
+जिधर
+इंहें
+अदि
+इतयादि
+हुइ
+कोनसा
+इसकि
+दुसरे
+जहां
+अप
+किंहों
+उनकि
+भि
+वरग
+हुअ
+जेसा
+नहिं
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_hu.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_hu.txt
index f5bf755..37526da 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_hu.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_hu.txt
@@ -1,211 +1,211 @@
- | From svn.tartarus.org/snowball/trunk/website/algorithms/hungarian/stop.txt

- | This file is distributed under the BSD License.

- | See http://snowball.tartarus.org/license.php

- | Also see http://www.opensource.org/licenses/bsd-license.html

- |  - Encoding was converted to UTF-8.

- |  - This notice was added.

- |

- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"

- 

-| Hungarian stop word list

-| prepared by Anna Tordai

-

-a

-ahogy

-ahol

-aki

-akik

-akkor

-alatt

-által

-általában

-amely

-amelyek

-amelyekben

-amelyeket

-amelyet

-amelynek

-ami

-amit

-amolyan

-amíg

-amikor

-át

-abban

-ahhoz

-annak

-arra

-arról

-az

-azok

-azon

-azt

-azzal

-azért

-aztán

-azután

-azonban

-bár

-be

-belül

-benne

-cikk

-cikkek

-cikkeket

-csak

-de

-e

-eddig

-egész

-egy

-egyes

-egyetlen

-egyéb

-egyik

-egyre

-ekkor

-el

-elég

-ellen

-elő

-először

-előtt

-első

-én

-éppen

-ebben

-ehhez

-emilyen

-ennek

-erre

-ez

-ezt

-ezek

-ezen

-ezzel

-ezért

-és

-fel

-felé

-hanem

-hiszen

-hogy

-hogyan

-igen

-így

-illetve

-ill.

-ill

-ilyen

-ilyenkor

-ison

-ismét

-itt

-jó

-jól

-jobban

-kell

-kellett

-keresztül

-keressünk

-ki

-kívül

-között

-közül

-legalább

-lehet

-lehetett

-legyen

-lenne

-lenni

-lesz

-lett

-maga

-magát

-majd

-majd

-már

-más

-másik

-meg

-még

-mellett

-mert

-mely

-melyek

-mi

-mit

-míg

-miért

-milyen

-mikor

-minden

-mindent

-mindenki

-mindig

-mint

-mintha

-mivel

-most

-nagy

-nagyobb

-nagyon

-ne

-néha

-nekem

-neki

-nem

-néhány

-nélkül

-nincs

-olyan

-ott

-össze


-ők

-őket

-pedig

-persze

-rá

-s

-saját

-sem

-semmi

-sok

-sokat

-sokkal

-számára

-szemben

-szerint

-szinte

-talán

-tehát

-teljes

-tovább

-továbbá

-több

-úgy

-ugyanis

-új

-újabb

-újra

-után

-utána

-utolsó

-vagy

-vagyis

-valaki

-valami

-valamint

-való

-vagyok

-van

-vannak

-volt

-voltam

-voltak

-voltunk

-vissza

-vele

-viszont

-volna

+ | From svn.tartarus.org/snowball/trunk/website/algorithms/hungarian/stop.txt
+ | This file is distributed under the BSD License.
+ | See http://snowball.tartarus.org/license.php
+ | Also see http://www.opensource.org/licenses/bsd-license.html
+ |  - Encoding was converted to UTF-8.
+ |  - This notice was added.
+ |
+ | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
+ 
+| Hungarian stop word list
+| prepared by Anna Tordai
+
+a
+ahogy
+ahol
+aki
+akik
+akkor
+alatt
+által
+általában
+amely
+amelyek
+amelyekben
+amelyeket
+amelyet
+amelynek
+ami
+amit
+amolyan
+amíg
+amikor
+át
+abban
+ahhoz
+annak
+arra
+arról
+az
+azok
+azon
+azt
+azzal
+azért
+aztán
+azután
+azonban
+bár
+be
+belül
+benne
+cikk
+cikkek
+cikkeket
+csak
+de
+e
+eddig
+egész
+egy
+egyes
+egyetlen
+egyéb
+egyik
+egyre
+ekkor
+el
+elég
+ellen
+elő
+először
+előtt
+első
+én
+éppen
+ebben
+ehhez
+emilyen
+ennek
+erre
+ez
+ezt
+ezek
+ezen
+ezzel
+ezért
+és
+fel
+felé
+hanem
+hiszen
+hogy
+hogyan
+igen
+így
+illetve
+ill.
+ill
+ilyen
+ilyenkor
+ison
+ismét
+itt
+jó
+jól
+jobban
+kell
+kellett
+keresztül
+keressünk
+ki
+kívül
+között
+közül
+legalább
+lehet
+lehetett
+legyen
+lenne
+lenni
+lesz
+lett
+maga
+magát
+majd
+majd
+már
+más
+másik
+meg
+még
+mellett
+mert
+mely
+melyek
+mi
+mit
+míg
+miért
+milyen
+mikor
+minden
+mindent
+mindenki
+mindig
+mint
+mintha
+mivel
+most
+nagy
+nagyobb
+nagyon
+ne
+néha
+nekem
+neki
+nem
+néhány
+nélkül
+nincs
+olyan
+ott
+össze

+ők
+őket
+pedig
+persze
+rá
+s
+saját
+sem
+semmi
+sok
+sokat
+sokkal
+számára
+szemben
+szerint
+szinte
+talán
+tehát
+teljes
+tovább
+továbbá
+több
+úgy
+ugyanis
+új
+újabb
+újra
+után
+utána
+utolsó
+vagy
+vagyis
+valaki
+valami
+valamint
+való
+vagyok
+van
+vannak
+volt
+voltam
+voltak
+voltunk
+vissza
+vele
+viszont
+volna
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_hy.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_hy.txt
index 968a8f4..60c1c50 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_hy.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_hy.txt
@@ -1,46 +1,46 @@
-# example set of Armenian stopwords.

-այդ

-այլ

-այն

-այս

-դու

-դուք

-եմ

-են

-ենք

-ես

-եք


-էի

-էին

-էինք

-էիր

-էիք

-էր

-ըստ



-ին

-իսկ

-իր

-կամ

-համար

-հետ

-հետո

-մենք

-մեջ

-մի


-նա

-նաև

-նրա

-նրանք

-որ

-որը

-որոնք

-որպես

-ու

-ում

-պիտի

-վրա


+# example set of Armenian stopwords.
+այդ
+այլ
+այն
+այս
+դու
+դուք
+եմ
+են
+ենք
+ես
+եք

+էի
+էին
+էինք
+էիր
+էիք
+էր
+ըստ


+ին
+իսկ
+իր
+կամ
+համար
+հետ
+հետո
+մենք
+մեջ
+մի

+նա
+նաև
+նրա
+նրանք
+որ
+որը
+որոնք
+որպես
+ու
+ում
+պիտի
+վրա

diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_id.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_id.txt
index 80df39a..4617f83 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_id.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_id.txt
@@ -1,359 +1,359 @@
-# from appendix D of: A Study of Stemming Effects on Information

-# Retrieval in Bahasa Indonesia

-ada

-adanya

-adalah

-adapun

-agak

-agaknya

-agar

-akan

-akankah

-akhirnya

-aku

-akulah

-amat

-amatlah

-anda

-andalah

-antar

-diantaranya

-antara

-antaranya

-diantara

-apa

-apaan

-mengapa

-apabila

-apakah

-apalagi

-apatah

-atau

-ataukah

-ataupun

-bagai

-bagaikan

-sebagai

-sebagainya

-bagaimana

-bagaimanapun

-sebagaimana

-bagaimanakah

-bagi

-bahkan

-bahwa

-bahwasanya

-sebaliknya

-banyak

-sebanyak

-beberapa

-seberapa

-begini

-beginian

-beginikah

-beginilah

-sebegini

-begitu

-begitukah

-begitulah

-begitupun

-sebegitu

-belum

-belumlah

-sebelum

-sebelumnya

-sebenarnya

-berapa

-berapakah

-berapalah

-berapapun

-betulkah

-sebetulnya

-biasa

-biasanya

-bila

-bilakah

-bisa

-bisakah

-sebisanya

-boleh

-bolehkah

-bolehlah

-buat

-bukan

-bukankah

-bukanlah

-bukannya

-cuma

-percuma

-dahulu

-dalam

-dan

-dapat

-dari

-daripada

-dekat

-demi

-demikian

-demikianlah

-sedemikian

-dengan

-depan

-di

-dia

-dialah

-dini

-diri

-dirinya

-terdiri

-dong

-dulu

-enggak

-enggaknya

-entah

-entahlah

-terhadap

-terhadapnya

-hal

-hampir

-hanya

-hanyalah

-harus

-haruslah

-harusnya

-seharusnya

-hendak

-hendaklah

-hendaknya

-hingga

-sehingga

-ia

-ialah

-ibarat

-ingin

-inginkah

-inginkan

-ini

-inikah

-inilah

-itu

-itukah

-itulah

-jangan

-jangankan

-janganlah

-jika

-jikalau

-juga

-justru

-kala

-kalau

-kalaulah

-kalaupun

-kalian

-kami

-kamilah

-kamu

-kamulah

-kan

-kapan

-kapankah

-kapanpun

-dikarenakan

-karena

-karenanya

-ke

-kecil

-kemudian

-kenapa

-kepada

-kepadanya

-ketika

-seketika

-khususnya

-kini

-kinilah

-kiranya

-sekiranya

-kita

-kitalah

-kok

-lagi

-lagian

-selagi

-lah

-lain

-lainnya

-melainkan

-selaku

-lalu

-melalui

-terlalu

-lama

-lamanya

-selama

-selama

-selamanya

-lebih

-terlebih

-bermacam

-macam

-semacam

-maka

-makanya

-makin

-malah

-malahan

-mampu

-mampukah

-mana

-manakala

-manalagi

-masih

-masihkah

-semasih

-masing

-mau

-maupun

-semaunya

-memang

-mereka

-merekalah

-meski

-meskipun

-semula

-mungkin

-mungkinkah

-nah

-namun

-nanti

-nantinya

-nyaris

-oleh

-olehnya

-seorang

-seseorang

-pada

-padanya

-padahal

-paling

-sepanjang

-pantas

-sepantasnya

-sepantasnyalah

-para

-pasti

-pastilah

-per

-pernah

-pula

-pun

-merupakan

-rupanya

-serupa

-saat

-saatnya

-sesaat

-saja

-sajalah

-saling

-bersama

-sama

-sesama

-sambil

-sampai

-sana

-sangat

-sangatlah

-saya

-sayalah

-se

-sebab

-sebabnya

-sebuah

-tersebut

-tersebutlah

-sedang

-sedangkan

-sedikit

-sedikitnya

-segala

-segalanya

-segera

-sesegera

-sejak

-sejenak

-sekali

-sekalian

-sekalipun

-sesekali

-sekaligus

-sekarang

-sekarang

-sekitar

-sekitarnya

-sela

-selain

-selalu

-seluruh

-seluruhnya

-semakin

-sementara

-sempat

-semua

-semuanya

-sendiri

-sendirinya

-seolah

-seperti

-sepertinya

-sering

-seringnya

-serta

-siapa

-siapakah

-siapapun

-disini

-disinilah

-sini

-sinilah

-sesuatu

-sesuatunya

-suatu

-sesudah

-sesudahnya

-sudah

-sudahkah

-sudahlah

-supaya

-tadi

-tadinya

-tak

-tanpa

-setelah

-telah

-tentang

-tentu

-tentulah

-tentunya

-tertentu

-seterusnya

-tapi

-tetapi

-setiap

-tiap

-setidaknya

-tidak

-tidakkah

-tidaklah

-toh

-waduh

-wah

-wahai

-sewaktu

-walau

-walaupun

-wong

-yaitu

-yakni

-yang

+# from appendix D of: A Study of Stemming Effects on Information
+# Retrieval in Bahasa Indonesia
+ada
+adanya
+adalah
+adapun
+agak
+agaknya
+agar
+akan
+akankah
+akhirnya
+aku
+akulah
+amat
+amatlah
+anda
+andalah
+antar
+diantaranya
+antara
+antaranya
+diantara
+apa
+apaan
+mengapa
+apabila
+apakah
+apalagi
+apatah
+atau
+ataukah
+ataupun
+bagai
+bagaikan
+sebagai
+sebagainya
+bagaimana
+bagaimanapun
+sebagaimana
+bagaimanakah
+bagi
+bahkan
+bahwa
+bahwasanya
+sebaliknya
+banyak
+sebanyak
+beberapa
+seberapa
+begini
+beginian
+beginikah
+beginilah
+sebegini
+begitu
+begitukah
+begitulah
+begitupun
+sebegitu
+belum
+belumlah
+sebelum
+sebelumnya
+sebenarnya
+berapa
+berapakah
+berapalah
+berapapun
+betulkah
+sebetulnya
+biasa
+biasanya
+bila
+bilakah
+bisa
+bisakah
+sebisanya
+boleh
+bolehkah
+bolehlah
+buat
+bukan
+bukankah
+bukanlah
+bukannya
+cuma
+percuma
+dahulu
+dalam
+dan
+dapat
+dari
+daripada
+dekat
+demi
+demikian
+demikianlah
+sedemikian
+dengan
+depan
+di
+dia
+dialah
+dini
+diri
+dirinya
+terdiri
+dong
+dulu
+enggak
+enggaknya
+entah
+entahlah
+terhadap
+terhadapnya
+hal
+hampir
+hanya
+hanyalah
+harus
+haruslah
+harusnya
+seharusnya
+hendak
+hendaklah
+hendaknya
+hingga
+sehingga
+ia
+ialah
+ibarat
+ingin
+inginkah
+inginkan
+ini
+inikah
+inilah
+itu
+itukah
+itulah
+jangan
+jangankan
+janganlah
+jika
+jikalau
+juga
+justru
+kala
+kalau
+kalaulah
+kalaupun
+kalian
+kami
+kamilah
+kamu
+kamulah
+kan
+kapan
+kapankah
+kapanpun
+dikarenakan
+karena
+karenanya
+ke
+kecil
+kemudian
+kenapa
+kepada
+kepadanya
+ketika
+seketika
+khususnya
+kini
+kinilah
+kiranya
+sekiranya
+kita
+kitalah
+kok
+lagi
+lagian
+selagi
+lah
+lain
+lainnya
+melainkan
+selaku
+lalu
+melalui
+terlalu
+lama
+lamanya
+selama
+selama
+selamanya
+lebih
+terlebih
+bermacam
+macam
+semacam
+maka
+makanya
+makin
+malah
+malahan
+mampu
+mampukah
+mana
+manakala
+manalagi
+masih
+masihkah
+semasih
+masing
+mau
+maupun
+semaunya
+memang
+mereka
+merekalah
+meski
+meskipun
+semula
+mungkin
+mungkinkah
+nah
+namun
+nanti
+nantinya
+nyaris
+oleh
+olehnya
+seorang
+seseorang
+pada
+padanya
+padahal
+paling
+sepanjang
+pantas
+sepantasnya
+sepantasnyalah
+para
+pasti
+pastilah
+per
+pernah
+pula
+pun
+merupakan
+rupanya
+serupa
+saat
+saatnya
+sesaat
+saja
+sajalah
+saling
+bersama
+sama
+sesama
+sambil
+sampai
+sana
+sangat
+sangatlah
+saya
+sayalah
+se
+sebab
+sebabnya
+sebuah
+tersebut
+tersebutlah
+sedang
+sedangkan
+sedikit
+sedikitnya
+segala
+segalanya
+segera
+sesegera
+sejak
+sejenak
+sekali
+sekalian
+sekalipun
+sesekali
+sekaligus
+sekarang
+sekarang
+sekitar
+sekitarnya
+sela
+selain
+selalu
+seluruh
+seluruhnya
+semakin
+sementara
+sempat
+semua
+semuanya
+sendiri
+sendirinya
+seolah
+seperti
+sepertinya
+sering
+seringnya
+serta
+siapa
+siapakah
+siapapun
+disini
+disinilah
+sini
+sinilah
+sesuatu
+sesuatunya
+suatu
+sesudah
+sesudahnya
+sudah
+sudahkah
+sudahlah
+supaya
+tadi
+tadinya
+tak
+tanpa
+setelah
+telah
+tentang
+tentu
+tentulah
+tentunya
+tertentu
+seterusnya
+tapi
+tetapi
+setiap
+tiap
+setidaknya
+tidak
+tidakkah
+tidaklah
+toh
+waduh
+wah
+wahai
+sewaktu
+walau
+walaupun
+wong
+yaitu
+yakni
+yang
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_it.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_it.txt
index 3b20c0a..1219cc7 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_it.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_it.txt
@@ -1,303 +1,303 @@
- | From svn.tartarus.org/snowball/trunk/website/algorithms/italian/stop.txt

- | This file is distributed under the BSD License.

- | See http://snowball.tartarus.org/license.php

- | Also see http://www.opensource.org/licenses/bsd-license.html

- |  - Encoding was converted to UTF-8.

- |  - This notice was added.

- |

- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"

-

- | An Italian stop word list. Comments begin with vertical bar. Each stop

- | word is at the start of a line.

-

-ad             |  a (to) before vowel

-al             |  a + il

-allo           |  a + lo

-ai             |  a + i

-agli           |  a + gli

-all            |  a + l'

-agl            |  a + gl'

-alla           |  a + la

-alle           |  a + le

-con            |  with

-col            |  con + il

-coi            |  con + i (forms collo, cogli etc are now very rare)

-da             |  from

-dal            |  da + il

-dallo          |  da + lo

-dai            |  da + i

-dagli          |  da + gli

-dall           |  da + l'

-dagl           |  da + gll'

-dalla          |  da + la

-dalle          |  da + le

-di             |  of

-del            |  di + il

-dello          |  di + lo

-dei            |  di + i

-degli          |  di + gli

-dell           |  di + l'

-degl           |  di + gl'

-della          |  di + la

-delle          |  di + le

-in             |  in

-nel            |  in + el

-nello          |  in + lo

-nei            |  in + i

-negli          |  in + gli

-nell           |  in + l'

-negl           |  in + gl'

-nella          |  in + la

-nelle          |  in + le

-su             |  on

-sul            |  su + il

-sullo          |  su + lo

-sui            |  su + i

-sugli          |  su + gli

-sull           |  su + l'

-sugl           |  su + gl'

-sulla          |  su + la

-sulle          |  su + le

-per            |  through, by

-tra            |  among

-contro         |  against

-io             |  I

-tu             |  thou

-lui            |  he

-lei            |  she

-noi            |  we

-voi            |  you

-loro           |  they

-mio            |  my

-mia            |

-miei           |

-mie            |

-tuo            |

-tua            |

-tuoi           |  thy

-tue            |

-suo            |

-sua            |

-suoi           |  his, her

-sue            |

-nostro         |  our

-nostra         |

-nostri         |

-nostre         |

-vostro         |  your

-vostra         |

-vostri         |

-vostre         |

-mi             |  me

-ti             |  thee

-ci             |  us, there

-vi             |  you, there

-lo             |  him, the

-la             |  her, the

-li             |  them

-le             |  them, the

-gli            |  to him, the

-ne             |  from there etc

-il             |  the

-un             |  a

-uno            |  a

-una            |  a

-ma             |  but

-ed             |  and

-se             |  if

-perché         |  why, because

-anche          |  also

-come           |  how

-dov            |  where (as dov')

-dove           |  where

-che            |  who, that

-chi            |  who

-cui            |  whom

-non            |  not

-più            |  more

-quale          |  who, that

-quanto         |  how much

-quanti         |

-quanta         |

-quante         |

-quello         |  that

-quelli         |

-quella         |

-quelle         |

-questo         |  this

-questi         |

-questa         |

-queste         |

-si             |  yes

-tutto          |  all

-tutti          |  all

-

-               |  single letter forms:

-

-a              |  at

-c              |  as c' for ce or ci

-e              |  and

-i              |  the

-l              |  as l'

-o              |  or

-

-               | forms of avere, to have (not including the infinitive):

-

-ho

-hai

-ha

-abbiamo

-avete

-hanno

-abbia

-abbiate

-abbiano

-avrò

-avrai

-avrà

-avremo

-avrete

-avranno

-avrei

-avresti

-avrebbe

-avremmo

-avreste

-avrebbero

-avevo

-avevi

-aveva

-avevamo

-avevate

-avevano

-ebbi

-avesti

-ebbe

-avemmo

-aveste

-ebbero

-avessi

-avesse

-avessimo

-avessero

-avendo

-avuto

-avuta

-avuti

-avute

-

-               | forms of essere, to be (not including the infinitive):

-sono

-sei


-siamo

-siete

-sia

-siate

-siano

-sarò

-sarai

-sarà

-saremo

-sarete

-saranno

-sarei

-saresti

-sarebbe

-saremmo

-sareste

-sarebbero

-ero

-eri

-era

-eravamo

-eravate

-erano

-fui

-fosti

-fu

-fummo

-foste

-furono

-fossi

-fosse

-fossimo

-fossero

-essendo

-

-               | forms of fare, to do (not including the infinitive, fa, fat-):

-faccio

-fai

-facciamo

-fanno

-faccia

-facciate

-facciano

-farò

-farai

-farà

-faremo

-farete

-faranno

-farei

-faresti

-farebbe

-faremmo

-fareste

-farebbero

-facevo

-facevi

-faceva

-facevamo

-facevate

-facevano

-feci

-facesti

-fece

-facemmo

-faceste

-fecero

-facessi

-facesse

-facessimo

-facessero

-facendo

-

-               | forms of stare, to be (not including the infinitive):

-sto

-stai

-sta

-stiamo

-stanno

-stia

-stiate

-stiano

-starò

-starai

-starà

-staremo

-starete

-staranno

-starei

-staresti

-starebbe

-staremmo

-stareste

-starebbero

-stavo

-stavi

-stava

-stavamo

-stavate

-stavano

-stetti

-stesti

-stette

-stemmo

-steste

-stettero

-stessi

-stesse

-stessimo

-stessero

-stando

+ | From svn.tartarus.org/snowball/trunk/website/algorithms/italian/stop.txt
+ | This file is distributed under the BSD License.
+ | See http://snowball.tartarus.org/license.php
+ | Also see http://www.opensource.org/licenses/bsd-license.html
+ |  - Encoding was converted to UTF-8.
+ |  - This notice was added.
+ |
+ | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"
+
+ | An Italian stop word list. Comments begin with vertical bar. Each stop
+ | word is at the start of a line.
+
+ad             |  a (to) before vowel
+al             |  a + il
+allo           |  a + lo
+ai             |  a + i
+agli           |  a + gli
+all            |  a + l'
+agl            |  a + gl'
+alla           |  a + la
+alle           |  a + le
+con            |  with
+col            |  con + il
+coi            |  con + i (forms collo, cogli etc are now very rare)
+da             |  from
+dal            |  da + il
+dallo          |  da + lo
+dai            |  da + i
+dagli          |  da + gli
+dall           |  da + l'
+dagl           |  da + gll'
+dalla          |  da + la
+dalle          |  da + le
+di             |  of
+del            |  di + il
+dello          |  di + lo
+dei            |  di + i
+degli          |  di + gli
+dell           |  di + l'
+degl           |  di + gl'
+della          |  di + la
+delle          |  di + le
+in             |  in
+nel            |  in + el
+nello          |  in + lo
+nei            |  in + i
+negli          |  in + gli
+nell           |  in + l'
+negl           |  in + gl'
+nella          |  in + la
+nelle          |  in + le
+su             |  on
+sul            |  su + il
+sullo          |  su + lo
+sui            |  su + i
+sugli          |  su + gli
+sull           |  su + l'
+sugl           |  su + gl'
+sulla          |  su + la
+sulle          |  su + le
+per            |  through, by
+tra            |  among
+contro         |  against
+io             |  I
+tu             |  thou
+lui            |  he
+lei            |  she
+noi            |  we
+voi            |  you
+loro           |  they
+mio            |  my
+mia            |
+miei           |
+mie            |
+tuo            |
+tua            |
+tuoi           |  thy
+tue            |
+suo            |
+sua            |
+suoi           |  his, her
+sue            |
+nostro         |  our
+nostra         |
+nostri         |
+nostre         |
+vostro         |  your
+vostra         |
+vostri         |
+vostre         |
+mi             |  me
+ti             |  thee
+ci             |  us, there
+vi             |  you, there
+lo             |  him, the
+la             |  her, the
+li             |  them
+le             |  them, the
+gli            |  to him, the
+ne             |  from there etc
+il             |  the
+un             |  a
+uno            |  a
+una            |  a
+ma             |  but
+ed             |  and
+se             |  if
+perché         |  why, because
+anche          |  also
+come           |  how
+dov            |  where (as dov')
+dove           |  where
+che            |  who, that
+chi            |  who
+cui            |  whom
+non            |  not
+più            |  more
+quale          |  who, that
+quanto         |  how much
+quanti         |
+quanta         |
+quante         |
+quello         |  that
+quelli         |
+quella         |
+quelle         |
+questo         |  this
+questi         |
+questa         |
+queste         |
+si             |  yes
+tutto          |  all
+tutti          |  all
+
+               |  single letter forms:
+
+a              |  at
+c              |  as c' for ce or ci
+e              |  and
+i              |  the
+l              |  as l'
+o              |  or
+
+               | forms of avere, to have (not including the infinitive):
+
+ho
+hai
+ha
+abbiamo
+avete
+hanno
+abbia
+abbiate
+abbiano
+avrò
+avrai
+avrà
+avremo
+avrete
+avranno
+avrei
+avresti
+avrebbe
+avremmo
+avreste
+avrebbero
+avevo
+avevi
+aveva
+avevamo
+avevate
+avevano
+ebbi
+avesti
+ebbe
+avemmo
+aveste
+ebbero
+avessi
+avesse
+avessimo
+avessero
+avendo
+avuto
+avuta
+avuti
+avute
+
+               | forms of essere, to be (not including the infinitive):
+sono
+sei

+siamo
+siete
+sia
+siate
+siano
+sarò
+sarai
+sarà
+saremo
+sarete
+saranno
+sarei
+saresti
+sarebbe
+saremmo
+sareste
+sarebbero
+ero
+eri
+era
+eravamo
+eravate
+erano
+fui
+fosti
+fu
+fummo
+foste
+furono
+fossi
+fosse
+fossimo
+fossero
+essendo
+
+               | forms of fare, to do (not including the infinitive, fa, fat-):
+faccio
+fai
+facciamo
+fanno
+faccia
+facciate
+facciano
+farò
+farai
+farà
+faremo
+farete
+faranno
+farei
+faresti
+farebbe
+faremmo
+fareste
+farebbero
+facevo
+facevi
+faceva
+facevamo
+facevate
+facevano
+feci
+facesti
+fece
+facemmo
+faceste
+fecero
+facessi
+facesse
+facessimo
+facessero
+facendo
+
+               | forms of stare, to be (not including the infinitive):
+sto
+stai
+sta
+stiamo
+stanno
+stia
+stiate
+stiano
+starò
+starai
+starà
+staremo
+starete
+staranno
+starei
+staresti
+starebbe
+staremmo
+stareste
+starebbero
+stavo
+stavi
+stava
+stavamo
+stavate
+stavano
+stetti
+stesti
+stette
+stemmo
+steste
+stettero
+stessi
+stesse
+stessimo
+stessero
+stando
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_ja.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_ja.txt
index bc3077e..d4321be 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_ja.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_ja.txt
@@ -1,127 +1,127 @@
-#

-# This file defines a stopword set for Japanese.

-#

-# This set is made up of hand-picked frequent terms from segmented Japanese Wikipedia.

-# Punctuation characters and frequent kanji have mostly been left out.  See LUCENE-3745

-# for frequency lists, etc. that can be useful for making your own set (if desired)

-#

-# Note that there is an overlap between these stopwords and the terms stopped when used

-# in combination with the JapanesePartOfSpeechStopFilter.  When editing this file, note

-# that comments are not allowed on the same line as stopwords.

-#

-# Also note that stopping is done in a case-insensitive manner.  Change your StopFilter

-# configuration if you need case-sensitive stopping.  Lastly, note that stopping is done

-# using the same character width as the entries in this file.  Since this StopFilter is

-# normally done after a CJKWidthFilter in your chain, you would usually want your romaji

-# entries to be in half-width and your kana entries to be in full-width.

-#

-の

-に

-は

-を

-た

-が

-で

-て

-と

-し

-れ

-さ

-ある

-いる

-も

-する

-から

-な

-こと

-として

-い

-や

-れる

-など

-なっ

-ない

-この

-ため

-その

-あっ

-よう

-また

-もの

-という

-あり

-まで

-られ

-なる

-へ

-か

-だ

-これ

-によって

-により

-おり

-より

-による

-ず

-なり

-られる

-において

-ば

-なかっ

-なく

-しかし

-について

-せ

-だっ

-その後

-できる

-それ

-う

-ので

-なお

-のみ

-でき

-き

-つ

-における

-および

-いう

-さらに

-でも

-ら

-たり

-その他

-に関する

-たち

-ます

-ん

-なら

-に対して

-特に

-せる

-及び

-これら

-とき

-では

-にて

-ほか

-ながら

-うち

-そして

-とともに

-ただし

-かつて

-それぞれ

-または

-お

-ほど

-ものの

-に対する

-ほとんど

-と共に

-といった

-です

-とも

-ところ

-ここ

-##### End of file

+#
+# This file defines a stopword set for Japanese.
+#
+# This set is made up of hand-picked frequent terms from segmented Japanese Wikipedia.
+# Punctuation characters and frequent kanji have mostly been left out.  See LUCENE-3745
+# for frequency lists, etc. that can be useful for making your own set (if desired)
+#
+# Note that there is an overlap between these stopwords and the terms stopped when used
+# in combination with the JapanesePartOfSpeechStopFilter.  When editing this file, note
+# that comments are not allowed on the same line as stopwords.
+#
+# Also note that stopping is done in a case-insensitive manner.  Change your StopFilter
+# configuration if you need case-sensitive stopping.  Lastly, note that stopping is done
+# using the same character width as the entries in this file.  Since this StopFilter is
+# normally done after a CJKWidthFilter in your chain, you would usually want your romaji
+# entries to be in half-width and your kana entries to be in full-width.
+#
+の
+に
+は
+を
+た
+が
+で
+て
+と
+し
+れ
+さ
+ある
+いる
+も
+する
+から
+な
+こと
+として
+い
+や
+れる
+など
+なっ
+ない
+この
+ため
+その
+あっ
+よう
+また
+もの
+という
+あり
+まで
+られ
+なる
+へ
+か
+だ
+これ
+によって
+により
+おり
+より
+による
+ず
+なり
+られる
+において
+ば
+なかっ
+なく
+しかし
+について
+せ
+だっ
+その後
+できる
+それ
+う
+ので
+なお
+のみ
+でき
+き
+つ
+における
+および
+いう
+さらに
+でも
+ら
+たり
+その他
+に関する
+たち
+ます
+ん
+なら
+に対して
+特に
+せる
+及び
+これら
+とき
+では
+にて
+ほか
+ながら
+うち
+そして
+とともに
+ただし
+かつて
+それぞれ
+または
+お
+ほど
+ものの
+に対する
+ほとんど
+と共に
+といった
+です
+とも
+ところ
+ここ
+##### End of file
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_lv.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_lv.txt
index a471097..e21a23c 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_lv.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_lv.txt
@@ -1,172 +1,172 @@
-# Set of Latvian stopwords from A Stemming Algorithm for Latvian, Karlis Kreslins

-# the original list of over 800 forms was refined: 

-#   pronouns, adverbs, interjections were removed

-# 

-# prepositions

-aiz

-ap

-ar

-apakš

-ārpus

-augšpus

-bez

-caur

-dēļ

-gar

-iekš

-iz

-kopš

-labad

-lejpus

-līdz

-no

-otrpus

-pa

-par

-pār

-pēc

-pie

-pirms

-pret

-priekš

-starp

-šaipus

-uz

-viņpus

-virs

-virspus

-zem

-apakšpus

-# Conjunctions

-un

-bet

-jo

-ja

-ka

-lai

-tomēr

-tikko

-turpretī

-arī

-kaut

-gan

-tādēļ

-tā

-ne

-tikvien

-vien

-kā

-ir

-te

-vai

-kamēr

-# Particles

-ar

-diezin

-droši

-diemžēl

-nebūt

-ik

-it

-taču

-nu

-pat

-tiklab

-iekšpus

-nedz

-tik

-nevis

-turpretim

-jeb

-iekam

-iekām

-iekāms

-kolīdz

-līdzko

-tiklīdz

-jebšu

-tālab

-tāpēc

-nekā

-itin

-jā

-jau

-jel

-nē

-nezin

-tad

-tikai

-vis

-tak

-iekams

-vien

-# modal verbs

-būt  

-biju 

-biji

-bija

-bijām

-bijāt

-esmu

-esi

-esam

-esat 

-būšu     

-būsi

-būs

-būsim

-būsiet

-tikt

-tiku

-tiki

-tika

-tikām

-tikāt

-tieku

-tiec

-tiek

-tiekam

-tiekat

-tikšu

-tiks

-tiksim

-tiksiet

-tapt

-tapi

-tapāt

-topat

-tapšu

-tapsi

-taps

-tapsim

-tapsiet

-kļūt

-kļuvu

-kļuvi

-kļuva

-kļuvām

-kļuvāt

-kļūstu

-kļūsti

-kļūst

-kļūstam

-kļūstat

-kļūšu

-kļūsi

-kļūs

-kļūsim

-kļūsiet

-# verbs

-varēt

-varēju

-varējām

-varēšu

-varēsim

-var

-varēji

-varējāt

-varēsi

-varēsiet

-varat

-varēja

-varēs

+# Set of Latvian stopwords from A Stemming Algorithm for Latvian, Karlis Kreslins
+# the original list of over 800 forms was refined: 
+#   pronouns, adverbs, interjections were removed
+# 
+# prepositions
+aiz
+ap
+ar
+apakš
+ārpus
+augšpus
+bez
+caur
+dēļ
+gar
+iekš
+iz
+kopš
+labad
+lejpus
+līdz
+no
+otrpus
+pa
+par
+pār
+pēc
+pie
+pirms
+pret
+priekš
+starp
+šaipus
+uz
+viņpus
+virs
+virspus
+zem
+apakšpus
+# Conjunctions
+un
+bet
+jo
+ja
+ka
+lai
+tomēr
+tikko
+turpretī
+arī
+kaut
+gan
+tādēļ
+tā
+ne
+tikvien
+vien
+kā
+ir
+te
+vai
+kamēr
+# Particles
+ar
+diezin
+droši
+diemžēl
+nebūt
+ik
+it
+taču
+nu
+pat
+tiklab
+iekšpus
+nedz
+tik
+nevis
+turpretim
+jeb
+iekam
+iekām
+iekāms
+kolīdz
+līdzko
+tiklīdz
+jebšu
+tālab
+tāpēc
+nekā
+itin
+jā
+jau
+jel
+nē
+nezin
+tad
+tikai
+vis
+tak
+iekams
+vien
+# modal verbs
+būt  
+biju 
+biji
+bija
+bijām
+bijāt
+esmu
+esi
+esam
+esat 
+būšu     
+būsi
+būs
+būsim
+būsiet
+tikt
+tiku
+tiki
+tika
+tikām
+tikāt
+tieku
+tiec
+tiek
+tiekam
+tiekat
+tikšu
+tiks
+tiksim
+tiksiet
+tapt
+tapi
+tapāt
+topat
+tapšu
+tapsi
+taps
+tapsim
+tapsiet
+kļūt
+kļuvu
+kļuvi
+kļuva
+kļuvām
+kļuvāt
+kļūstu
+kļūsti
+kļūst
+kļūstam
+kļūstat
+kļūšu
+kļūsi
+kļūs
+kļūsim
+kļūsiet
+# verbs
+varēt
+varēju
+varējām
+varēšu
+varēsim
+var
+varēji
+varējāt
+varēsi
+varēsiet
+varat
+varēja
+varēs
diff --git a/plugins/solr/home/solrdefault/conf/lang/stopwords_nl.txt b/plugins/solr/home/solrdefault/conf/lang/stopwords_nl.txt
index 06ca75b..47a2aea 100644
--- a/plugins/solr/home/solrdefault/conf/lang/stopwords_nl.txt
+++ b/plugins/solr/home/solrdefault/conf/lang/stopwords_nl.txt
@@ -1,119 +1,119 @@
- | From svn.tartarus.org/snowball/trunk/website/algorithms/dutch/stop.txt

- | This file is distributed under the BSD License.

- | See http://snowball.tartarus.org/license.php

- | Also see http://www.opensource.org/licenses/bsd-license.html

- |  - Encoding was converted to UTF-8.

- |  - This notice was added.

- |

- | NOTE: To use this file with StopFilterFactory, you must specify format="snowball"

-

- | A Dutch stop word list. Comments begin with vertical bar. Each stop

- | word is at the start of a line.

-

- | This is a ranked list (commonest to rarest) of stopwords derived from

- | a large sample of Dutch text.

-

- | Dutch stop words frequently exhibit homonym clashes. These are indicated

- | clearly below.

-

-de             |  the

-en             |  and

-van            |  of, from

-ik             |  I, the ego

-te             |  (1) chez, at etc, (2) to, (3) too

-dat            |  that, which

-die            |  that, those, who, which

-in             |  in, inside

-een            |  a, an, one

-hij            |  he

-het            |  the, it

-niet           |  not, nothing, naught

-zijn           |  (1) to be, being, (2) his, one's, its

-is             |  is

-was            |  (1) was, past tense of all persons sing. of 'zijn' (to be) (2) wax, (3) the washing, (4) rise of river

-op             |  on, upon, at, in, up, used up

-aan            |  on, upon, to (as dative)

-met            |  with, by

-als            |  like, such as, when

-voor           |  (1) before, in front of, (2) furrow

-had            |  had, past tense all persons sing. of 'hebben' (have)

-er             |  there

-maar           |  but, only

-om             |  round, about, for etc

-hem            |  him

-dan            |  then

-zou            |  should/would, past tense all persons sing. of 'zullen'

-of             |  or, whether, if

-wat            |  what, something, anything

-mijn           |  possessive and noun 'mine'

-men            |  people, 'one'

-dit            |  this

-zo             |  so, thus, in this way

-door           |  through by

-over           |  over, across

-ze             |  she, her, they, them

-zich           |  oneself

-bij            |  (1) a bee, (2) by, near, at

-ook            |  also, too

-tot            |  till, until

-je             |  you

-mij            |  me

-uit            |  out of, from

-der            |  Old Dutch form of 'van der' still found in surnames

-daar           |  (1) there, (2) because

-haar           |  (1) her, their, them, (2) hair

-naar           |  (1) unpleasant, unwell etc, (2) towards, (3) as
<